Commit 000551a5 authored by Tien-Thinh Nguyen's avatar Tien-Thinh Nguyen

Code cleanup

parent b184354a
...@@ -238,11 +238,6 @@ void ausf_app::handle_ue_authentications( ...@@ -238,11 +238,6 @@ void ausf_app::handle_ue_authentications(
uint8_t hxresStar[16] = {0}; uint8_t hxresStar[16] = {0};
// Getting params from UDM 5G HE AV // Getting params from UDM 5G HE AV
// TODO: use std::copy instead of memcpy
// memcpy(xresStar_ausf, xresStar, 16); // xres*
// memcpy(rand_ausf, rand, 16); // rand
// memcpy(autn_ausf, autn, 16); // autn
// memcpy(kausf_ausf, kausf, 32); // kausf
std::copy( std::copy(
std::begin(xresStar), std::end(xresStar), std::begin(xresStar_ausf)); std::begin(xresStar), std::end(xresStar), std::begin(xresStar_ausf));
std::copy(std::begin(rand), std::end(rand), std::begin(rand_ausf)); std::copy(std::begin(rand), std::end(rand), std::begin(rand_ausf));
...@@ -275,23 +270,18 @@ void ausf_app::handle_ue_authentications( ...@@ -275,23 +270,18 @@ void ausf_app::handle_ue_authentications(
// Update information // Update information
sc->supi_ausf = supi; // TODO: setter/getter sc->supi_ausf = supi; // TODO: setter/getter
// memcpy(sc->ausf_av_s.rand, rand_ausf, 16); // store 5g av in ausf
std::copy( std::copy(
std::begin(rand_ausf), std::end(rand_ausf), std::begin(rand_ausf), std::end(rand_ausf),
std::begin(sc->ausf_av_s.rand)); std::begin(sc->ausf_av_s.rand));
// memcpy(sc->ausf_av_s.autn, autn_ausf, 16);
std::copy( std::copy(
std::begin(autn_ausf), std::end(autn_ausf), std::begin(autn_ausf), std::end(autn_ausf),
std::begin(sc->ausf_av_s.autn)); std::begin(sc->ausf_av_s.autn));
// memcpy(sc->ausf_av_s.hxresStar, hxresStar, 16);
std::copy( std::copy(
std::begin(hxresStar), std::end(hxresStar), std::begin(hxresStar), std::end(hxresStar),
std::begin(sc->ausf_av_s.hxresStar)); std::begin(sc->ausf_av_s.hxresStar));
// memcpy(sc->ausf_av_s.kseaf, kseaf, 32);
std::copy( std::copy(
std::begin(kseaf), std::end(kseaf), std::begin(sc->ausf_av_s.kseaf)); std::begin(kseaf), std::end(kseaf), std::begin(sc->ausf_av_s.kseaf));
// memcpy(sc->xres_star, xresStar, 16); // store xres* in // store xres* in ausf
// ausf
std::copy( std::copy(
std::begin(xresStar), std::end(xresStar), std::begin(sc->xres_star)); std::begin(xresStar), std::end(xresStar), std::begin(sc->xres_star));
...@@ -404,9 +394,7 @@ void ausf_app::handle_ue_authentications_confirmation( ...@@ -404,9 +394,7 @@ void ausf_app::handle_ue_authentications_confirmation(
Logger::ausf_server().info("AV is up to date, handling received res*..."); Logger::ausf_server().info("AV is up to date, handling received res*...");
// Get stored xres* and compare with res* // Get stored xres* and compare with res*
uint8_t xresStar[16] = {0}; uint8_t xresStar[16] = {0};
// memcpy( // xres* stored for 5g-aka-confirmation
// xresStar, sc->xres_star, 16); // xres* stored for
// 5g-aka-confirmation
std::copy( std::copy(
std::begin(sc->xres_star), std::end(sc->xres_star), std::begin(sc->xres_star), std::end(sc->xres_star),
std::begin(xresStar)); std::begin(xresStar));
......
...@@ -129,6 +129,7 @@ struct in_addr conv::fromString(const std::string addr4) { ...@@ -129,6 +129,7 @@ struct in_addr conv::fromString(const std::string addr4) {
struct in_addr* ia = (struct in_addr*) buf; struct in_addr* ia = (struct in_addr*) buf;
return *ia; return *ia;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
std::string conv::toString(const struct in_addr& inaddr) { std::string conv::toString(const struct in_addr& inaddr) {
std::string s = {}; std::string s = {};
...@@ -142,6 +143,7 @@ std::string conv::toString(const struct in_addr& inaddr) { ...@@ -142,6 +143,7 @@ std::string conv::toString(const struct in_addr& inaddr) {
return s; return s;
} }
//------------------------------------------------------------------------------
std::string conv::toString(const struct in6_addr& in6addr) { std::string conv::toString(const struct in6_addr& in6addr) {
std::string s = {}; std::string s = {};
char str[INET6_ADDRSTRLEN] = {}; char str[INET6_ADDRSTRLEN] = {};
...@@ -154,6 +156,7 @@ std::string conv::toString(const struct in6_addr& in6addr) { ...@@ -154,6 +156,7 @@ std::string conv::toString(const struct in6_addr& in6addr) {
return s; return s;
} }
//------------------------------------------------------------------------------
// Convert data from UDM // Convert data from UDM
std::string conv::uint8_to_hex_string(const uint8_t* v, const size_t s) { std::string conv::uint8_to_hex_string(const uint8_t* v, const size_t s) {
std::stringstream ss; std::stringstream ss;
...@@ -167,6 +170,7 @@ std::string conv::uint8_to_hex_string(const uint8_t* v, const size_t s) { ...@@ -167,6 +170,7 @@ std::string conv::uint8_to_hex_string(const uint8_t* v, const size_t s) {
return ss.str(); return ss.str();
} }
//------------------------------------------------------------------------------
void conv::hex_str_to_uint8(const char* string, uint8_t* des) { void conv::hex_str_to_uint8(const char* string, uint8_t* des) {
if (string == NULL) return; if (string == NULL) return;
...@@ -199,6 +203,7 @@ void conv::hex_str_to_uint8(const char* string, uint8_t* des) { ...@@ -199,6 +203,7 @@ void conv::hex_str_to_uint8(const char* string, uint8_t* des) {
} }
} }
//------------------------------------------------------------------------------
uint64_t supi_to_u64(std::string& supi) { uint64_t supi_to_u64(std::string& supi) {
uint64_t uint_supi; uint64_t uint_supi;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment