remove uncessary code

src/smf_app/smf_app.cpp

@@ -323,8 +323,7 @@ smf_app::smf_app(const std::string& config_file)
       m_scid2smf_context(),
       m_sm_context_create_promises(),
       m_sm_context_update_promises(),
-      m_sm_context_release_promises(),
-	  event_sub(){
+      m_sm_context_release_promises() {
   Logger::smf_app().startup("Starting...");
 
   supi2smf_context  = {};
@@ -332,9 +331,9 @@ smf_app::smf_app(const std::string& config_file)
   seid_n4_generator = 0;
 
   // Subscribe to sm context status change
-  pdu_session_status_connection =
-      event_sub.subscribe_ee_pdu_session_status_change(boost::bind(
-          &smf_app::handle_pdu_session_status_change, this, _1, _2, _3));
+  //  pdu_session_status_connection =
+  //      event_sub.subscribe_ee_pdu_session_status_change(boost::bind(
+  //          &smf_app::handle_pdu_session_status_change, this, _1, _2, _3));
 
   apply_config(smf_cfg);
 
@@ -622,17 +621,18 @@ void smf_app::handle_itti_msg(itti_n11_update_pdu_session_status& m) {
       pdu_session_status_e2str.at(static_cast<int>(m.pdu_session_status))
           .c_str());
   update_pdu_session_status(m.scid, m.pdu_session_status);
-  if ((m.pdu_session_status  == pdu_session_status_e::PDU_SESSION_ACTIVE) or (m.pdu_session_status  == pdu_session_status_e::PDU_SESSION_INACTIVE)){
-	  Logger::smf_app().info("Notify PDU Session Status change");
-	  std::string status;
-	  if (m.pdu_session_status  == pdu_session_status_e::PDU_SESSION_ACTIVE)
-	     status = "ESTABLISHED";
-	  else
-		  status = "RELEASED";
-
-	  event_sub.ee_pdu_session_status(
-			  m.scid, status, 1);
+  if ((m.pdu_session_status == pdu_session_status_e::PDU_SESSION_ACTIVE) or
+      (m.pdu_session_status == pdu_session_status_e::PDU_SESSION_INACTIVE)) {
+    Logger::smf_app().info("Notify PDU Session Status change");
+    std::string status;
+    /*	  if (m.pdu_session_status  == pdu_session_status_e::PDU_SESSION_ACTIVE)
+                 status = "ESTABLISHED";
+              else
+                      status = "RELEASED";
 
+              event_sub.ee_pdu_session_status(
+                      m.scid, status, 1);
+    */
   }
 }
 
@@ -2118,97 +2118,97 @@ void smf_app::handle_pdu_session_status_change(
       scid);
 
   // get the smf context
-   std::shared_ptr<smf_context_ref> scf = {};
-
-   if (is_scid_2_smf_context(scid)) {
-     scf = scid_2_smf_context(scid);
-   } else {
-     Logger::smf_app().warn(
-         "Context associated with this id " SCID_FMT " does not exit!", scid);
-   }
-
-   supi_t supi                     = scf.get()->supi;
-   supi64_t supi64                 = smf_supi_to_u64(supi);
-   pdu_session_id_t pdu_session_id = scf.get()->pdu_session_id;
-
-   std::shared_ptr<smf_context> sc = {};
-
-   if (is_supi_2_smf_context(supi64)) {
-     sc = supi_2_smf_context(supi64);
-     Logger::smf_app().debug(
-         "Retrieve SMF context with SUPI " SUPI_64_FMT "", supi64);
-   } else {
-     Logger::smf_app().warn(
-         "Could not retrieve the corresponding SMF context with "
-         "Supi " SUPI_64_FMT "!",
-         supi64);
-   }
-
-   // get dnn context
-   std::shared_ptr<dnn_context> sd = {};
-
-   if (!sc.get()->find_dnn_context(scf.get()->nssai, scf.get()->dnn, sd)) {
-     if (nullptr == sd.get()) {
-       Logger::smf_app().warn(
-           "Could not retrieve the corresponding DNN context!");
-     }
-   }
-   // get smd_pdu_session
-   std::shared_ptr<smf_pdu_session> sp = {};
-   bool find_pdn = sd.get()->find_pdu_session(pdu_session_id, sp);
-
-   if (nullptr == sp.get()) {
-     Logger::smf_app().warn(
-         "Could not retrieve the corresponding SMF PDU Session context!");
-   }
-
-   Logger::smf_app().debug(
-       "Send request to N11 to triger PDU Session Status Change Notification (Event "
-       "Exposure), SUPI " SUPI_64_FMT " , PDU Session ID %d, HTTP version  %d",
-       supi, pdu_session_id, http_version);
-
-   std::vector<std::shared_ptr<smf_subscription>> subscriptions = {};
-   smf_app_inst->get_ee_subscriptions(
-       smf_event_t::SMF_EVENT_PDU_SES_REL, subscriptions);
-
-   if (subscriptions.size() > 0) {
-     // Send request to N11 to trigger the notification to the subscribed event
-     Logger::smf_app().debug(
-         "Send ITTI msg to SMF N11 to trigger the event notification");
-     std::shared_ptr<itti_n11_notify_subscribed_event> itti_msg =
-         std::make_shared<itti_n11_notify_subscribed_event>(
-             TASK_SMF_APP, TASK_SMF_SBI);
-
-     for (auto i : subscriptions) {
-       event_notification ev_notif = {};
-       ev_notif.set_supi(supi64);
-       ev_notif.set_pdu_session_id(pdu_session_id);
-       ev_notif.set_smf_event(smf_event_t::SMF_EVENT_PDU_SES_REL);
-       ev_notif.set_notif_uri(i.get()->notif_uri);
-       ev_notif.set_notif_id(i.get()->notif_id);
-       //custom json e.g., for FlexCN
-	   nlohmann::json cj = {};
-       if (sp.get() != nullptr) {
-           if (sp->ipv4) {
-        	   cj["ue_ipv4_addr"]  = conv::toString(sp->ipv4_address);
-           }
-           cj["pdu_session_type"]  = sp->pdu_session_type.toString();
-       }
-
-       ev_notif.set_custom_info(cj);
-       itti_msg->event_notifs.push_back(ev_notif);
-     }
-
-     itti_msg->http_version = http_version;
-
-     int ret = itti_inst->send_msg(itti_msg);
-     if (RETURNok != ret) {
-       Logger::smf_app().error(
-           "Could not send ITTI message %s to task TASK_SMF_SBI",
-           itti_msg->get_msg_name());
-     }
-   } else {
-     Logger::smf_app().debug("No subscription available for this event");
-   }
-}
+  std::shared_ptr<smf_context_ref> scf = {};
+
+  if (is_scid_2_smf_context(scid)) {
+    scf = scid_2_smf_context(scid);
+  } else {
+    Logger::smf_app().warn(
+        "Context associated with this id " SCID_FMT " does not exit!", scid);
+  }
+
+  supi_t supi                     = scf.get()->supi;
+  supi64_t supi64                 = smf_supi_to_u64(supi);
+  pdu_session_id_t pdu_session_id = scf.get()->pdu_session_id;
+
+  std::shared_ptr<smf_context> sc = {};
+
+  if (is_supi_2_smf_context(supi64)) {
+    sc = supi_2_smf_context(supi64);
+    Logger::smf_app().debug(
+        "Retrieve SMF context with SUPI " SUPI_64_FMT "", supi64);
+  } else {
+    Logger::smf_app().warn(
+        "Could not retrieve the corresponding SMF context with "
+        "Supi " SUPI_64_FMT "!",
+        supi64);
+  }
+
+  // get dnn context
+  std::shared_ptr<dnn_context> sd = {};
 
+  if (!sc.get()->find_dnn_context(scf.get()->nssai, scf.get()->dnn, sd)) {
+    if (nullptr == sd.get()) {
+      Logger::smf_app().warn(
+          "Could not retrieve the corresponding DNN context!");
+    }
+  }
+  // get smd_pdu_session
+  std::shared_ptr<smf_pdu_session> sp = {};
+  bool find_pdn = sd.get()->find_pdu_session(pdu_session_id, sp);
+
+  if (nullptr == sp.get()) {
+    Logger::smf_app().warn(
+        "Could not retrieve the corresponding SMF PDU Session context!");
+  }
+
+  Logger::smf_app().debug(
+      "Send request to N11 to triger PDU Session Status Change Notification "
+      "(Event "
+      "Exposure), SUPI " SUPI_64_FMT " , PDU Session ID %d, HTTP version  %d",
+      supi, pdu_session_id, http_version);
+
+  std::vector<std::shared_ptr<smf_subscription>> subscriptions = {};
+  smf_app_inst->get_ee_subscriptions(
+      smf_event_t::SMF_EVENT_PDU_SES_REL, subscriptions);
+
+  if (subscriptions.size() > 0) {
+    // Send request to N11 to trigger the notification to the subscribed event
+    Logger::smf_app().debug(
+        "Send ITTI msg to SMF N11 to trigger the event notification");
+    std::shared_ptr<itti_n11_notify_subscribed_event> itti_msg =
+        std::make_shared<itti_n11_notify_subscribed_event>(
+            TASK_SMF_APP, TASK_SMF_SBI);
+
+    for (auto i : subscriptions) {
+      event_notification ev_notif = {};
+      ev_notif.set_supi(supi64);
+      ev_notif.set_pdu_session_id(pdu_session_id);
+      ev_notif.set_smf_event(smf_event_t::SMF_EVENT_PDU_SES_REL);
+      ev_notif.set_notif_uri(i.get()->notif_uri);
+      ev_notif.set_notif_id(i.get()->notif_id);
+      // custom json e.g., for FlexCN
+      nlohmann::json cj = {};
+      if (sp.get() != nullptr) {
+        if (sp->ipv4) {
+          cj["ue_ipv4_addr"] = conv::toString(sp->ipv4_address);
+        }
+        cj["pdu_session_type"] = sp->pdu_session_type.toString();
+      }
+
+      ev_notif.set_custom_info(cj);
+      itti_msg->event_notifs.push_back(ev_notif);
+    }
+
+    itti_msg->http_version = http_version;
+
+    int ret = itti_inst->send_msg(itti_msg);
+    if (RETURNok != ret) {
+      Logger::smf_app().error(
+          "Could not send ITTI message %s to task TASK_SMF_SBI",
+          itti_msg->get_msg_name());
+    }
+  } else {
+    Logger::smf_app().debug("No subscription available for this event");
+  }
+}

