Code refactor for 5GS Tracking Area Identity

src/nas/common/NasIeHeader.hpp

@@ -77,7 +77,7 @@
 #include "_5GS_Identity_Type.hpp"
 #include "_5GS_Network_Feature_Support.hpp"
 #include "_5GS_Registration_Result.hpp"
-#include "_5GS_Tracking_Area_Identity.hpp"
+#include "_5GSTrackingAreaIdentity.hpp"
 #include "_5GS_Update_Type.hpp"
 #include "struct.hpp"
 #include "Ie_Const.hpp"

src/nas/ies/_5GS_Tracking_Area_Identity.cpp → src/nas/ies/_5GSTrackingAreaIdentity.cpp

@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-#include "_5GS_Tracking_Area_Identity.hpp"
+#include "_5GSTrackingAreaIdentity.hpp"
 
 #include "3gpp_24.501.hpp"
 #include "common_defs.h"
@@ -29,7 +29,7 @@
 using namespace nas;
 
 //------------------------------------------------------------------------------
-_5GS_Tracking_Area_Identity::_5GS_Tracking_Area_Identity(uint8_t iei) {
+_5GSTrackingAreaIdentity::_5GSTrackingAreaIdentity(uint8_t iei) {
   _iei = iei;
   mcc_ = {};
   mnc_ = {};
@@ -37,7 +37,7 @@ _5GS_Tracking_Area_Identity::_5GS_Tracking_Area_Identity(uint8_t iei) {
 }
 
 //------------------------------------------------------------------------------
-_5GS_Tracking_Area_Identity::_5GS_Tracking_Area_Identity(
+_5GSTrackingAreaIdentity::_5GSTrackingAreaIdentity(
     const uint8_t iei, const std::string& mcc, const std::string& mnc,
     const uint32_t& tac) {
   _iei = iei;
@@ -47,7 +47,7 @@ _5GS_Tracking_Area_Identity::_5GS_Tracking_Area_Identity(
 }
 
 //------------------------------------------------------------------------------
-_5GS_Tracking_Area_Identity::_5GS_Tracking_Area_Identity() {
+_5GSTrackingAreaIdentity::_5GSTrackingAreaIdentity() {
   _iei = 0;
   mcc_ = {};
   mnc_ = {};
@@ -55,46 +55,45 @@ _5GS_Tracking_Area_Identity::_5GS_Tracking_Area_Identity() {
 }
 
 //------------------------------------------------------------------------------
-_5GS_Tracking_Area_Identity::~_5GS_Tracking_Area_Identity() {}
+_5GSTrackingAreaIdentity::~_5GSTrackingAreaIdentity() {}
 
 //------------------------------------------------------------------------------
-void _5GS_Tracking_Area_Identity::setTAC(const uint32_t& value) {
+void _5GSTrackingAreaIdentity::setTAC(const uint32_t& value) {
   tac_ = value & 0x0fff;
 }
 
 //------------------------------------------------------------------------------
-uint32_t _5GS_Tracking_Area_Identity::getTAC() const {
+uint32_t _5GSTrackingAreaIdentity::getTAC() const {
   return tac_;
 }
 //------------------------------------------------------------------------------
-void _5GS_Tracking_Area_Identity::getTAC(uint32_t& value) const {
+void _5GSTrackingAreaIdentity::getTAC(uint32_t& value) const {
   value = tac_;
 }
 
 //------------------------------------------------------------------------------
-void _5GS_Tracking_Area_Identity::setMcc(const std::string& mcc) {
+void _5GSTrackingAreaIdentity::setMcc(const std::string& mcc) {
   mcc_ = mcc;
 }
 
 //------------------------------------------------------------------------------
-void _5GS_Tracking_Area_Identity::getMcc(std::string& mcc) const {
+void _5GSTrackingAreaIdentity::getMcc(std::string& mcc) const {
   mcc = mcc_;
 }
 
 //------------------------------------------------------------------------------
-void _5GS_Tracking_Area_Identity::setMnc(const std::string& mnc) {
+void _5GSTrackingAreaIdentity::setMnc(const std::string& mnc) {
   mnc_ = mnc;
 }
 
 //------------------------------------------------------------------------------
-void _5GS_Tracking_Area_Identity::getMnc(std::string& mnc) const {
+void _5GSTrackingAreaIdentity::getMnc(std::string& mnc) const {
   mnc = mnc_;
 }
 
 //------------------------------------------------------------------------------
-int _5GS_Tracking_Area_Identity::encode2Buffer(uint8_t* buf, int len) {
-  Logger::nas_mm().debug(
-      "Encoding _5GS_Tracking_Area_Identity (IEI 0x%x)", _iei);
+int _5GSTrackingAreaIdentity::encode2Buffer(uint8_t* buf, int len) {
+  Logger::nas_mm().debug("Encoding _5GSTrackingAreaIdentity (IEI 0x%x)", _iei);
   if (len < k5gsTrackingAreaIdentityLength) {
     Logger::nas_mm().error(
         "Buffer length is less than the minimum length of this IE (%d octet)",
@@ -104,7 +103,6 @@ int _5GS_Tracking_Area_Identity::encode2Buffer(uint8_t* buf, int len) {
   int encoded_size = 0;
 
   if (_iei) {
-    //*(buf + encoded_size) = _iei;
     ENCODE_U8(buf + encoded_size, _iei, encoded_size);
   }
 
@@ -114,19 +112,19 @@ int _5GS_Tracking_Area_Identity::encode2Buffer(uint8_t* buf, int len) {
   ENCODE_U24(buf + encoded_size, tac_, encoded_size);
 
   Logger::nas_mm().debug(
-      "encoded _5GS_Tracking_Area_Identity len(%d)", encoded_size);
+      "Encoded _5GSTrackingAreaIdentity len(%d)", encoded_size);
   return encoded_size;
 }
 
 //------------------------------------------------------------------------------
-int _5GS_Tracking_Area_Identity::decodeFromBuffer(
+int _5GSTrackingAreaIdentity::decodeFromBuffer(
     uint8_t* buf, int len, bool is_option) {
-  Logger::nas_mm().debug("Decoding _5GS_Tracking_Area_Identity");
+  Logger::nas_mm().debug("Decoding _5GSTrackingAreaIdentity");
   int decoded_size = 0;
   if (is_option) {
     DECODE_U8(buf + decoded_size, _iei, decoded_size);
     Logger::nas_mm().debug(
-        "Decoding _5GS_Tracking_Area_Identity IEI (0x%x)", _iei);
+        "Decoding _5GSTrackingAreaIdentity IEI (0x%x)", _iei);
   }
   decoded_size += NasUtils::decodeMccMncFromBuffer(
       mcc_, mnc_, buf + decoded_size, len - decoded_size);
@@ -135,6 +133,6 @@ int _5GS_Tracking_Area_Identity::decodeFromBuffer(
 
   Logger::nas_mm().debug("Decoded TAC 0x%x", tac_);
   Logger::nas_mm().debug(
-      "Decoded _5GS_Tracking_Area_Identity len(%d)", decoded_size);
+      "Decoded _5GSTrackingAreaIdentity len(%d)", decoded_size);
   return decoded_size;
 }

src/nas/ies/_5GS_Tracking_Area_Identity.hpp → src/nas/ies/_5GSTrackingAreaIdentity.hpp

@@ -29,15 +29,15 @@ constexpr uint8_t k5gsTrackingAreaIdentityLength = 7;
 
 namespace nas {
 
-class _5GS_Tracking_Area_Identity {
+class _5GSTrackingAreaIdentity {
  public:
-  _5GS_Tracking_Area_Identity();
-  _5GS_Tracking_Area_Identity(uint8_t iei);
-  _5GS_Tracking_Area_Identity(
+  _5GSTrackingAreaIdentity();
+  _5GSTrackingAreaIdentity(uint8_t iei);
+  _5GSTrackingAreaIdentity(
       const uint8_t iei, const std::string& mcc, const std::string& mnc,
       const uint32_t& tac);
 
-  ~_5GS_Tracking_Area_Identity();
+  ~_5GSTrackingAreaIdentity();
 
   int encode2Buffer(uint8_t* buf, int len);
   int decodeFromBuffer(uint8_t* buf, int len, bool is_option);
@@ -52,28 +52,8 @@ class _5GS_Tracking_Area_Identity {
   void setMnc(const std::string& mnc);
   void getMnc(std::string& mnc) const;
 
-  /*
-//TODO: to be removed
-  void setMNC_MCC1(uint8_t iei, uint8_t value);
-  uint8_t getMNC_MCC1();
-
-  void setMNC_MCC2(uint8_t iei, uint8_t value);
-  uint8_t getMNC_MCC2();
-
-  void setMNC_MCC3(uint8_t iei, uint8_t value);
-  uint8_t getMNC_MCC3();
-*/
-
  private:
   uint8_t _iei;
-  /*uint8_t _MNC_MCC1;
-  uint8_t _MNC_MCC2;
-  uint8_t _MNC_MCC3;
-  uint8_t _TAC1;
-  uint8_t _TAC2;
-  uint8_t _TAC3;
-*/
-
   std::string mcc_;
   std::string mnc_;
   uint32_t tac_;

src/nas/msgs/RegistrationRequest.cpp

@@ -270,11 +270,9 @@ bool RegistrationRequest::getRequestedNssai(
 
 //------------------------------------------------------------------------------
 void RegistrationRequest::setLast_Visited_Registered_TAI(
-    uint8_t MNC_MCC1, uint8_t MNC_MCC2, uint8_t MNC_MCC3, uint32_t TAC) {
-  // ie_last_visited_registered_TAI =
-  //    new _5GS_Tracking_Area_Identity(0x52, MNC_MCC1, MNC_MCC2, MNC_MCC3,
-  //    TAC);
-  // TODO:
+    const std::string& mcc, const std::string mnc, const uint32_t& tac) {
+  // TODO: ie_last_visited_registered_TAI =
+  //   new _5GSTrackingAreaIdentity(mcc, mnc, tac);
 }
 
 //------------------------------------------------------------------------------
@@ -929,7 +927,7 @@ int RegistrationRequest::decodeFromBuffer(uint8_t* buf, int len) {
       } break;
       case 0x52: {
         Logger::nas_mm().debug("Decoding IEI(0x52)");
-        ie_last_visited_registered_TAI = new _5GS_Tracking_Area_Identity();
+        ie_last_visited_registered_TAI = new _5GSTrackingAreaIdentity();
         decoded_size += ie_last_visited_registered_TAI->decodeFromBuffer(
             buf + decoded_size, len - decoded_size, true);
         octet = *(buf + decoded_size);

src/nas/msgs/RegistrationRequest.hpp

@@ -95,7 +95,7 @@ class RegistrationRequest : public NasMmPlainHeader {
   uint16_t getUplinkDataStatus();
 
   void setLast_Visited_Registered_TAI(
-      uint8_t MNC_MCC1, uint8_t MNC_MCC2, uint8_t MNC_MCC3, uint32_t TAC);
+      const std::string& mcc, const std::string mnc, const uint32_t& tac);
 
   void setPDU_session_status(uint16_t value);
   uint16_t getPduSessionStatus();
@@ -157,22 +157,22 @@ class RegistrationRequest : public NasMmPlainHeader {
   std::optional<UESecurityCapability> ie_ue_security_capability;     // Optional
   std::optional<NSSAI> ie_requested_NSSAI;                           // Optional
 
-  _5GS_Tracking_Area_Identity* ie_last_visited_registered_TAI;  // Optional
-  UENetworkCapability* ie_s1_ue_network_capability;             // Optional
-  UplinkDataStatus* ie_uplink_data_status;                      // Optional
-  PDU_Session_Status* ie_PDU_session_status;                    // Optional
-  MICO_Indication* ie_MICO_indicationl;                         // Optional
-  UE_Status* ie_ue_status;                                      // Optional
-  _5GSMobileIdentity* ie_additional_guti;                       // Optional
-  Allowed_PDU_Session_Status* ie_allowed_PDU_session_status;    // Optional
-  UES_Usage_Setting* ie_ues_usage_setting;                      // Optional
-  _5GS_DRX_arameters* ie_5gs_drx_parameters;                    // Optional
-  EPS_NAS_Message_Container* ie_eps_nas_message_container;      // Optional
-  LADN_Indication* ie_ladn_indication;                          // Optional
-  Payload_Container_Type* ie_payload_container_type;            // Optional
-  Payload_Container* ie_payload_container;                      // Optional
-  Network_Slicing_Indication* ie_network_slicing_indication;    // Optional
-  _5GS_Update_Type* ie_5gs_update_type;                         // Optional
+  _5GSTrackingAreaIdentity* ie_last_visited_registered_TAI;   // Optional
+  UENetworkCapability* ie_s1_ue_network_capability;           // Optional
+  UplinkDataStatus* ie_uplink_data_status;                    // Optional
+  PDU_Session_Status* ie_PDU_session_status;                  // Optional
+  MICO_Indication* ie_MICO_indicationl;                       // Optional
+  UE_Status* ie_ue_status;                                    // Optional
+  _5GSMobileIdentity* ie_additional_guti;                     // Optional
+  Allowed_PDU_Session_Status* ie_allowed_PDU_session_status;  // Optional
+  UES_Usage_Setting* ie_ues_usage_setting;                    // Optional
+  _5GS_DRX_arameters* ie_5gs_drx_parameters;                  // Optional
+  EPS_NAS_Message_Container* ie_eps_nas_message_container;    // Optional
+  LADN_Indication* ie_ladn_indication;                        // Optional
+  Payload_Container_Type* ie_payload_container_type;          // Optional
+  Payload_Container* ie_payload_container;                    // Optional
+  Network_Slicing_Indication* ie_network_slicing_indication;  // Optional
+  _5GS_Update_Type* ie_5gs_update_type;                       // Optional
   // TODO: Mobile station classmark 2
   // TODO: Supported codecs
   NAS_Message_Container* ie_nas_message_container;          // Optional

src/utils/NasUtils.cpp

@@ -21,6 +21,7 @@
 
 #include "NasUtils.hpp"
 
+#include "3gpp_24.501.hpp"
 #include "common_defs.h"
 #include "String2Value.hpp"
 #include "logger.hpp"