Code cleanup

src/smf_app/smf_config.hpp

@@ -55,8 +55,6 @@
 #define SMF_CONFIG_STRING_INTERFACE_N4                          "N4"
 #define SMF_CONFIG_STRING_INTERFACE_SBI                         "SBI"
 
-#define SMF_CONFIG_STRING_SMF_MASQUERADE_SGI                    "PGW_MASQUERADE_SGI"
-#define SMF_CONFIG_STRING_UE_TCP_MSS_CLAMPING                   "UE_TCP_MSS_CLAMPING"
 #define SMF_CONFIG_STRING_NAS_FORCE_PUSH_PCO                    "FORCE_PUSH_PROTOCOL_CONFIGURATION_OPTIONS"
 
 #define SMF_CONFIG_STRING_IP_ADDRESS_POOL                       "IP_ADDRESS_POOL"
@@ -85,12 +83,9 @@
 #define SMF_CONFIG_STRING_IPV4_POOL                             "IPV4_POOL"
 #define SMF_CONFIG_STRING_IPV6_POOL                             "IPV6_POOL"
 
-#define SMF_CONFIG_STRING_TCP_ECN_ENABLED                       "TCP_ECN_ENABLED"
 #define SMF_CONFIG_STRING_AUTOMATIC_PUSH_DEDICATED_BEARER_PCC_RULE  "AUTOMATIC_PUSH_DEDICATED_BEARER_PCC_RULE"
 #define SMF_CONFIG_STRING_DEFAULT_BEARER_STATIC_PCC_RULE        "DEFAULT_BEARER_STATIC_PCC_RULE"
 #define SMF_CONFIG_STRING_PUSH_STATIC_PCC_RULES                 "PUSH_STATIC_PCC_RULES"
-#define SMF_CONFIG_STRING_APN_AMBR_UL                           "APN_AMBR_UL"
-#define SMF_CONFIG_STRING_APN_AMBR_DL                           "APN_AMBR_DL"
 #define SMF_ABORT_ON_ERROR true
 #define SMF_WARN_ON_ERROR  false
 

src/smf_app/smf_context.cpp

