Support PDN Session Type IPv4v6

src/smf_app/smf_app.cpp

@@ -506,7 +506,7 @@ void smf_app::handle_itti_msg(std::shared_ptr<itti_n4_node_failure> snf) {
           "Remove the associated PDU session (SUPI " SUPI_64_FMT
           ", PDU Sessin Id %d)",
           supi64, it.second->pdu_session_id);
-      //TODO: remove the session
+      // TODO: remove the session
     }
   }
 }
@@ -729,6 +729,7 @@ void smf_app::handle_pdu_session_create_sm_context_request(
   // Get necessary info from NAS
   xgpp_conv::sm_context_request_from_nas(decoded_nas_msg, smreq->req);
 
+  pdu_session_type.pdu_session_type = smreq->req.get_pdu_session_type();
   // TODO: Support IPv4 only for now
   if (pdu_session_type.pdu_session_type == PDU_SESSION_TYPE_E_IPV6) {
     cause_n1 = cause_value_5gsm_e::CAUSE_50_PDU_SESSION_TYPE_IPV4_ONLY_ALLOWED;
@@ -737,7 +738,9 @@ void smf_app::handle_pdu_session_create_sm_context_request(
       (pdu_session_type.pdu_session_type == PDU_SESSION_TYPE_E_UNSTRUCTURED)) {
     cause_n1 = cause_value_5gsm_e::CAUSE_28_UNKNOWN_PDU_SESSION_TYPE;
   }
-  if (pdu_session_type.pdu_session_type != PDU_SESSION_TYPE_E_IPV4) {
+
+  if ((pdu_session_type.pdu_session_type != PDU_SESSION_TYPE_E_IPV4) and
+      (pdu_session_type.pdu_session_type != PDU_SESSION_TYPE_E_IPV4V6)) {
     // PDU Session Establishment Reject
     if (smf_n1::get_instance().create_n1_pdu_session_establishment_reject(
             smreq->req, n1_sm_message, cause_n1)) {

src/smf_app/smf_context.cpp

@@ -1338,8 +1338,56 @@ void smf_context::handle_pdu_session_create_sm_context_request(
   bool set_paa = false;
   paa_t paa    = {};
   Logger::smf_app().debug("UE Address Allocation");
+
   switch (sp->pdu_session_type.pdu_session_type) {
+    case PDU_SESSION_TYPE_E_IPV4V6: {
+      Logger::smf_app().debug(
+          "PDU Session Type IPv4v6, select PDU Session Type IPv4");
+      bool paa_res = false;
+      /*
+      //TODO: Verified if use default session type or requested session type
+      std::shared_ptr<session_management_subscription> ss = {};
+      std::shared_ptr<dnn_configuration_t> sdc            = {};
+      find_dnn_subscription(snssai, ss);
+      if (nullptr != ss.get()) {
+        ss.get()->find_dnn_configuration(sd->dnn_in_use, sdc);
+        if (nullptr != sdc.get()) {
+          paa.pdu_session_type.pdu_session_type =
+              sdc.get()
+                  ->pdu_session_types.default_session_type.pdu_session_type;
+        }
+      }
+ */
+      paa.pdu_session_type.pdu_session_type = PDU_SESSION_TYPE_E_IPV4V6;
+      if ((not paa_res) || (not paa.is_ip_assigned())) {
+        bool success =
+            paa_dynamic::get_instance().get_free_paa(sd->dnn_in_use, paa);
+        if (success) {
+          set_paa = true;
+        } else {
+          // ALL_DYNAMIC_ADDRESSES_ARE_OCCUPIED;
+          set_paa          = false;
+          request_accepted = false;
+          sm_context_resp->res.set_cause(static_cast<uint8_t>(
+              cause_value_5gsm_e::CAUSE_26_INSUFFICIENT_RESOURCES));
+        }
+        // TODO: Static IP address allocation
+      } else if ((paa_res) && (paa.is_ip_assigned())) {
+        set_paa = true;
+      }
+      Logger::smf_app().info(
+          "PAA, Ipv4 Address: %s",
+          inet_ntoa(*((struct in_addr*) &paa.ipv4_address)));
+
+      char str_addr6[INET6_ADDRSTRLEN];
+      if (inet_ntop(
+              AF_INET6, &paa.ipv6_address, str_addr6, sizeof(str_addr6))) {
+        Logger::smf_app().info("PAA, IPv6 Address: %s", str_addr6);
+      }
+
+    }; break;
     case PDU_SESSION_TYPE_E_IPV4: {
+      Logger::smf_app().debug("PDU Session Type IPv4");
       if (!pco_ids.ci_ipv4_address_allocation_via_dhcpv4) {
         // use SM NAS signalling
         // static or dynamic address allocation
@@ -1357,7 +1405,10 @@ void smf_context::handle_pdu_session_create_sm_context_request(
           if (nullptr != sdc.get()) {
             paa.pdu_session_type.pdu_session_type =
                 sdc.get()
-                    ->pdu_session_types.default_session_type.pdu_session_type;
+                    ->pdu_session_types.default_session_type
+                    .pdu_session_type;  // TODO: Verified if use default session
+                                        // type or requested session type
+
             // TODO: static ip address
           }
         }
@@ -1395,11 +1446,6 @@ void smf_context::handle_pdu_session_create_sm_context_request(
       Logger::smf_app().debug("IPv6 has not been supported yet!");
     } break;
 
-    case PDU_SESSION_TYPE_E_IPV4V6: {
-      // TODO:
-      Logger::smf_app().debug("IPv4/v6 has not been supported yet!");
-    } break;
-
     default: {
       Logger::smf_app().error(
           "Unknown PDN type %d", sp->pdu_session_type.pdu_session_type);
@@ -1546,7 +1592,6 @@ void smf_context::handle_pdu_session_create_sm_context_request(
           paa_dynamic::get_instance().release_paa(
               sd->dnn_in_use, free_paa.ipv4_address);
           break;
-
         case PDU_SESSION_TYPE_E_IPV6:
         case PDU_SESSION_TYPE_E_UNSTRUCTURED:
         case PDU_SESSION_TYPE_E_ETHERNET:

src/smf_app/smf_n1.cpp

@@ -166,7 +166,7 @@ bool smf_n1::create_n1_pdu_session_establishment_accept(
       paa.ipv4_address, sm_msg->pdu_session_establishment_accept.pduaddress
                             .pdu_address_information);
   sm_msg->pdu_session_establishment_accept.pduaddress.pdu_session_type_value =
-      static_cast<uint8_t>(PDU_SESSION_TYPE_E_IPV4);
+      static_cast<uint8_t>(paa.pdu_session_type.pdu_session_type);
   Logger::smf_n1().debug(
       "UE Address %s", conv::toString(paa.ipv4_address).c_str());