Unverified Commit 0d62a2be authored by kharade's avatar kharade

use psc->smf_port for sm_context setup

parent 613b7d11
...@@ -205,12 +205,14 @@ void amf_n11::handle_itti_message( ...@@ -205,12 +205,14 @@ void amf_n11::handle_itti_message(
} }
std::string smf_addr = {}; std::string smf_addr = {};
std::string smf_port = {};
std::string smf_api_version = {}; std::string smf_api_version = {};
if (!psc.get()->smf_available) { if (!psc.get()->smf_available) {
Logger::amf_n11().error("No SMF is available for this PDU session"); Logger::amf_n11().error("No SMF is available for this PDU session");
} else { } else {
smf_addr = psc->smf_addr; smf_addr = psc->smf_addr;
smf_port = psc->smf_port;
smf_api_version = psc->smf_api_version; smf_api_version = psc->smf_api_version;
} }
...@@ -228,7 +230,8 @@ void amf_n11::handle_itti_message( ...@@ -228,7 +230,8 @@ void amf_n11::handle_itti_message(
if (found != std::string::npos) if (found != std::string::npos)
remote_uri = psc.get()->smf_context_location + "/modify"; remote_uri = psc.get()->smf_context_location + "/modify";
else else
remote_uri = smf_addr + psc.get()->smf_context_location + "/modify"; remote_uri =
smf_addr + ":" + smf_port + psc.get()->smf_context_location + "/modify";
Logger::amf_n11().debug("SMF URI: %s", remote_uri.c_str()); Logger::amf_n11().debug("SMF URI: %s", remote_uri.c_str());
...@@ -253,7 +256,7 @@ void amf_n11::handle_itti_message( ...@@ -253,7 +256,7 @@ void amf_n11::handle_itti_message(
std::string json_part = pdu_session_update_request.dump(); std::string json_part = pdu_session_update_request.dump();
uint8_t http_version = 1; uint8_t http_version = 1;
// if (amf_cfg.support_features.use_http2) http_version = 2; if (amf_cfg.support_features.use_http2) http_version = 2;
curl_http_client( curl_http_client(
remote_uri, json_part, "", n2SmMsg, supi, itti_msg.pdu_session_id, remote_uri, json_part, "", n2SmMsg, supi, itti_msg.pdu_session_id,
...@@ -334,8 +337,8 @@ void amf_n11::handle_itti_message(itti_nsmf_pdusession_create_sm_context& smf) { ...@@ -334,8 +337,8 @@ void amf_n11::handle_itti_message(itti_nsmf_pdusession_create_sm_context& smf) {
psc.get()->dnn = dnn; psc.get()->dnn = dnn;
std::string smf_addr = {}; std::string smf_addr = {};
std::string smf_port = {};
std::string smf_api_version = {}; std::string smf_api_version = {};
std::string smf_port = "80"; // Set to default port number
if (!psc.get()->smf_available) { if (!psc.get()->smf_available) {
if (amf_cfg.support_features.enable_nrf_selection) { if (amf_cfg.support_features.enable_nrf_selection) {
if (!discover_smf_from_nsi_info( if (!discover_smf_from_nsi_info(
...@@ -376,7 +379,7 @@ void amf_n11::handle_itti_message(itti_nsmf_pdusession_create_sm_context& smf) { ...@@ -376,7 +379,7 @@ void amf_n11::handle_itti_message(itti_nsmf_pdusession_create_sm_context& smf) {
"Decoded PTI for PDUSessionEstablishmentRequest(0x%x)", pti); "Decoded PTI for PDUSessionEstablishmentRequest(0x%x)", pti);
psc.get()->isn2sm_avaliable = false; psc.get()->isn2sm_avaliable = false;
handle_pdu_session_initial_request( handle_pdu_session_initial_request(
supi, psc, smf_addr, smf_api_version, smf.sm_msg, dnn); supi, psc, smf_addr, smf_api_version, smf_port, smf.sm_msg, dnn);
} break; } break;
case EXISTING_PDU_SESSION: { case EXISTING_PDU_SESSION: {
// TODO: // TODO:
...@@ -399,8 +402,8 @@ void amf_n11::send_pdu_session_update_sm_context_request( ...@@ -399,8 +402,8 @@ void amf_n11::send_pdu_session_update_sm_context_request(
std::string smf_addr, bstring sm_msg, std::string dnn) { std::string smf_addr, bstring sm_msg, std::string dnn) {
Logger::amf_n11().debug( Logger::amf_n11().debug(
"Send PDU Session Update SM Context Request to SMF (SUPI %s, PDU Session " "Send PDU Session Update SM Context Request to SMF (SUPI %s, PDU Session "
"ID %d)", "ID %d, %s)",
supi.c_str(), psc.get()->pdu_session_id); supi.c_str(), psc.get()->pdu_session_id, smf_addr.c_str());
std::string smf_ip_addr = {}; std::string smf_ip_addr = {};
std::string remote_uri = {}; std::string remote_uri = {};
...@@ -427,7 +430,7 @@ void amf_n11::send_pdu_session_update_sm_context_request( ...@@ -427,7 +430,7 @@ void amf_n11::send_pdu_session_update_sm_context_request(
octet_stream_2_hex_stream((uint8_t*) bdata(sm_msg), blength(sm_msg), n1SmMsg); octet_stream_2_hex_stream((uint8_t*) bdata(sm_msg), blength(sm_msg), n1SmMsg);
uint8_t http_version = 1; uint8_t http_version = 1;
if (amf_cfg.support_features.use_http2) http_version = 2; // if (amf_cfg.support_features.use_http2) http_version = 2;
curl_http_client( curl_http_client(
remote_uri, json_part, n1SmMsg, "", supi, psc.get()->pdu_session_id, remote_uri, json_part, n1SmMsg, "", supi, psc.get()->pdu_session_id,
...@@ -437,15 +440,20 @@ void amf_n11::send_pdu_session_update_sm_context_request( ...@@ -437,15 +440,20 @@ void amf_n11::send_pdu_session_update_sm_context_request(
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void amf_n11::handle_pdu_session_initial_request( void amf_n11::handle_pdu_session_initial_request(
std::string supi, std::shared_ptr<pdu_session_context> psc, std::string supi, std::shared_ptr<pdu_session_context> psc,
std::string smf_addr, std::string smf_api_version, bstring sm_msg, std::string smf_addr, std::string smf_api_version, std::string smf_port,
std::string dnn) { bstring sm_msg, std::string dnn) {
Logger::amf_n11().debug( Logger::amf_n11().debug(
"Handle PDU Session Establishment Request (SUPI %s, PDU Session ID %d)", "Handle PDU Session Establishment Request (SUPI %s, PDU Session ID %d)",
supi.c_str(), psc.get()->pdu_session_id); supi.c_str(), psc.get()->pdu_session_id);
// TODO: Remove hardcoded values // TODO: Remove hardcoded values
std::string remote_uri =
smf_addr + "/nsmf-pdusession/" + smf_api_version + "/sm-contexts"; std::string amf_port = to_string(amf_cfg.n11.port);
if (amf_cfg.support_features.use_http2)
amf_port = to_string(amf_cfg.sbi_http2_port);
std::string remote_uri = smf_addr + ":" + smf_port + "/nsmf-pdusession/" +
smf_api_version + "/sm-contexts";
nlohmann::json pdu_session_establishment_request; nlohmann::json pdu_session_establishment_request;
pdu_session_establishment_request["supi"] = supi.c_str(); pdu_session_establishment_request["supi"] = supi.c_str();
pdu_session_establishment_request["pei"] = "imei-200000000000001"; pdu_session_establishment_request["pei"] = "imei-200000000000001";
...@@ -465,8 +473,8 @@ void amf_n11::handle_pdu_session_initial_request( ...@@ -465,8 +473,8 @@ void amf_n11::handle_pdu_session_initial_request(
pdu_session_establishment_request["anType"] = "3GPP_ACCESS"; // TODO pdu_session_establishment_request["anType"] = "3GPP_ACCESS"; // TODO
pdu_session_establishment_request["smContextStatusUri"] = pdu_session_establishment_request["smContextStatusUri"] =
"http://" + "http://" +
std::string(inet_ntoa(*((struct in_addr*) &amf_cfg.n11.addr4))) + std::string(inet_ntoa(*((struct in_addr*) &amf_cfg.n11.addr4))) + ":" +
"/nsmf-pdusession/callback/" + supi + "/" + amf_port + "/nsmf-pdusession/callback/" + supi + "/" +
std::to_string(psc.get()->pdu_session_id); std::to_string(psc.get()->pdu_session_id);
pdu_session_establishment_request["n1MessageContainer"]["n1MessageClass"] = pdu_session_establishment_request["n1MessageContainer"]["n1MessageClass"] =
...@@ -482,7 +490,7 @@ void amf_n11::handle_pdu_session_initial_request( ...@@ -482,7 +490,7 @@ void amf_n11::handle_pdu_session_initial_request(
octet_stream_2_hex_stream((uint8_t*) bdata(sm_msg), blength(sm_msg), n1SmMsg); octet_stream_2_hex_stream((uint8_t*) bdata(sm_msg), blength(sm_msg), n1SmMsg);
uint8_t http_version = 1; uint8_t http_version = 1;
// if (amf_cfg.support_features.use_http2) http_version = 2; if (amf_cfg.support_features.use_http2) http_version = 2;
curl_http_client( curl_http_client(
remote_uri, json_part, n1SmMsg, "", supi, psc.get()->pdu_session_id, remote_uri, json_part, n1SmMsg, "", supi, psc.get()->pdu_session_id,
...@@ -1172,10 +1180,9 @@ bool amf_n11::discover_smf( ...@@ -1172,10 +1180,9 @@ bool amf_n11::discover_smf(
if (result) break; if (result) break;
} }
} }
if (smf_port.empty()) smf_port = '80';
Logger::amf_n11().debug( Logger::amf_n11().debug(
"NFDiscovery, SMF Addr: %s, SMF Api Version: %s, SMF Port: %d", "NFDiscovery, SMF Addr: %s, SMF Api Version: %s, SMF Port: %s",
smf_addr.c_str(), smf_api_version.c_str(), smf_port); smf_addr.c_str(), smf_api_version.c_str(), smf_port.c_str());
} else { } else {
Logger::amf_n11().warn("NFDiscovery, could not get response from NRF"); Logger::amf_n11().warn("NFDiscovery, could not get response from NRF");
result = false; result = false;
......
...@@ -53,8 +53,8 @@ class amf_n11 { ...@@ -53,8 +53,8 @@ class amf_n11 {
void handle_itti_message(itti_nsmf_pdusession_create_sm_context&); void handle_itti_message(itti_nsmf_pdusession_create_sm_context&);
void handle_pdu_session_initial_request( void handle_pdu_session_initial_request(
std::string supi, std::shared_ptr<pdu_session_context> psc, std::string supi, std::shared_ptr<pdu_session_context> psc,
std::string smf_addr, std::string smf_api_version, bstring sm_msg, std::string smf_addr, std::string smf_api_version, std::string smf_port,
std::string dnn); bstring sm_msg, std::string dnn);
void handle_itti_message(itti_nsmf_pdusession_update_sm_context& itti_msg); void handle_itti_message(itti_nsmf_pdusession_update_sm_context& itti_msg);
void handle_itti_message(itti_nsmf_pdusession_release_sm_context& itti_msg); void handle_itti_message(itti_nsmf_pdusession_release_sm_context& itti_msg);
void handle_itti_message(itti_pdu_session_resource_setup_response& itti_msg); void handle_itti_message(itti_pdu_session_resource_setup_response& itti_msg);
......
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