New N2 class

src/common/logger.cpp

@@ -62,6 +62,8 @@ void Logger::_init(const char *app, const bool log_stdout,
   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_n1 = new _Logger("smf_n1  ", m_sinks, ss.str().c_str());
+  m_smf_n2 = new _Logger("smf_n2  ", 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());

src/common/logger.hpp

@@ -107,6 +107,13 @@ class Logger {
   static _Logger& pfcp_switch() {
     return *singleton().m_pfcp_switch;
   }
+
+  static _Logger& smf_n1() {
+    return *singleton().m_smf_n1;
+  }
+  static _Logger& smf_n2() {
+    return *singleton().m_smf_n2;
+  }
   static _Logger& smf_n4() {
     return *singleton().m_smf_n4;
   }
@@ -146,6 +153,8 @@ class Logger {
   _Logger *m_udp;
   _Logger *m_pfcp;
   _Logger *m_pfcp_switch;
+  _Logger *m_smf_n1;
+  _Logger *m_smf_n2;
   _Logger *m_smf_n4;
   _Logger *m_smf_n10;
   _Logger *m_smf_n11;

src/smf_app/smf_context.cpp

@@ -731,9 +731,14 @@ void smf_context::handle_itti_msg(
             //N2 SM Information
             smf_n2 smf_n2_inst = { };
             std::string n2_sm_info, n2_sm_info_hex;
-            smf_n2_inst.create_n2_sm_information(
-                session_report_msg, 1, n2_sm_info_type_e::PDU_RES_SETUP_REQ,
+            //smf_n2_inst.create_n2_sm_information(
+            //    session_report_msg, 1, n2_sm_info_type_e::PDU_RES_SETUP_REQ,
+            //    n2_sm_info);
+
+            smf_n2_inst.create_n2_pdu_session_resource_setup_request_transfer(
+                session_report_msg, n2_sm_info_type_e::PDU_RES_SETUP_REQ,
                 n2_sm_info);
+
             smf_app_inst->convert_string_2_hex(n2_sm_info, n2_sm_info_hex);
             session_report_msg.set_n2_sm_information(n2_sm_info_hex);
 
@@ -1794,8 +1799,12 @@ void smf_context::handle_pdu_session_update_sm_context_request(
             n11_sm_context_resp->res, PDU_SESSION_MODIFICATION_COMMAND,
             n1_sm_msg_to_be_created, cause_value_5gsm_e::CAUSE_0_UNKNOWN) or  //TODO: need cause?
             //N2 SM (PDU Session Resource Modify Request Transfer IE)
-            not smf_n2_inst.create_n2_sm_information(
-                n11_sm_context_resp->res, 1, n2_sm_info_type_e::PDU_RES_MOD_REQ,
+            //    not smf_n2_inst.create_n2_sm_information(
+            //        n11_sm_context_resp->res, 1, n2_sm_info_type_e::PDU_RES_MOD_REQ,
+            //        n2_sm_info_to_be_created)) {
+
+            not smf_n2_inst.create_n2_pdu_session_resource_modify_request_transfer(
+                n11_sm_context_resp->res, n2_sm_info_type_e::PDU_RES_MOD_REQ,
                 n2_sm_info_to_be_created)) {
           smf_app_inst->trigger_http_response(
               http_status_code_e::HTTP_STATUS_CODE_500_INTERNAL_SERVER_ERROR,
@@ -2371,9 +2380,13 @@ void smf_context::handle_pdu_session_update_sm_context_request(
 
     // Create N2 SM Information: PDU Session Resource Setup Request Transfer IE
     //N2 SM Information
-    smf_n2_inst.create_n2_sm_information(
-        sm_context_resp_pending->res, 1, n2_sm_info_type_e::PDU_RES_SETUP_REQ,
+    //smf_n2_inst.create_n2_sm_information(
+    //    sm_context_resp_pending->res, 1, n2_sm_info_type_e::PDU_RES_SETUP_REQ,
+    //    n2_sm_info);
+    smf_n2_inst.create_n2_pdu_session_resource_setup_request_transfer(
+        sm_context_resp_pending->res, n2_sm_info_type_e::PDU_RES_SETUP_REQ,
         n2_sm_info);
+
     smf_app_inst->convert_string_2_hex(n2_sm_info, n2_sm_info_hex);
     sm_context_resp_pending->res.set_n2_sm_information(n2_sm_info_hex);
 
@@ -2641,7 +2654,10 @@ void smf_context::handle_pdu_session_modification_network_requested(
   itti_msg->msg.set_n1_sm_message(n1_sm_msg_hex);
 
   //N2: PDU Session Resource Modify Response Transfer
-  smf_n2_inst.create_n2_sm_information(itti_msg->msg, 1,
+  //smf_n2_inst.create_n2_sm_information(itti_msg->msg, 1,
+  //                                        n2_sm_info_type_e::PDU_RES_MOD_REQ,
+  //                                        n2_sm_info);
+  smf_n2_inst.create_n2_pdu_session_resource_modify_request_transfer(itti_msg->msg,
                                           n2_sm_info_type_e::PDU_RES_MOD_REQ,
                                           n2_sm_info);
 

src/smf_app/smf_n1.hpp

+/*
+ * 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
+ */
+
+/*! \file smf_n1.hpp
+ * \brief
+ \author  Tien-Thinh NGUYEN
+ \company Eurecom
+ \date 2019
+ \email: tien-thinh.nguyen@eurecom.fr
+ */
+
+#ifndef FILE_SMF_N1_HPP_SEEN
+#define FILE_SMF_N1_HPP_SEEN
+
+#include <string>
+
+#include "smf.h"
+#include "smf_context.hpp"
+#include "smf_msg.hpp"
+#include "3gpp_29.502.h"
+
+extern "C" {
+#include "nas_message.h"
+}
+
+namespace smf {
+
+class smf_n1 {
+ private:
+
+ public:
+  smf_n1() {
+  }
+  ;
+  smf_n1(smf_n1 const&) = delete;
+  void operator=(smf_n1 const&) = delete;
+
+  /*
+   * Create N1 SM Container to send to AMF (using NAS lib)
+   * @param [pdu_session_msg&] msg
+   * @param [uint8_t] msg_type Type of N1 message
+   * @param [std::string&] nas_msg_str store NAS message in form of string
+   * @param [uint8_t] sm_cause store NAS Cause
+   * @return boolean: True if the NAS message has been created successfully, otherwise return false
+   */
+  bool create_n1_sm_container(pdu_session_msg &msg, uint8_t msg_type,
+                              std::string &nas_msg_str,
+                              cause_value_5gsm_e sm_cause);
+
+  /*
+   * Decode N1 SM Container into the NAS mesasge (using NAS lib)
+   * @param [nas_message_t&] nas_msg Store NAS message after decoded
+   * @param [const std::string&] n1_sm_msg N1 SM Container
+   * @return status of the decode process
+   */
+  int decode_n1_sm_container(nas_message_t &nas_msg, const std::string &n1_sm_msg);
+
+  /*
+   * Decode N2 SM Information Ngap_PDUSessionResourceSetupResponseTransfer
+   * @param [std::shared_ptr<Ngap_PDUSessionResourceSetupResponseTransfer_t>&] ngap_IE Store decoded NGAP message
+   * @param [const std::string&] n2_sm_info N2 SM Information
+   * @return status of the decode process
+   */
+
+
+};
+
+}  // namespace smf
+
+#endif /* FILE_SMF_N1_HPP_SEEN */

src/smf_app/smf_n2.hpp

+/*
+ * 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
+ */
+
+/*! \file smf_n2.hpp
+ * \brief
+ \author  Tien-Thinh NGUYEN
+ \company Eurecom
+ \date 2019
+ \email: tien-thinh.nguyen@eurecom.fr
+ */
+
+#ifndef FILE_SMF_N2_HPP_SEEN
+#define FILE_SMF_N2_HPP_SEEN
+
+#include <string>
+
+#include "smf.h"
+#include "smf_msg.hpp"
+#include "smf_app.hpp"
+#include "3gpp_29.502.h"
+#include "SmContextCreateData.h"
+#include "SmContextCreateError.h"
+
+extern "C" {
+#include "Ngap_PDUSessionResourceSetupResponseTransfer.h"
+#include "Ngap_PDUSessionResourceModifyResponseTransfer.h"
+#include "Ngap_PDUSessionResourceReleaseResponseTransfer.h"
+#include "Ngap_PDUSessionResourceSetupUnsuccessfulTransfer.h"
+}
+
+namespace smf {
+
+class smf_n2 {
+ private:
+
+ public:
+  smf_n2() {
+  }
+  ;
+  smf_n2(smf_n2 const&) = delete;
+  void operator=(smf_n2 const&) = delete;
+
+  /*
+   * Create N2 SM Information: PDU Session Resource Setup Request Transfer
+   * This IE is included in N1N2MessageTransfer Request (Accept, PDU Session Establishment procedure - UE initiated)
+   * @param [pdu_session_create_sm_context_response] sm_context_res: include necessary information for encoding NGAP msg
+   * @param [std::string&] ngap_msg_str store the created NGAP message in form of string
+   * @return boolean: True if the NGAP message has been created successfully, otherwise return false
+   *
+   */
+  bool create_n2_pdu_session_resource_setup_request_transfer(pdu_session_create_sm_context_response &sm_context_res, n2_sm_info_type_e ngap_info_type,
+                                  std::string &ngap_msg_str);
+
+  /*
+   * Create N2 SM Information: PDU Session Resource Setup Request Transfer
+   * This IE is included in PDU Session Update SM Context Response​ (Service Request, step 2)
+   * @param [pdu_session_update_sm_context_response] sm_context_res: include necessary information for encoding NGAP msg
+   * @param [std::string&] ngap_msg_str store the created NGAP message in form of string
+   * @return boolean: True if the NGAP message has been created successfully, otherwise return false
+   *
+   */
+   bool create_n2_pdu_session_resource_setup_request_transfer(pdu_session_update_sm_context_response &sm_context_res, n2_sm_info_type_e ngap_info_type,
+                                  std::string &ngap_msg_str);
+
+   /*
+    * Create N2 SM Information: PDU Session Resource Setup Request Transfer
+    * This IE is included in N1N2MessageTranfer (N4 Data Report)
+    * @param [pdu_session_report_response] msg: include necessary information for encoding NGAP msg
+    * @param [std::string&] ngap_msg_str store the created NGAP message in form of string
+    * @return boolean: True if the NGAP message has been created successfully, otherwise return false
+    *
+    */
+   bool create_n2_pdu_session_resource_setup_request_transfer(pdu_session_report_response &msg, n2_sm_info_type_e ngap_info_type,
+                                   std::string &ngap_msg_str);
+
+   /*
+    * Create N2 SM Information: PDU Session Resource Modify Request Transfer IE
+    * This IE is included in  PDU Session Update SM Context Response (PDU Session Modification procedure, UE-initiated, step 1)
+    * @param [pdu_session_update_sm_context_response] sm_context_res: include necessary information for encoding NGAP msg
+    * @param [std::string&] ngap_msg_str store the created NGAP message in form of string
+    * @return boolean: True if the NGAP message has been created successfully, otherwise return false
+    *
+    */
+  bool create_n2_pdu_session_resource_modify_request_transfer(pdu_session_update_sm_context_response &sm_context_res, n2_sm_info_type_e ngap_info_type,
+                                    std::string &ngap_msg_str);
+
+  /*
+   * Create N2 SM Information: PDU Session Resource Modify Request Transfer IE
+   * This IE is included in  N1N2MessageTransfer Request (PDU Session Modification procedure, SMF-requested, step 1)
+   * @param [pdu_session_update_sm_context_response] sm_context_res: include necessary information for encoding NGAP msg
+   * @param [std::string&] ngap_msg_str store the created NGAP message in form of string
+   * @return boolean: True if the NGAP message has been created successfully, otherwise return false
+   *
+   */
+  bool create_n2_pdu_session_resource_modify_request_transfer(pdu_session_modification_network_requested &msg, n2_sm_info_type_e ngap_info_type,
+                                    std::string &ngap_msg_str);
+
+  /*
+   * Create N2 SM Information: PDU Session Resource Modify Response Transfer IE
+   *
+   * @param [pdu_session_update_sm_context_response] sm_context_res: include necessary information for encoding NGAP msg
+   * @param [std::string&] ngap_msg_str store the created NGAP message in form of string
+   * @return boolean: True if the NGAP message has been created successfully, otherwise return false
+   *
+   */
+  bool create_n2_pdu_session_resource_modify_response_transfer(pdu_session_update_sm_context_response &sm_context_res, n2_sm_info_type_e ngap_info_type,
+                                    std::string &ngap_msg_str);
+
+
+//  bool create_n2_pdu_session_resource_modify_response_transfer(pdu_session_modification_network_requested &msg, n2_sm_info_type_e ngap_info_type,
+//                                    std::string &ngap_msg_str);
+
+  /*
+   * Create N2 SM Information: PDU Session Resource Release Command Transfer IE
+   * This IE is included in the following messages:
+   * PDU Session Update SM Context Response (PDU Session Release UE-Initiated: section 4.3.4@3GPP TS 23.502, step 1)
+   * N1N2MessageTransfer Request​ (PDU Session Release SMF-Requested, step 1)
+   * @param [pdu_session_update_sm_context_response] sm_context_res: include necessary information for encoding NGAP msg
+   * @param [std::string&] ngap_msg_str store the created NGAP message in form of string
+   * @return boolean: True if the NGAP message has been created successfully, otherwise return false
+   *
+   */
+  bool create_n2_pdu_session_resource_release_command_transfer(pdu_session_update_sm_context_response &sm_context_res, n2_sm_info_type_e ngap_info_type,
+                                    std::string &ngap_msg_str);
+
+  /*
+   * Decode N2 SM Information Ngap_PDUSessionResourceSetupResponseTransfer
+   * @param [std::shared_ptr<Ngap_PDUSessionResourceSetupResponseTransfer_t>&] ngap_IE Store decoded NGAP message
+   * @param [const std::string&] n2_sm_info N2 SM Information
+   * @return status of the decode process
+   */
+  int decode_n2_sm_information(
+      std::shared_ptr<Ngap_PDUSessionResourceSetupResponseTransfer_t> &ngap_IE,
+      const std::string &n2_sm_info);
+
+  /*
+   * Decode N2 SM Information Ngap_PDUSessionResourceModifyResponseTransfer_t
+   * @param [std::shared_ptr<Ngap_PDUSessionResourceModifyResponseTransfer_t>&] ngap_IE Store decoded NGAP message
+   * @param [std::string&] n2_sm_info N2 SM Information
+   * @return status of the decode process
+   */
+  int decode_n2_sm_information(
+      std::shared_ptr<Ngap_PDUSessionResourceModifyResponseTransfer_t> &ngap_IE,
+      const std::string &n2_sm_info);
+
+  /*
+   * Decode N2 SM Information Ngap_PDUSessionResourceReleaseResponseTransfer_t
+   * @param [std::shared_ptr<Ngap_PDUSessionResourceReleaseResponseTransfer_t>&] ngap_IE Store decoded NGAP message
+   * @param [std::string&] n2_sm_info N2 SM Information
+   * @return status of the decode process
+   */
+  int decode_n2_sm_information(
+      std::shared_ptr<Ngap_PDUSessionResourceReleaseResponseTransfer_t> &ngap_IE,
+      const std::string &n2_sm_info);
+
+  /*
+   * Decode N2 SM Information Ngap_PDUSessionResourceSetupUnsuccessfulTransfer
+   * @param [std::shared_ptr<Ngap_PDUSessionResourceSetupUnsuccessfulTransfer_t>&] ngap_IE Store decoded NGAP message
+   * @param [std::string&] n2_sm_info N2 SM Information
+   * @return status of the decode process
+   */
+  int decode_n2_sm_information(
+      std::shared_ptr<Ngap_PDUSessionResourceSetupUnsuccessfulTransfer_t> &ngap_IE,
+      const std::string &n2_sm_info);
+
+};
+
+}  // namespace smf
+
+#endif /* FILE_SMF_N2_HPP_SEEN */

src/smf_app/smf_procedure.cpp

@@ -412,9 +412,13 @@ void session_create_sm_context_procedure::handle_itti_msg(
     smf_app_inst->convert_string_2_hex(n1_sm_msg, n1_sm_msg_hex);
     n11_triggered_pending->res.set_n1_sm_message(n1_sm_msg_hex);
     //N2 SM Information (Step 11, section 4.3.2.2.1 @ 3GPP TS 23.502): PDUSessionRessourceSetupRequestTransfer IE
-    smf_n2_inst.create_n2_sm_information(
-        n11_triggered_pending->res, 1, n2_sm_info_type_e::PDU_RES_SETUP_REQ,
+    //smf_n2_inst.create_n2_sm_information(
+    //    n11_triggered_pending->res, 1, n2_sm_info_type_e::PDU_RES_SETUP_REQ,
+    //    n2_sm_info);
+    smf_n2_inst.create_n2_pdu_session_resource_setup_request_transfer(
+        n11_triggered_pending->res, n2_sm_info_type_e::PDU_RES_SETUP_REQ,
         n2_sm_info);
+
     smf_app_inst->convert_string_2_hex(n2_sm_info, n2_sm_info_hex);
     n11_triggered_pending->res.set_n2_sm_information(n2_sm_info_hex);
   }
@@ -1064,8 +1068,11 @@ void session_update_sm_context_procedure::handle_itti_msg(
       smf_app_inst->convert_string_2_hex(n1_sm_msg, n1_sm_msg_hex);
       n11_triggered_pending->res.set_n1_sm_message(n1_sm_msg_hex);
       //N2 SM Information
-      smf_n2_inst.create_n2_sm_information(
-          n11_triggered_pending->res, 1, n2_sm_info_type_e::PDU_RES_MOD_RSP,
+      //smf_n2_inst.create_n2_sm_information(
+      //    n11_triggered_pending->res, 1, n2_sm_info_type_e::PDU_RES_MOD_RSP,
+      //    n2_sm_info);
+      smf_n2_inst.create_n2_pdu_session_resource_modify_response_transfer(
+          n11_triggered_pending->res, n2_sm_info_type_e::PDU_RES_MOD_RSP,
           n2_sm_info);
       smf_app_inst->convert_string_2_hex(n2_sm_info, n2_sm_info_hex);
       n11_triggered_pending->res.set_n2_sm_information(n2_sm_info_hex);
@@ -1099,9 +1106,13 @@ void session_update_sm_context_procedure::handle_itti_msg(
       // Create N2 SM Information: PDU Session Resource Setup Request Transfer IE
 
       //N2 SM Information
-      smf_n2_inst.create_n2_sm_information(
-          n11_triggered_pending->res, 1, n2_sm_info_type_e::PDU_RES_SETUP_REQ,
+      //smf_n2_inst.create_n2_sm_information(
+      //    n11_triggered_pending->res, 1, n2_sm_info_type_e::PDU_RES_SETUP_REQ,
+      //    n2_sm_info);
+      smf_n2_inst.create_n2_pdu_session_resource_setup_request_transfer(
+          n11_triggered_pending->res, n2_sm_info_type_e::PDU_RES_SETUP_REQ,
           n2_sm_info);
+
       smf_app_inst->convert_string_2_hex(n2_sm_info, n2_sm_info_hex);
       n11_triggered_pending->res.set_n2_sm_information(n2_sm_info_hex);
 
@@ -1168,8 +1179,11 @@ void session_update_sm_context_procedure::handle_itti_msg(
       //include N2 SM Resource Release Request only when User Plane connection is activated
       if (sps->get_upCnx_state() == upCnx_state_e::UPCNX_STATE_ACTIVATED) {
         //N2 SM Information
-        smf_n2_inst.create_n2_sm_information(
-            n11_triggered_pending->res, 1, n2_sm_info_type_e::PDU_RES_REL_CMD,
+        //smf_n2_inst.create_n2_sm_information(
+        //    n11_triggered_pending->res, 1, n2_sm_info_type_e::PDU_RES_REL_CMD,
+        //    n2_sm_info);
+        smf_n2_inst.create_n2_pdu_session_resource_release_command_transfer(
+            n11_triggered_pending->res, n2_sm_info_type_e::PDU_RES_REL_CMD,
             n2_sm_info);
         smf_app_inst->convert_string_2_hex(n2_sm_info, n2_sm_info_hex);
         n11_triggered_pending->res.set_n2_sm_information(n2_sm_info_hex);