Polish configuration file/rename PDN to PDU_Session_Type

etc/smf.conf

@@ -21,26 +21,25 @@
 
 SMF =
 {
-    INSTANCE                                  = @INSTANCE@;                     # 0 is the default
-    PID_DIRECTORY                             = "@PID_DIRECTORY@";              # /var/run is the default
+    INSTANCE      = @INSTANCE@;              # 0 is the default
+    PID_DIRECTORY = "@PID_DIRECTORY@";  # /var/run is the default
 
     INTERFACES :
     {
         N4 :
         {
             # SMF binded interface for N4 communication (UPF)
-            INTERFACE_NAME         = "@SMF_INTERFACE_NAME_FOR_N4@"; # STRING, interface name
-            IPV4_ADDRESS           = "read";                        # STRING, CIDR or "read" to let app read interface configured IP address
+            INTERFACE_NAME = "@SMF_INTERFACE_NAME_FOR_N4@"; # YOUR NETWORK CONFIG HERE
+            IPV4_ADDRESS   = "read";                        
          };
 
         SBI :
         {
             # SMF binded interface for SBI interface (e.g., communication with AMF, UDM)
-            INTERFACE_NAME         = "@SMF_INTERFACE_NAME_FOR_SBI@"; # STRING, interface name
-            #IPV4_ADDRESS          = "@SMF_INTERFACE_IPV4_ADDRESS_FOR_SBI@";                        # STRING, CIDR or "read" to let app read interface configured IP address
+            INTERFACE_NAME         = "@SMF_INTERFACE_NAME_FOR_SBI@";     # YOUR NETWORK CONFIG HERE
             IPV4_ADDRESS           = "read";
-            PORT                   = @SMF_INTERFACE_PORT_FOR_SBI@; #Normally we don't need this (default port 80)
-            HTTP2_PORT             = @SMF_INTERFACE_HTTP2_PORT_FOR_SBI@; 
+            PORT                   = @SMF_INTERFACE_PORT_FOR_SBI@;       # YOUR NETWORK CONFIG HERE (default: 80)
+            HTTP2_PORT             = @SMF_INTERFACE_HTTP2_PORT_FOR_SBI@; # YOUR NETWORK CONFIG HERE
          };                 
 
     };
@@ -48,55 +47,55 @@ SMF =
 
     # Pool of UE assigned IP addresses
     # Do not make IP pools overlap
-    # first IPv4 address X.Y.Z.1 is reserved for GTP network device on SPGW
-    # Normally no more than 96 pools allowed, but for non OVS GTP solution, only one pool allowed (TODO).
+    # first IPv4 address X.Y.Z.1 is reserved for GTP network device on UPF
     IP_ADDRESS_POOL :
     {
         IPV4_LIST = (
-                      {RANGE = "12.1.1.2 - 12.1.1.128";},                                  # STRING, IPv4 RANGE IP_start - IP_end, YOUR NETWORK CONFIG HERE.
-                      {RANGE = "12.1.1.129 - 12.1.1.224";},                                # STRING, IPv4 RANGE IP_start - IP_end, YOUR NETWORK CONFIG HERE.
-                      {RANGE = "192.169.0.2 - 192.169.255.253";},                          # STRING, IPv4 RANGE IP_start - IP_end, YOUR NETWORK CONFIG HERE.
-                      {RANGE = "192.170.0.2 - 192.170.255.253";},                          # STRING, IPv4 RANGE IP_start - IP_end, YOUR NETWORK CONFIG HERE.
-                      {RANGE = "192.171.0.2 - 192.171.255.253";}                           # STRING, IPv4 RANGE IP_start - IP_end, YOUR NETWORK CONFIG HERE.
+                      {RANGE = "12.1.1.2 - 12.1.1.128";},         # STRING, IPv4 RANGE IP_start - IP_end, YOUR NETWORK CONFIG HERE.
+                      {RANGE = "12.1.1.129 - 12.1.1.224";},       # STRING, IPv4 RANGE IP_start - IP_end, YOUR NETWORK CONFIG HERE.
+                      {RANGE = "192.169.0.2 - 192.169.255.253";}, # STRING, IPv4 RANGE IP_start - IP_end, YOUR NETWORK CONFIG HERE.
+                      {RANGE = "192.170.0.2 - 192.170.255.253";}, # STRING, IPv4 RANGE IP_start - IP_end, YOUR NETWORK CONFIG HERE.
+                      {RANGE = "192.171.0.2 - 192.171.255.253";}  # STRING, IPv4 RANGE IP_start - IP_end, YOUR NETWORK CONFIG HERE.
                     );
         IPV6_LIST = (
-                      {PREFIX = "2001:1:2::/64";},                                         # STRING, IPv6 prefix, YOUR NETWORK CONFIG HERE.
-                      {PREFIX = "3001:1:2::/64";},                                         # STRING, IPv6 prefix, YOUR NETWORK CONFIG HERE.
-                      {PREFIX = "4001:1:2::/64";}                                          # STRING, IPv6 prefix, YOUR NETWORK CONFIG HERE.
+                      {PREFIX = "2001:1:2::/64";},                # STRING, IPv6 prefix, YOUR NETWORK CONFIG HERE.
+                      {PREFIX = "3001:1:2::/64";},                # STRING, IPv6 prefix, YOUR NETWORK CONFIG HERE.
+                      {PREFIX = "4001:1:2::/64";}                 # STRING, IPv6 prefix, YOUR NETWORK CONFIG HERE.
                     );
     };
 
     DNN_LIST = (
-       # IPV4_POOL, IPV6_POOL are index in IPV4_LIST, IPV6_LIST, PDN_TYPE choice in {IPv4, IPv6, IPv4v6}
-      {DNN_NI = "default"; PDN_TYPE = "IPv4"; IPV4_POOL  = 0; IPV6_POOL = -1},
-      {DNN_NI = "carrier.com"; PDN_TYPE = "IPv4"; IPV4_POOL = 1; IPV6_POOL = -1},
-      {DNN_NI = "apn2"; PDN_TYPE = "IPv4"; IPV4_POOL = 2; IPV6_POOL = -1},
-      {DNN_NI = "apn3"; PDN_TYPE = "IPv4"; IPV4_POOL = 3; IPV6_POOL = -1},
-      {DNN_NI = "apn4"; PDN_TYPE = "IPv4"; IPV4_POOL = 4; IPV6_POOL = -1}
+       # IPV4_POOL, IPV6_POOL are index in IPV4_LIST, IPV6_LIST, PDU_SESSION_TYPE choice in {IPv4, IPv6, IPv4v6}
+      {DNN_NI = "default"; PDU_SESSION_TYPE = "IPv4"; IPV4_POOL  = 0; IPV6_POOL = -1},
+      {DNN_NI = "carrier.com"; PDU_SESSION_TYPE = "IPv4"; IPV4_POOL = 1; IPV6_POOL = -1},
+      {DNN_NI = "apn2"; PDU_SESSION_TYPE = "IPv4"; IPV4_POOL = 2; IPV6_POOL = -1},
+      {DNN_NI = "apn3"; PDU_SESSION_TYPE = "IPv4"; IPV4_POOL = 3; IPV6_POOL = -1},
+      {DNN_NI = "apn4"; PDU_SESSION_TYPE = "IPv4"; IPV4_POOL = 4; IPV6_POOL = -1}
     );
 
     # DNS address communicated to UEs
-    DEFAULT_DNS_IPV4_ADDRESS     = "@DEFAULT_DNS_IPV4_ADDRESS@";                # YOUR NETWORK CONFIG HERE
-    DEFAULT_DNS_SEC_IPV4_ADDRESS = "@DEFAULT_DNS_SEC_IPV4_ADDRESS@";            # YOUR NETWORK CONFIG HERE
-    DEFAULT_DNS_IPV6_ADDRESS     = "2001:4860:4860::8888";                      # FFU
-    DEFAULT_DNS_SEC_IPV6_ADDRESS = "2001:4860:4860::8844";                      # FFU
+    DEFAULT_DNS_IPV4_ADDRESS     = "@DEFAULT_DNS_IPV4_ADDRESS@";      # YOUR DNS CONFIG HERE
+    DEFAULT_DNS_SEC_IPV4_ADDRESS = "@DEFAULT_DNS_SEC_IPV4_ADDRESS@";  # YOUR DNS CONFIG HERE
+    DEFAULT_DNS_IPV6_ADDRESS     = "2001:4860:4860::8888";            # YOUR DNS CONFIG HERE
+    DEFAULT_DNS_SEC_IPV6_ADDRESS = "2001:4860:4860::8844";            # YOUR DNS CONFIG HERE
 
     # Non standard feature, normally should be set to "no", but you may need to set to yes for UE that do not explicitly request a PDN address through NAS signalling
-    FORCE_PUSH_PROTOCOL_CONFIGURATION_OPTIONS = "no";                           # STRING, {"yes", "no"}.
+    FORCE_PUSH_PROTOCOL_CONFIGURATION_OPTIONS = "no";  # STRING, {"yes", "no"}.
 
     AMF :
     {
-      IPV4_ADDRESS="@AMF_IPV4_ADDRESS@";
-      PORT = @AMF_PORT@; #should be removed (default: 80)
+      IPV4_ADDRESS="@AMF_IPV4_ADDRESS@";  # YOUR AMF CONFIG HERE
+      PORT = @AMF_PORT@;                  # YOUR AMF CONFIG HERE (default: 80)
     };
+    
     UDM :
     {
-      IPV4_ADDRESS="@UDM_IPV4_ADDRESS@";
-      PORT = @UDM_PORT@; #should be removed (default 80)
+      IPV4_ADDRESS="@UDM_IPV4_ADDRESS@";  # YOUR UDM CONFIG HERE
+      PORT = @UDM_PORT@;                  # YOUR UDM CONFIG HERE (default: 80)
     };
     
     UPF_LIST = (
-         {IPV4_ADDRESS="@UPF_IPV4_ADDRESS@" ;}
+         {IPV4_ADDRESS="@UPF_IPV4_ADDRESS@" ;}  # YOUR UPF CONFIG HERE
     );
     
     LOCAL_CONFIGURATION :

src/smf_app/smf_config.hpp

@@ -79,7 +79,7 @@
 
 #define SMF_CONFIG_STRING_DNN_LIST                              "DNN_LIST"
 #define SMF_CONFIG_STRING_DNN_NI                                "DNN_NI"
-#define SMF_CONFIG_STRING_PDN_TYPE                              "PDN_TYPE"
+#define SMF_CONFIG_STRING_PDN_TYPE                              "PDU_SESSION_TYPE"
 #define SMF_CONFIG_STRING_IPV4_POOL                             "IPV4_POOL"
 #define SMF_CONFIG_STRING_IPV6_POOL                             "IPV6_POOL"