Skip to content

O
OpenXG-AMF-Simple
Commit 99c8ac7c authored by Niuhaiwen's avatar Niuhaiwen
Browse files
Options

compiled successfully

parent a71f4de3
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 134 deletions
src/amf-app/amf_n1.cpp
View file @ 99c8ac7c
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
#include "String2Value.hpp" #include "String2Value.hpp"
#include "sha256.hpp" #include "sha256.hpp"
<<<<<<< HEAD
#include "AuthenticationInfo.h" #include "AuthenticationInfo.h"
#include "UEAuthenticationCtx.h" #include "UEAuthenticationCtx.h"
#include "ConfirmationData.h" #include "ConfirmationData.h"
...@@ -65,9 +64,6 @@ ...@@ -65,9 +64,6 @@
extern "C" extern "C"
{ {
=======
extern "C" {
>>>>>>> prepare_merge_handover
#include "dynamic_memory_check.h" #include "dynamic_memory_check.h"
#include "bstrlib.h" #include "bstrlib.h"
} }
...@@ -86,14 +82,12 @@ extern amf_config amf_cfg; ...@@ -86,14 +82,12 @@ extern amf_config amf_cfg;
extern amf_app* amf_app_inst; extern amf_app* amf_app_inst;
extern amf_n2* amf_n2_inst; extern amf_n2* amf_n2_inst;
extern statistics stacs; extern statistics stacs;
<<<<<<< HEAD
extern void convert_string_2_hex(std::string &input, std::string &output); extern void convert_string_2_hex(std::string &input, std::string &output);
extern unsigned char * format_string_as_hex(std::string str); extern unsigned char * format_string_as_hex(std::string str);
=======
extern int ncc; extern int ncc;
>>>>>>> prepare_merge_handover
Sha256 ctx; Sha256 ctx;
random_state_t random_state; random_state_t random_state;
static uint8_t no_random_delta = 0; static uint8_t no_random_delta = 0;
...@@ -881,7 +875,6 @@ void amf_n1::registration_request_handle( ...@@ -881,7 +875,6 @@ void amf_n1::registration_request_handle(
delete regReq; delete regReq;
return; return;
} }
<<<<<<< HEAD
}else{ }else{
Logger::amf_n1().debug("existing nas_context(%p) --> Update", nc.get()); Logger::amf_n1().debug("existing nas_context(%p) --> Update", nc.get());
//nc = amf_ue_id_2_nas_context(amf_ue_ngap_id); //nc = amf_ue_id_2_nas_context(amf_ue_ngap_id);
...@@ -892,14 +885,6 @@ void amf_n1::registration_request_handle( ...@@ -892,14 +885,6 @@ void amf_n1::registration_request_handle(
//} //}
nc.get()->ran_ue_ngap_id = ran_ue_ngap_id; nc.get()->ran_ue_ngap_id = ran_ue_ngap_id;
nc.get()->amf_ue_ngap_id = amf_ue_ngap_id; nc.get()->amf_ue_ngap_id = amf_ue_ngap_id;
=======
} else {
Logger::amf_n1().debug("Existing nas_context --> Update");
// nc = amf_ue_id_2_nas_context(amf_ue_ngap_id);
}
nc.get()->ran_ue_ngap_id = ran_ue_ngap_id;
nc.get()->amf_ue_ngap_id = amf_ue_ngap_id;
>>>>>>> prepare_merge_handover
nc.get()->serving_network = snn; nc.get()->serving_network = snn;
// Check 5GS_Registration_type IE (Mandatory IE) // Check 5GS_Registration_type IE (Mandatory IE)
...@@ -916,11 +901,7 @@ void amf_n1::registration_request_handle( ...@@ -916,11 +901,7 @@ void amf_n1::registration_request_handle(
nc.get()->registration_type = reg_type; nc.get()->registration_type = reg_type;
nc.get()->follow_on_req_pending_ind = is_follow_on_req_pending; nc.get()->follow_on_req_pending_ind = is_follow_on_req_pending;
<<<<<<< HEAD
//2.3 check ie ngKSI(Mondantary IE)
=======
// Check ngKSI (Mandatory IE) // Check ngKSI (Mandatory IE)
>>>>>>> prepare_merge_handover
uint8_t ngKSI = regReq->getngKSI(); uint8_t ngKSI = regReq->getngKSI();
if (ngKSI == -1) { if (ngKSI == -1) {
Logger::amf_n1().error("Missing Mandatory IE ngKSI..."); Logger::amf_n1().error("Missing Mandatory IE ngKSI...");
...@@ -1102,17 +1083,11 @@ void amf_n1::run_registration_procedure(std::shared_ptr<nas_context>& nc) { ...@@ -1102,17 +1083,11 @@ void amf_n1::run_registration_procedure(std::shared_ptr<nas_context>& nc) {
} }
nc.get()->ngKsi = ngksi; nc.get()->ngKsi = ngksi;
handle_auth_vector_successful_result(nc); handle_auth_vector_successful_result(nc);
<<<<<<< HEAD
}else{
Logger::amf_n1().error("request authentication vectors failure");
response_registration_reject_msg(_5GMM_CAUSE_ILLEGAL_UE, nc.get()->ran_ue_ngap_id, nc.get()->amf_ue_ngap_id);//cause?
=======
} else { } else {
Logger::amf_n1().error("Request authentication vectors failure"); Logger::amf_n1().error("Request authentication vectors failure");
response_registration_reject_msg( response_registration_reject_msg(
_5GMM_CAUSE_ILLEGAL_UE, nc.get()->ran_ue_ngap_id, _5GMM_CAUSE_ILLEGAL_UE, nc.get()->ran_ue_ngap_id,
nc.get()->amf_ue_ngap_id); // cause? nc.get()->amf_ue_ngap_id); // cause?
>>>>>>> prepare_merge_handover
} }
} else { } else {
Logger::amf_n1().debug( Logger::amf_n1().debug(
...@@ -1161,7 +1136,6 @@ void amf_n1::run_registration_procedure(std::shared_ptr<nas_context>& nc) { ...@@ -1161,7 +1136,6 @@ void amf_n1::run_registration_procedure(std::shared_ptr<nas_context>& nc) {
bool amf_n1::auth_vectors_generator(std::shared_ptr<nas_context>& nc) { bool amf_n1::auth_vectors_generator(std::shared_ptr<nas_context>& nc) {
Logger::amf_n1().debug("Start to generate authentication vectors"); Logger::amf_n1().debug("Start to generate authentication vectors");
authentication_vectors_generator_in_udm(nc); authentication_vectors_generator_in_udm(nc);
<<<<<<< HEAD
if(amf_cfg.is_Nausf) if(amf_cfg.is_Nausf)
{ {
if(!authentication_vectors_from_ausf(nc)) if(!authentication_vectors_from_ausf(nc))
...@@ -1175,14 +1149,6 @@ bool amf_n1::auth_vectors_generator(std::shared_ptr<nas_context>& nc) { ...@@ -1175,14 +1149,6 @@ bool amf_n1::auth_vectors_generator(std::shared_ptr<nas_context>& nc) {
{ {
Authentication_5gaka::derive_kamf(nc.get()->imsi, nc.get()->_5g_av[i].kseaf, nc.get()->kamf[i], 0x0000); //second parameter: abba Authentication_5gaka::derive_kamf(nc.get()->imsi, nc.get()->_5g_av[i].kseaf, nc.get()->kamf[i], 0x0000); //second parameter: abba
} }
=======
authentication_vectors_generator_in_ausf(nc);
Logger::amf_n1().debug("Deriving kamf");
for (int i = 0; i < MAX_5GS_AUTH_VECTORS; i++) {
Authentication_5gaka::derive_kamf(
nc.get()->imsi, nc.get()->_5g_av[i].kseaf, nc.get()->kamf[i],
0x0000); // second parameter: abba
>>>>>>> prepare_merge_handover
} }
return true; return true;
} }
...@@ -1777,48 +1743,7 @@ void amf_n1::authentication_response_handle( ...@@ -1777,48 +1743,7 @@ void amf_n1::authentication_response_handle(
nullptr, (uint8_t*) bdata(plain_msg), blength(plain_msg)); nullptr, (uint8_t*) bdata(plain_msg), blength(plain_msg));
bstring resStar; bstring resStar;
bool isAuthOk = true; bool isAuthOk = true;
<<<<<<< HEAD
//Get response RES* //Get response RES*
if (!auth->getAuthenticationResponseParameter(resStar))
{
Logger::amf_n1().warn("Cannot receive AuthenticationResponseParameter (RES*)");
}
else
{
if(amf_cfg.is_Nausf)
{
std::string data = bdata(resStar);
if(!_5g_aka_confirmation_from_ausf(nc,data))
isAuthOk = false;
}
else
{
//Get stored XRES*
int secu_index = nc.get()->security_ctx->vector_pointer;
uint8_t *hxresStar = nc.get()->_5g_av[secu_index].hxresStar;
//Calculate HRES* from received RES*, then compare with XRES stored in nas_context
uint8_t inputstring[32];
uint8_t *res = (uint8_t *)bdata(resStar);
Logger::amf_n1().debug("Start to calculate HRES* from received RES*");
memcpy(&inputstring[0], nc.get()->_5g_av[secu_index].rand, 16);
memcpy(&inputstring[16], res, blength(resStar));
unsigned char sha256Out[Sha256::DIGEST_SIZE];
sha256((unsigned char *)inputstring, 16 + blength(resStar), sha256Out);
uint8_t hres[16];
for (int i = 0; i < 16; i++)
hres[i] = (uint8_t)sha256Out[i];
print_buffer("amf_n1", "Received RES* From Authentication-Response", res, 16);
print_buffer("amf_n1", "Stored XRES* in 5G HE AV", nc.get()->_5g_he_av[secu_index].xresStar, 16);
print_buffer("amf_n1", "Stored XRES in 5G HE AV", nc.get()->_5g_he_av[secu_index].xres, 8);
print_buffer("amf_n1", "Computed HRES* from RES*", hres, 16);
print_buffer("amf_n1", "Computed HXRES* from XRES*", hxresStar, 16);
for (int i = 0; i < 16; i++)
{
if (hxresStar[i] != hres[i])
isAuthOk = false;
}
=======
// Get response RES*
if (!auth->getAuthenticationResponseParameter(resStar)) { if (!auth->getAuthenticationResponseParameter(resStar)) {
Logger::amf_n1().warn( Logger::amf_n1().warn(
"Cannot receive AuthenticationResponseParameter (RES*)"); "Cannot receive AuthenticationResponseParameter (RES*)");
...@@ -1849,7 +1774,6 @@ void amf_n1::authentication_response_handle( ...@@ -1849,7 +1774,6 @@ void amf_n1::authentication_response_handle(
print_buffer("amf_n1", "Computed HXRES* from XRES*", hxresStar, 16); print_buffer("amf_n1", "Computed HXRES* from XRES*", hxresStar, 16);
for (int i = 0; i < 16; i++) { for (int i = 0; i < 16; i++) {
if (hxresStar[i] != hres[i]) isAuthOk = false; if (hxresStar[i] != hres[i]) isAuthOk = false;
>>>>>>> prepare_merge_handover
} }
} }
...@@ -2107,26 +2031,6 @@ void amf_n1::security_mode_complete_handle( ...@@ -2107,26 +2031,6 @@ void amf_n1::security_mode_complete_handle(
// encoding InitialContextSetupRequest(NGAP message) back // encoding InitialContextSetupRequest(NGAP message) back
std::shared_ptr<nas_context> nc; std::shared_ptr<nas_context> nc;
nc = amf_ue_id_2_nas_context(amf_ue_ngap_id); nc = amf_ue_id_2_nas_context(amf_ue_ngap_id);
<<<<<<< HEAD
Logger::amf_n1().info("UE (IMSI %s, GUTI %s, current RAN ID %d, current AMF ID %d) has been registered to the network", nc.get()->imsi.c_str(), guti.c_str(), ran_ue_ngap_id, amf_ue_ngap_id);
//nc.get()->is_stacs_available = true;
if (nc.get()->is_stacs_available)
{
int index = 0;
for (int i = 0; i < stacs.ues.size(); i++)
{
if (!(nc.get()->imsi).compare(stacs.ues[i].imsi))
{
index = i;
break;
}
}
update_ue_information_statics(stacs.ues[index], "", "RM-REGISTRED", ran_ue_ngap_id, amf_ue_ngap_id, "", guti, "", "", 0);
}else{
ue_infos ueItem;
update_ue_information_statics(ueItem, "CM-CONNECTED", "REGISTRATION-REGISTRED", ran_ue_ngap_id, amf_ue_ngap_id, nc.get()->imsi, "", mcc, mnc, uc.get()->cgi.nrCellID);
stacs.ues.push_back(ueItem);
=======
Logger::amf_n1().info( Logger::amf_n1().info(
"UE (IMSI %s, GUTI %s, current RAN ID %d, current AMF ID %d) has been " "UE (IMSI %s, GUTI %s, current RAN ID %d, current AMF ID %d) has been "
"registered to the network", "registered to the network",
...@@ -2149,7 +2053,6 @@ void amf_n1::security_mode_complete_handle( ...@@ -2149,7 +2053,6 @@ void amf_n1::security_mode_complete_handle(
// "REGISTRATION-REGISTRED", ran_ue_ngap_id, amf_ue_ngap_id, // "REGISTRATION-REGISTRED", ran_ue_ngap_id, amf_ue_ngap_id,
// nc.get()->imsi, "", mcc, mnc, uc.get()->cgi.nrCellID); // nc.get()->imsi, "", mcc, mnc, uc.get()->cgi.nrCellID);
// stacs.ues.push_back(ueItem); // stacs.ues.push_back(ueItem);
>>>>>>> prepare_merge_handover
nc.get()->is_stacs_available = true; nc.get()->is_stacs_available = true;
} }
set_5gmm_state(nc, _5GMM_REGISTERED); set_5gmm_state(nc, _5GMM_REGISTERED);
......
src/amf-app/amf_n1.hpp
View file @ 99c8ac7c
...@@ -104,18 +104,16 @@ class amf_n1 { ...@@ -104,18 +104,16 @@ class amf_n1 {
std::shared_ptr<nas_context> nc); std::shared_ptr<nas_context> nc);
//authentication //authentication
bool auth_vectors_generator(std::shared_ptr<nas_context> &nc); bool auth_vectors_generator(std::shared_ptr<nas_context> &nc);
<<<<<<< HEAD
bool authentication_vectors_generator_in_ausf(std::shared_ptr<nas_context> &nc);
void curl_http_client(std::string remoteUri, std::string Method, std::string msgBody, std::string &Response); void curl_http_client(std::string remoteUri, std::string Method, std::string msgBody, std::string &Response);
bool authentication_vectors_from_ausf(std::shared_ptr<nas_context> &nc); bool authentication_vectors_from_ausf(std::shared_ptr<nas_context> &nc);
bool _5g_aka_confirmation_from_ausf(std::shared_ptr<nas_context> &nc,std::string &resStar); bool _5g_aka_confirmation_from_ausf(std::shared_ptr<nas_context> &nc,std::string &resStar);
bool authentication_vectors_generator_in_udm(std::shared_ptr<nas_context> &nc);
=======
bool authentication_vectors_generator_in_ausf( bool authentication_vectors_generator_in_ausf(
std::shared_ptr<nas_context> &nc); std::shared_ptr<nas_context> &nc);
bool authentication_vectors_generator_in_udm( bool authentication_vectors_generator_in_udm(
std::shared_ptr<nas_context> &nc); std::shared_ptr<nas_context> &nc);
>>>>>>> prepare_merge_handover
//mysql handlers in mysql_db.cpp //mysql handlers in mysql_db.cpp
bool get_mysql_auth_info(std::string imsi, mysql_auth_info_t &resp); bool get_mysql_auth_info(std::string imsi, mysql_auth_info_t &resp);
void mysql_push_rand_sqn(std::string imsi, uint8_t *rand_p, uint8_t *sqn); void mysql_push_rand_sqn(std::string imsi, uint8_t *rand_p, uint8_t *sqn);
......
src/oai-amf/options.cpp
View file @ 99c8ac7c
...@@ -30,19 +30,8 @@ bool Options::m_is_Nausf = true; ...@@ -30,19 +30,8 @@ bool Options::m_is_Nausf = true;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void Options::help() { void Options::help() {
<<<<<<< HEAD
std::cout << std::endl << "Usage: AMF [OPTIONS]..." << std::endl << " -h, --help Print help and exit" << std::endl << " -c, --libconfigcfg filename Read the application configuration from this file." << std::endl std::cout << std::endl << "Usage: AMF [OPTIONS]..." << std::endl << " -h, --help Print help and exit" << std::endl << " -c, --libconfigcfg filename Read the application configuration from this file." << std::endl
<< " -o, --stdoutlog Send the application logs to STDOUT fd." << std::endl << " -r, --rotatelog Send the application logs to local file (in current working directory)." << std::endl<< " --no-ausf Do not connect ausf." << std::endl; << " -o, --stdoutlog Send the application logs to STDOUT fd." << std::endl << " -r, --rotatelog Send the application logs to local file (in current working directory)." << std::endl<< " --no-ausf Do not connect ausf." << std::endl;
=======
std::cout << std::endl << "Usage: AMF [OPTIONS]..." << std::endl
<< " -h, --help Print help and exit" << std::endl
<< " -c, --libconfigcfg filename Read the application configuration from this file."
<< std::endl
<< " -o, --stdoutlog Send the application logs to STDOUT fd."
<< std::endl
<< " -r, --rotatelog Send the application logs to local file (in current working directory)."
<< std::endl;
>>>>>>> prepare_merge_handover
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
...@@ -70,14 +59,7 @@ bool Options::parseInputOptions(int argc, char **argv) { ...@@ -70,14 +59,7 @@ bool Options::parseInputOptions(int argc, char **argv) {
int option_index = 0; int option_index = 0;
bool result = true; bool result = true;
<<<<<<< HEAD
struct option long_options[] = { { "help", no_argument, NULL, 'h' }, { "libconfigcfg", required_argument, NULL, 'f' }, { "stdoutlog", no_argument, NULL, 'o' }, { "rotatelog", no_argument, NULL, 'r' }, { "no-ausf", no_argument, &lopt, OPTIONS_NAUSF_VAL }, { NULL, 0, NULL, 0 } }; struct option long_options[] = { { "help", no_argument, NULL, 'h' }, { "libconfigcfg", required_argument, NULL, 'f' }, { "stdoutlog", no_argument, NULL, 'o' }, { "rotatelog", no_argument, NULL, 'r' }, { "no-ausf", no_argument, &lopt, OPTIONS_NAUSF_VAL }, { NULL, 0, NULL, 0 } };
=======
struct option long_options[] = { { "help", no_argument, NULL, 'h' }, {
"libconfigcfg", required_argument, NULL, 'f' }, { "stdoutlog",
no_argument, NULL, 'o' }, { "rotatelog", no_argument, NULL, 'r' }, { NULL,
0, NULL, 0 } };
>>>>>>> prepare_merge_handover
// Loop on arguments // Loop on arguments
while (1) { while (1) {
......
src/oai-amf/options.hpp
View file @ 99c8ac7c
...@@ -38,14 +38,8 @@ class Options { ...@@ -38,14 +38,8 @@ class Options {
return m_log_stdout; return m_log_stdout;
} }
<<<<<<< HEAD
static const std::string &getlibconfigConfig() { return m_libconfigcfg; }
static const bool &getlogRotFilelog() { return m_log_rot_file_log; }
static const bool &getlogStdout() { return m_log_stdout; }
static const bool &isNausf() { return m_is_Nausf; } static const bool &isNausf() { return m_is_Nausf; }
=======
private: private:
>>>>>>> prepare_merge_handover
enum OptionsSelected { enum OptionsSelected {
libconfigcfg = 0x01, libconfigcfg = 0x01,
...@@ -57,18 +51,11 @@ class Options { ...@@ -57,18 +51,11 @@ class Options {
static int options; static int options;
<<<<<<< HEAD
static int options;
static bool m_log_rot_file_log; static bool m_log_rot_file_log;
static bool m_log_stdout; static bool m_log_stdout;
static bool m_is_Nausf; static bool m_is_Nausf;
static std::string m_libconfigcfg; static std::string m_libconfigcfg;
=======
static bool m_log_rot_file_log;
static bool m_log_stdout;
static std::string m_libconfigcfg;
>>>>>>> prepare_merge_handover
}; };
#endif // #define __OPTIONS_H #endif // #define __OPTIONS_H
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