src/smf_app/smf_app.hpp

@@ -149,10 +149,9 @@ class smf_app {
   timer_id_t timer_nrf_heartbeat;
 
   // for Event Handling
-  smf_event event_sub;
-  bs2::connection pdu_session_status_connection;
-  bs2::connection ee_pdu_session_release_connection;
-
+  //  smf_event event_sub;
+  //  bs2::connection pdu_session_status_connection;
+  //  bs2::connection ee_pdu_session_release_connection;
 
   /*
    * Apply the config from the configuration file for DNN pools
@@ -219,8 +218,9 @@ class smf_app {
   virtual ~smf_app() {
     Logger::smf_app().debug("Delete SMF_APP instance...");
     // Disconnect the boost connection
-    if (pdu_session_status_connection.connected())
-    	pdu_session_status_connection.disconnect();
+    /*    if (pdu_session_status_connection.connected())
+            pdu_session_status_connection.disconnect();
+     */
     // TODO: Unregister NRF
   }
 

src/smf_app/smf_event_sig.hpp

@@ -48,7 +48,8 @@ typedef bs2::signal_type<
 // SCID, PDU Session Status, HTTP version
 typedef bs2::signal_type<
     void(scid_t, const std::string&, uint8_t),
-    bs2::keywords::mutex_type<bs2::dummy_mutex>>::type ee_pdu_session_status_sig_t;
+    bs2::keywords::mutex_type<bs2::dummy_mutex>>::type
+    ee_pdu_session_status_sig_t;
 
 // Signal for Event exposure
 // PDU session Release, SUPI, PDU SessionID, HTTP version
@@ -62,6 +63,7 @@ typedef bs2::signal_type<
 // TODO: UP Path Change
 // TODO: PLMN Change
 // TODO: Downlink data delivery status
+// TODO: Customized APIs for FlexCN
 
 }  // namespace smf
 #endif /* FILE_SMF_EVENT_SIG_HPP_SEEN */