Code cleanup

etc/smf.conf

@@ -21,7 +21,7 @@
 
 SMF =
 {
-    INSTANCE      = @INSTANCE@;              # 0 is the default
+    INSTANCE      = @INSTANCE@;         # 0 is the default
     PID_DIRECTORY = "@PID_DIRECTORY@";  # /var/run is the default
 
     INTERFACES :
@@ -36,10 +36,10 @@ SMF =
         SBI :
         {
             # SMF binded interface for SBI interface (e.g., communication with AMF, UDM)
-            INTERFACE_NAME         = "@SMF_INTERFACE_NAME_FOR_SBI@";     # YOUR NETWORK CONFIG HERE
-            IPV4_ADDRESS           = "read";
-            PORT                   = @SMF_INTERFACE_PORT_FOR_SBI@;       # YOUR NETWORK CONFIG HERE (default: 80)
-            HTTP2_PORT             = @SMF_INTERFACE_HTTP2_PORT_FOR_SBI@; # YOUR NETWORK CONFIG HERE
+            INTERFACE_NAME = "@SMF_INTERFACE_NAME_FOR_SBI@";     # YOUR NETWORK CONFIG HERE
+            IPV4_ADDRESS   = "read";
+            PORT           = @SMF_INTERFACE_PORT_FOR_SBI@;       # YOUR NETWORK CONFIG HERE (default: 80)
+            HTTP2_PORT     = @SMF_INTERFACE_HTTP2_PORT_FOR_SBI@; # YOUR NETWORK CONFIG HERE
          };                 
 
     };

src/common/amf.h

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-#ifndef FILE_AMF_SEEN
-#define FILE_AMF_SEEN
-
-
-
-
-
-#endif

src/common/logger.cpp

@@ -55,17 +55,17 @@ void Logger::_init(const char *app, const bool log_stdout,
   std::stringstream ss;
   ss << "[%Y-%m-%dT%H:%M:%S.%f] [" << app << "] [%n] [%l] %v";
 
-  m_async_cmd = new _Logger("async_c  ", m_sinks, ss.str().c_str());
-  m_itti = new _Logger("itti     ", m_sinks, ss.str().c_str());
+  m_async_cmd = new _Logger("async_c ", m_sinks, ss.str().c_str());
+  m_itti = new _Logger("itti    ", m_sinks, ss.str().c_str());
   m_smf_app = new _Logger("smf_app ", m_sinks, ss.str().c_str());
-  m_system = new _Logger("system   ", m_sinks, ss.str().c_str());
-  m_udp = new _Logger("udp      ", m_sinks, ss.str().c_str());
-  m_pfcp = new _Logger("pfcp     ", m_sinks, ss.str().c_str());
+  m_system = new _Logger("system  ", m_sinks, ss.str().c_str());
+  m_udp = new _Logger("udp     ", m_sinks, ss.str().c_str());
+  m_pfcp = new _Logger("pfcp    ", m_sinks, ss.str().c_str());
   m_pfcp_switch = new _Logger("pfcp_sw  ", m_sinks, ss.str().c_str());
   m_smf_n4 = new _Logger("smf_n4  ", m_sinks, ss.str().c_str());
-  m_smf_n10 = new _Logger("smf_n10  ", m_sinks, ss.str().c_str());
-  m_smf_n11 = new _Logger("smf_n11  ", m_sinks, ss.str().c_str());
-  m_smf_api_server = new _Logger("smf_api_server  ", m_sinks, ss.str().c_str());
+  m_smf_n10 = new _Logger("smf_n10 ", m_sinks, ss.str().c_str());
+  m_smf_n11 = new _Logger("smf_n11 ", m_sinks, ss.str().c_str());
+  m_smf_api_server = new _Logger("api_server", m_sinks, ss.str().c_str());
 }
 
 ////////////////////////////////////////////////////////////////////////////////

src/common/smf.h

@@ -182,11 +182,11 @@ typedef struct qos_profile_s {
 #define NAMF_COMMUNICATION_N1N2_MESSAGE_TRANSFER_URL  "/namf-comm/v2/ue-contexts/{}/n1-n2-messages" //context id
 #define NUDM_SDM_GET_SM_DATA_URL                      "/nudm-sdm/v2/{}/sm-data" //ue Id
 #define N1_SM_CONTENT_ID                              "n1SmMsg"
-#define N1N2_MESSAGE_CLASS                             "SM"
+#define N1N2_MESSAGE_CLASS                            "SM"
 #define N2_SM_CONTENT_ID                              "n2msg"
-#define NSMF_CALLBACK_N1N2_MESSAGE_TRANSFER_FAILURE  "/nsmf-pdusession/v2/callback/N1N2MsgTxfrFailureNotification/{}" //UE Id
-#define NSMF_PDU_SESSION_SM_CONTEXT_CREATE_URL  "/nsmf-pdusession/v2/sm-contexts"
-#define NSMF_PDU_SESSION_SM_CONTEXT_UPDATE_URL  "/nsmf-pdusession/v2/sm-contexts/"
+#define NSMF_CALLBACK_N1N2_MESSAGE_TRANSFER_FAILURE   "/nsmf-pdusession/v2/callback/N1N2MsgTxfrFailureNotification/{}" //UE Id
+#define NSMF_PDU_SESSION_SM_CONTEXT_CREATE_URL        "/nsmf-pdusession/v2/sm-contexts"
+#define NSMF_PDU_SESSION_SM_CONTEXT_UPDATE_URL        "/nsmf-pdusession/v2/sm-contexts/"
 
 //for CURL
 #define AMF_CURL_TIMEOUT_MS 100L

src/smf_app/smf_config.cpp

@@ -45,7 +45,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
-//#include "3gpp_29.274.hpp"
 #include "common_defs.h"
 #include "epc.h"
 #include "if.hpp"

src/smf_app/smf_config.hpp

@@ -73,7 +73,6 @@
 #define SMF_CONFIG_STRING_DEFAULT_DNS_IPV6_ADDRESS              "DEFAULT_DNS_IPV6_ADDRESS"
 #define SMF_CONFIG_STRING_DEFAULT_DNS_SEC_IPV6_ADDRESS          "DEFAULT_DNS_SEC_IPV6_ADDRESS"
 #define SMF_CONFIG_STRING_UE_MTU                                "UE_MTU"
-#define SMF_CONFIG_STRING_GTPV1U_REALIZATION                    "GTPV1U_REALIZATION"
 
 #define SMF_CONFIG_STRING_INTERFACE_DISABLED                    "none"
 
@@ -83,9 +82,6 @@
 #define SMF_CONFIG_STRING_IPV4_POOL                             "IPV4_POOL"
 #define SMF_CONFIG_STRING_IPV6_POOL                             "IPV6_POOL"
 
-#define SMF_CONFIG_STRING_AUTOMATIC_PUSH_DEDICATED_BEARER_PCC_RULE  "AUTOMATIC_PUSH_DEDICATED_BEARER_PCC_RULE"
-#define SMF_CONFIG_STRING_DEFAULT_BEARER_STATIC_PCC_RULE        "DEFAULT_BEARER_STATIC_PCC_RULE"
-#define SMF_CONFIG_STRING_PUSH_STATIC_PCC_RULES                 "PUSH_STATIC_PCC_RULES"
 #define SMF_ABORT_ON_ERROR true
 #define SMF_WARN_ON_ERROR  false