Update action with support features

src/smf_app/smf_app.cpp

@@ -340,17 +340,17 @@ smf_app::smf_app(const std::string& config_file)
     throw;
   }
 
-  // TODO: should be done when SMF select UPF for a particular UE (should be
-  // verified)
-  for (std::vector<pfcp::node_id_t>::const_iterator it = smf_cfg.upfs.begin();
-       it != smf_cfg.upfs.end(); ++it) {
-    start_upf_association(*it);
-  }
-
   if (smf_cfg.discover_upf) {
     // Trigger NFStatusNotify subscription to be noticed when a new UPF becomes
     // available (if this option is enabled)
     trigger_upf_status_notification_subscribe();
+  } else {
+    // TODO: should be done when SMF select UPF for a particular UE (should be
+    // verified)
+    for (std::vector<pfcp::node_id_t>::const_iterator it = smf_cfg.upfs.begin();
+         it != smf_cfg.upfs.end(); ++it) {
+      start_upf_association(*it);
+    }
   }
 
   // Register to NRF (if this option is enabled)

src/smf_app/smf_config.hpp

@@ -226,12 +226,14 @@ class smf_config {
     struct in_addr ipv4_addr;
     unsigned int port;
     std::string api_version;
+    std::string fqdn;
   } amf_addr;
 
   struct {
     struct in_addr ipv4_addr;
     unsigned int port;
     std::string api_version;
+    std::string fqdn;
   } udm_addr;
 
   std::vector<pfcp::node_id_t> upfs;
@@ -240,6 +242,7 @@ class smf_config {
     struct in_addr ipv4_addr;
     unsigned int port;
     std::string api_version;
+    std::string fqdn;
   } nrf_addr;
 
 #define SMF_NUM_SESSION_MANAGEMENT_SUBSCRIPTION_MAX 10
@@ -299,13 +302,17 @@ class smf_config {
     amf_addr.ipv4_addr.s_addr = INADDR_ANY;
     amf_addr.port             = 80;
     amf_addr.api_version      = "v1";
+    amf_addr.fqdn             = {};
+
     udm_addr.ipv4_addr.s_addr = INADDR_ANY;
     udm_addr.port             = 80;
     udm_addr.api_version      = "v1";
+    udm_addr.fqdn             = {};
 
     nrf_addr.ipv4_addr.s_addr = INADDR_ANY;
     nrf_addr.port             = 80;
     nrf_addr.api_version      = "v1";
+    nrf_addr.fqdn             = {};
 
     num_session_management_subscription = 0;