Merge branch 'fix_http2' into 'develop'

Fix http2

See merge request oai/cn5g/oai-cn5g-smf!99

etc/smf.conf

@@ -91,7 +91,7 @@ SMF =
                                                         # but you may need to set to yes for UE that do not explicitly request a PDN address through NAS signalling
       USE_LOCAL_SUBSCRIPTION_INFO = "yes";  # Set to yes if SMF uses local subscription information instead of from an UDM
       USE_FQDN_DNS = "@USE_FQDN_DNS@";                  # Set to yes if AMF/UDM/NRF/UPF will relying on a DNS to resolve FQDN
-      HTTP_VERSION = @HTTP_VERSION@;                    # YOUR NRF CONFIG HERE (default: 1)
+      HTTP_VERSION = @HTTP_VERSION@;                    # Default: 1
       USE_NETWORK_INSTANCE = "@USE_NETWORK_INSTANCE@"   # Set yes if network instance is to be used for given UPF
     }  
   
@@ -100,7 +100,7 @@ SMF =
       IPV4_ADDRESS = "@AMF_IPV4_ADDRESS@";  # YOUR AMF CONFIG HERE
       PORT         = @AMF_PORT@;            # YOUR AMF CONFIG HERE (default: 80)
       API_VERSION  = "@AMF_API_VERSION@";   # YOUR AMF API VERSION FOR SBI CONFIG HERE
-      FQDN         = "@AMF_FQDN@"               # YOUR AMF FQDN CONFIG HERE
+      FQDN         = "@AMF_FQDN@"           # YOUR AMF FQDN CONFIG HERE
     };
     
     UDM :
@@ -108,7 +108,7 @@ SMF =
       IPV4_ADDRESS = "@UDM_IPV4_ADDRESS@";  # YOUR UDM CONFIG HERE
       PORT         = @UDM_PORT@;            # YOUR UDM CONFIG HERE (default: 80)
       API_VERSION  = "@UDM_API_VERSION@";   # YOUR UDM API VERSION FOR SBI CONFIG HERE
-      FQDN         = "@UDM_FQDN@"      # YOUR UDM FQDN CONFIG HERE
+      FQDN         = "@UDM_FQDN@"           # YOUR UDM FQDN CONFIG HERE
     };    
 
     NRF :
@@ -116,7 +116,7 @@ SMF =
       IPV4_ADDRESS = "@NRF_IPV4_ADDRESS@";  # YOUR NRF CONFIG HERE
       PORT         = @NRF_PORT@;            # YOUR NRF CONFIG HERE (default: 80)
       API_VERSION  = "@NRF_API_VERSION@";   # YOUR NRF API VERSION FOR SBI CONFIG HERE
-      FQDN         = "@NRF_FQDN@"      # YOUR NRF FQDN CONFIG HERE
+      FQDN         = "@NRF_FQDN@"           # YOUR NRF FQDN CONFIG HERE
     };
         
     UPF_LIST = (

src/smf_app/smf_app.cpp

@@ -892,7 +892,7 @@ void smf_app::handle_pdu_session_create_sm_context_request(
   // If no DNN information from UE, set to default value
   std::string dnn = smreq->req.get_dnn();
   if (dnn.length() == 0) {
-    dnn == smf_cfg.get_default_dnn();
+    dnn = smf_cfg.get_default_dnn();
   }
 
   // TODO: For the moment, not support PDU session authentication and

src/smf_app/smf_config.cpp

@@ -1233,8 +1233,6 @@ std::string smf_config::get_default_dnn() {
 //------------------------------------------------------------------------------
 bool smf_config::get_nwi_list_index(
     bool nwi_enabled, uint8_t nwi_list_index, pfcp::node_id_t node_id) {
-  Logger::smf_app().debug("Default DNN: %s", smf_cfg.dnn[0].dnn.c_str());
-  // return smf_cfg.dnn[0].dnn;
   if (node_id.node_id_type == pfcp::NODE_ID_TYPE_IPV4_ADDRESS) {
     for (int i = 0; i < upf_nwi_list.size(); i++) {
       if (node_id.u1.ipv4_address.s_addr ==

src/smf_app/smf_procedure.cpp

@@ -1194,6 +1194,10 @@ void session_update_sm_context_procedure::handle_itti_msg(
 
       // set UpCnxState to ACTIVATED
       sps->set_upCnx_state(upCnx_state_e::UPCNX_STATE_ACTIVATED);
+      // Display UE Context Info
+      Logger::smf_app().info(
+          "SMF context: \n %s", sc.get()->toString().c_str());
+
       // Trigger Event_exposure event
       std::string str_scid = n11_trigger.get()->scid;
       // TODO: validate the str_scid

src/smf_app/smf_sbi.cpp

@@ -237,7 +237,7 @@ void smf_sbi::send_n1n2_message_transfer_request(
   // Create a new curl easy handle and add to the multi handle
   if (!curl_create_handle(
           sm_context_res->res.get_amf_url(), data_str, str_len, response_data,
-          pid_ptr, "POST", true)) {
+          pid_ptr, "POST", true, sm_context_res->http_version)) {
     Logger::smf_sbi().warn("Could not create a new handle to send message");
     remove_promise(promise_id);
     return;