Remove dead code

src/common/utils/3gpp_conversions.hpp

@@ -28,7 +28,7 @@
 
 #ifndef FILE_3GPP_CONVERSIONS_HPP_SEEN
 #define FILE_3GPP_CONVERSIONS_HPP_SEEN
-#include "3gpp_29.274.h"
+
 #include "3gpp_29.244.h"
 #include "3gpp_24.501.h"
 #include "endpoint.hpp"

src/pfcp/pfcp.cpp

@@ -873,7 +873,7 @@ void pfcp_l4_stack::send_response(
 
 //------------------------------------------------------------------------------
 void pfcp_l4_stack::notify_ul_error(
-    const pfcp_procedure& p, const ::cause_value_e cause) {
+    const pfcp_procedure& p, const cause_value_e cause) {
   Logger::pfcp().trace(
       "notify_ul_error proc %" PRId64 " cause %d", p.trxn_id, cause);
 }
@@ -908,7 +908,8 @@ void pfcp_l4_stack::time_out_event(
       } else {
         // abort procedure
         notify_ul_error(
-            it_proc->second, ::cause_value_e::REMOTE_PEER_NOT_RESPONDING);
+            it_proc->second,
+            cause_value_e::CAUSE_VALUE_PFCP_ENTITY_IN_CONGESTION);
       }
     }
   } else {

src/pfcp/pfcp.hpp

@@ -28,7 +28,6 @@
 #ifndef FILE_PFCP_HPP_SEEN
 #define FILE_PFCP_HPP_SEEN
 
-#include "3gpp_29.274.h"
 #include "3gpp_29.244.hpp"
 #include "itti.hpp"
 #include "udp.hpp"
@@ -120,7 +119,7 @@ class pfcp_l4_stack : public udp_application {
   void stop_msg_retry_timer(pfcp_procedure& p);
   void stop_msg_retry_timer(timer_id_t& t);
   void stop_proc_cleanup_timer(pfcp_procedure& p);
-  void notify_ul_error(const pfcp_procedure& p, const ::cause_value_e cause);
+  void notify_ul_error(const pfcp_procedure& p, const cause_value_e cause);
 
  public:
   static const uint8_t version = 2;

src/smf_app/smf_app.cpp

@@ -1294,9 +1294,22 @@ bool smf_app::handle_nf_status_notification(
     } else {
       return false;
     }
-  } else {
+  }
+  if (event_type.compare("NF_DEREGISTERED") == 0) {
     Logger::smf_app().debug(
         "This event (%s) has not been supported yet!", event_type);
+    // TODO: Remove UPF from the list UPFs if received DE-REGISTERED Event
+    /*    std::string nf_instance_uri = {};
+        notification_msg.get_nf_instance_uri(nf_instance_uri);
+        std::vector<std::string> split_result;
+
+        boost::split(
+            split_result, nf_instance_uri, boost::is_any_of("/"));
+        if (split_result.size() > 0) {
+          std::string instance_id = split_result[split_result.size() -1];
+          pfcp_associations::get_instance().remove_association(instance_id);
+        }
+     */
   }
 
   return true;

src/smf_app/smf_app.hpp

@@ -39,7 +39,6 @@
 #include <string>
 #include <thread>
 
-#include "3gpp_29.274.h"
 #include "3gpp_29.502.h"
 #include "itti_msg_n11.hpp"
 #include "itti_msg_n4.hpp"

src/smf_app/smf_config.hpp

@@ -39,7 +39,6 @@
 #include "thread_sched.hpp"
 
 #include "3gpp_29.244.h"
-#include "3gpp_29.274.h"
 #include "pfcp.hpp"
 #include "smf.h"
 

src/smf_app/smf_context.hpp

@@ -38,7 +38,6 @@
 
 #include "3gpp_24.008.h"
 #include "3gpp_29.244.h"
-#include "3gpp_29.274.h"
 #include "3gpp_29.502.h"
 #include "3gpp_29.503.h"
 #include "common_root_types.h"

src/smf_app/smf_msg.hpp

@@ -34,7 +34,6 @@
 #include "3gpp_24.007.h"
 #include "3gpp_24.501.h"
 #include "3gpp_29.244.h"
-#include "3gpp_29.274.h"
 #include "3gpp_29.508.h"
 #include "3gpp_29.571.h"
 #include "NgRanTargetId.h"

src/smf_app/smf_pfcp_association.cpp

@@ -385,3 +385,10 @@ bool pfcp_associations::add_peer_candidate_node(
   pending_associations.push_back(s);
   return true;
 }
+
+//------------------------------------------------------------------------------
+bool pfcp_associations::remove_association(
+    const std::string& node_instance_id) {
+  // TODO
+  return true;
+}

src/smf_app/smf_pfcp_association.hpp

@@ -217,6 +217,7 @@ class pfcp_associations {
   bool add_peer_candidate_node(const pfcp::node_id_t& node_id);
   bool add_peer_candidate_node(
       const pfcp::node_id_t& node_id, const upf_profile& profile);
+  bool remove_association(const std::string& node_instance_id);
 };
 }  // namespace smf
 

src/smf_app/smf_procedure.cpp

@@ -31,7 +31,6 @@
 #include <algorithm>  // std::search
 
 #include "3gpp_29.244.h"
-#include "3gpp_29.274.h"
 #include "3gpp_29.500.h"
 #include "3gpp_29.502.h"
 #include "3gpp_conversions.hpp"