Merge branch 'fix_amf_http2_port' into 'develop'

Fix issue for AMF's HTTP2 port

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

src/smf_app/smf_context.cpp

@@ -1596,15 +1596,21 @@ void smf_context::handle_pdu_session_create_sm_context_request(
 
     boost::split(split_result, amf_status_uri, boost::is_any_of("/"));
     if (split_result.size() >= 3) {
-      std::string addr = split_result[2];
-      // remove http port from the URI if existed
-      std::size_t found_port = addr.find(":");
-      if (found_port != std::string::npos) addr = addr.substr(0, found_port);
+      std::string full_addr = split_result[2];
+      // Check if the AMF addr is valid
+      std::size_t found_port = full_addr.find(":");
+
+      std::string addr = {};  // Addr without port
+      if (found_port != std::string::npos) {
+        addr = full_addr.substr(0, found_port);
+      } else {
+        addr = full_addr;
+      }
       struct in_addr amf_ipv4_addr;
       if (inet_aton(util::trim(addr).c_str(), &amf_ipv4_addr) == 0) {
         Logger::smf_api_server().warn("Bad IPv4 for AMF");
       } else {
-        amf_addr_str = addr;
+        amf_addr_str = full_addr;
         Logger::smf_api_server().debug("AMF IP Addr %s", amf_addr_str.c_str());
       }
     }