@@ -2515,8 +2515,6 @@ std::string dnn_context::toString() const {
   s.append("DNN CONTEXT:\n");
   s.append("\tIn use:\t\t\t\t").append(std::to_string(in_use)).append("\n");
   s.append("\tDNN:\t\t\t\t").append(dnn_in_use).append("\n");
-  //s.append("\tAPN AMBR Bitrate Uplink:\t").append(std::to_string(apn_ambr.br_ul)).append("\n");
-  //s.append("\tAPN AMBR Bitrate Downlink:\t").append(std::to_string(apn_ambr.br_dl)).append("\n");
   for (auto it : pdu_sessions) {
     s.append(it->toString());
   }

src/smf_app/smf_n11.cpp

@@ -232,126 +232,6 @@ void smf_n11::send_n1n2_message_transfer_request(
   curl_global_cleanup();
   free_wrapper((void**) &data);
 
-  /*
-   //Curl MIME
-   //format string as hex
-   unsigned char *n1_msg_hex = smf_app_inst->format_string_as_hex(n1_message);
-
-   CURL *curl = curl_easy_init();
-
-   //N1N2MessageTransfer Notification URI??
-   std::string json_part = context_res_msg.n1n2_message_transfer_data.dump();
-
-   Logger::smf_n11().debug("Sending message to AMF....");
-
-   if (curl) {
-   CURLcode res = { };
-   struct curl_slist *headers = nullptr;
-   struct curl_slist *slist = nullptr;
-   curl_mime *mime;
-   curl_mime *alt;
-   curl_mimepart *part;
-
-   //headers = curl_slist_append(headers, "charsets: utf-8");
-   headers = curl_slist_append(headers, "content-type: multipart/related");
-   curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
-   curl_easy_setopt(curl, CURLOPT_URL, context_res_msg.get_amf_url().c_str());
-   curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
-   curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, AMF_CURL_TIMEOUT_MS);
-   curl_easy_setopt(curl, CURLOPT_INTERFACE, smf_cfg.sbi.if_name.c_str());
-
-   mime = curl_mime_init(curl);
-   alt = curl_mime_init(curl);
-
-   //part with N1N2MessageTransferReqData (JsonData)
-   part = curl_mime_addpart(mime);
-   curl_mime_data(part, json_part.c_str(), CURL_ZERO_TERMINATED);
-   curl_mime_type(part, "application/json");
-
-   //N1 SM Container
-   Logger::smf_n11().debug(
-   "Add N1 SM Container (NAS) into the message: %s (bytes %d)",
-   context_res_msg.get_n1_sm_message().c_str(),
-   context_res_msg.get_n1_sm_message().length() / 2);
-   part = curl_mime_addpart(mime);
-   curl_mime_data(part, reinterpret_cast<const char*>(n1_msg_hex),
-   context_res_msg.get_n1_sm_message().length() / 2);
-   curl_mime_type(part, "application/vnd.3gpp.5gnas");
-   curl_mime_name(
-   part,
-   context_res_msg.n1n2_message_transfer_data["n1MessageContainer"]["n1MessageContent"]["contentId"]
-   .dump().c_str());
-
-   auto n2_sm_found = context_res_msg.n1n2_message_transfer_data.count(
-   "n2InfoContainer");
-   if (n2_sm_found > 0) {
-   std::string n2_message = context_res_msg.get_n2_sm_information();
-   unsigned char *n2_msg_hex = smf_app_inst->format_string_as_hex(
-   n2_message);
-   Logger::smf_n11().debug(
-   "Add N2 SM Information (NGAP) into the message: %s (bytes %d)",
-   n2_message.c_str(), n2_message.length() / 2);
-   part = curl_mime_addpart(mime);
-   curl_mime_data(part, reinterpret_cast<const char*>(n2_msg_hex), 80);  //TODO: n2_message.length()/2 ISSUE need to be solved
-   curl_mime_type(part, "application/vnd.3gpp.ngap");
-   curl_mime_name(
-   part,
-   context_res_msg.n1n2_message_transfer_data["n2InfoContainer"]["smInfo"]["n2InfoContent"]["ngapData"]["contentId"]
-   .dump().c_str());
-   }
-
-   curl_easy_setopt(curl, CURLOPT_MIMEPOST, mime);
-
-   // Response information.
-   long httpCode = { 0 };
-   std::unique_ptr<std::string> httpData(new std::string());
-
-   // Hook up data handling function.
-   curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &callback);
-   curl_easy_setopt(curl, CURLOPT_WRITEDATA, httpData.get());
-
-   res = curl_easy_perform(curl);
-   curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &httpCode);
-
-   //get cause from the response
-   json response_data = { };
-   try {
-   response_data = json::parse(*httpData.get());
-   } catch (json::exception &e) {
-   Logger::smf_n11().error("Could not get the cause from the response");
-   //Set the default Cause
-   response_data["cause"] = "504 Gateway Timeout";
-   }
-   Logger::smf_n11().debug("Response from AMF, Http Code: %d, cause %s",
-   httpCode, response_data["cause"].dump().c_str());
-
-   //send response to APP to process
-   itti_n11_n1n2_message_transfer_response_status *itti_msg =
-   new itti_n11_n1n2_message_transfer_response_status(TASK_SMF_N11,
-   TASK_SMF_APP);
-   itti_msg->set_response_code(httpCode);
-   itti_msg->set_scid(sm_context_res->scid);
-   itti_msg->set_cause(response_data["cause"]);
-   if (context_res_msg.get_cause() == REQUEST_ACCEPTED) {
-   itti_msg->set_msg_type(PDU_SESSION_ESTABLISHMENT_ACCEPT);
-   } else {
-   itti_msg->set_msg_type(PDU_SESSION_ESTABLISHMENT_REJECT);
-   }
-   std::shared_ptr<itti_n11_n1n2_message_transfer_response_status> i =
-   std::shared_ptr<itti_n11_n1n2_message_transfer_response_status>(
-   itti_msg);
-   int ret = itti_inst->send_msg(i);
-   if (RETURNok != ret) {
-   Logger::smf_n11().error(
-   "Could not send ITTI message %s to task TASK_SMF_APP",
-   i->get_msg_name());
-   }
-
-   curl_slist_free_all(headers);
-   curl_easy_cleanup(curl);
-   curl_mime_free(mime);
-   }
-   */
 }
 
 //------------------------------------------------------------------------------

src/smf_app/smf_procedure.cpp

@@ -971,63 +971,6 @@ void session_update_sm_context_procedure::handle_itti_msg(
           .c_str());
 
   switch (session_procedure_type) {
-    /*
-     case session_management_procedures_type_e::SERVICE_REQUEST_UE_TRIGGERED_STEP1: {
-     if (cause.cause_value == CAUSE_VALUE_REQUEST_ACCEPTED) {
-     Logger::smf_app().info(
-     "Service Request (step 1) accepted by UPF");
-     //delete AN Info
-
-     std::map<uint8_t, qos_flow_context_updated> qos_flow_context_to_be_updateds =
-     { };
-     n11_triggered_pending->res.get_all_qos_flow_context_updateds(
-     qos_flow_context_to_be_updateds);
-     n11_triggered_pending->res.remove_all_qos_flow_context_updateds();
-
-     for (auto it : qos_flow_context_to_be_updateds)
-     Logger::smf_app().debug("QoS Flow context to be modified QFI %d",
-     it.first);
-
-     for (auto it : qos_flow_context_to_be_updateds) {
-     smf_qos_flow flow = { };
-     if (!sps->get_qos_flow(it.second.qfi, flow)) {  //no QoS flow found
-     Logger::smf_app().error(
-     "Could not found any QoS flow with QFI %d",
-     it.first);
-     continue;
-     }
-     //if FAR DL exist -> remove it
-     if ((flow.far_id_dl.first) && (flow.far_id_dl.second.far_id)) {
-     Logger::smf_app().debug(
-     "FAR DL " "0x%" PRIx32 " has been removed",
-     flow.far_id_dl.second.far_id);
-     flow.far_id_dl.first = false;
-     flow.far_id_dl.second.far_id = 0;
-     }
-     //remove PDR DL if exist
-     if (flow.pdr_id_dl.rule_id) {
-     Logger::smf_app().debug(
-     "PDR DL " "0x%" PRIx16 " has been removed",
-     flow.pdr_id_dl.rule_id);
-     flow.pdr_id_dl.rule_id = 0;
-     }
-     // Update QoS Flow
-     smf_qos_flow flow2 = flow;
-     sps->add_qos_flow(flow2);
-
-     qos_flow_context_updated qcu = { };
-     qcu.set_cause(REQUEST_ACCEPTED);
-
-     qcu.set_qfi(pfcp::qfi_t(it.first));
-     qcu.set_ul_fteid(flow.ul_fteid);
-     qcu.set_qos_profile(flow.qos_profile);
-     n11_triggered_pending->res.add_qos_flow_context_updated(qcu);
-
-     }
-     }
-     }
-     break;
-     */
     case session_management_procedures_type_e::PDU_SESSION_ESTABLISHMENT_UE_REQUESTED:
     case session_management_procedures_type_e::PDU_SESSION_MODIFICATION_SMF_REQUESTED:
     case session_management_procedures_type_e::PDU_SESSION_MODIFICATION_AN_REQUESTED:
@@ -1200,10 +1143,6 @@ void session_update_sm_context_procedure::handle_itti_msg(
 
     //FOR TESTING PURPOSE
     case session_management_procedures_type_e::PDU_SESSION_TEST: {
-
-      //N1 SM: PDU Session Modification Command​
-      //N2 SM: PDU Session Resource Modify Request Transfer IE
-
       //N1 SM
       smf_n1_n2_inst.create_n1_sm_container(
           n11_triggered_pending->res, PDU_SESSION_MODIFICATION_REQUEST,