Commit 86b77209 authored by Tien Thinh NGUYEN's avatar Tien Thinh NGUYEN

Code cleanup

parent 339ac227
......@@ -1130,7 +1130,7 @@ void amf_n1::registration_request_handle(
} break;
case _5G_GUTI: {
guti = registration_request->get_5g_guti();
guti = registration_request->Get5gGuti();
Logger::amf_n1().debug(
"Decoded GUTI from registration request message %s", guti.c_str());
if (guti.empty()) {
......@@ -3022,7 +3022,7 @@ void amf_n1::ue_initiate_de_registration_handle(
switch (mobile_id_type) {
case _5G_GUTI: {
Logger::amf_n1().debug(
"5G Mobile Identity, GUTI %s", dereg_request->get_5g_guti().c_str());
"5G Mobile Identity, GUTI %s", dereg_request->Get5gGuti().c_str());
} break;
default: {
}
......@@ -3174,14 +3174,14 @@ void amf_n1::ue_initiate_de_registration_handle(
"Could not delete nas_context associated SUPI %s ", supi.c_str());
}
if (remove_guti_2_nas_context(dereg_request->get_5g_guti())) {
if (remove_guti_2_nas_context(dereg_request->Get5gGuti())) {
Logger::amf_n1().debug(
"Deleted nas_context associated GUTI %s ",
dereg_request->get_5g_guti().c_str());
dereg_request->Get5gGuti().c_str());
} else {
Logger::amf_n1().debug(
"Could not delete nas_context associated GUTI %s ",
dereg_request->get_5g_guti().c_str());
dereg_request->Get5gGuti().c_str());
}
// TODO: AMF to AN: N2 UE Context Release Request
......
......@@ -62,7 +62,7 @@
#include "ReleaseAssistanceIndication.hpp"
#include "RequestType.hpp"
#include "S1UeSecurityCapability.hpp"
#include "SOR_Transparent_Container.hpp"
#include "SorTransparentContainer.hpp"
#include "S_NSSAI.hpp"
#include "ServiceType.hpp"
#include "UENetworkCapability.hpp"
......
......@@ -19,20 +19,20 @@
* contact@openairinterface.org
*/
#include "SOR_Transparent_Container.hpp"
#include "SorTransparentContainer.hpp"
#include "logger.hpp"
using namespace nas;
//------------------------------------------------------------------------------
SOR_Transparent_Container::SOR_Transparent_Container()
SorTransparentContainer::SorTransparentContainer()
: Type6NasIe(kIeiSorTransparentContainer), header_(), sor_mac_i_() {
SetLengthIndicator(kSorTransparentContainerIeMinimumLength);
SetIeName(kSorTransparentContainerIeName);
}
//------------------------------------------------------------------------------
SOR_Transparent_Container::SOR_Transparent_Container(
SorTransparentContainer::SorTransparentContainer(
uint8_t header, const uint8_t (&value)[16]) {
header_ = header;
for (int i = 0; i < 16; i++) {
......@@ -43,17 +43,17 @@ SOR_Transparent_Container::SOR_Transparent_Container(
}
//------------------------------------------------------------------------------
SOR_Transparent_Container::~SOR_Transparent_Container() {}
SorTransparentContainer::~SorTransparentContainer() {}
//------------------------------------------------------------------------------
void SOR_Transparent_Container::getValue(uint8_t (&value)[16]) const {
void SorTransparentContainer::getValue(uint8_t (&value)[16]) const {
for (int i = 0; i < 16; i++) {
value[i] = sor_mac_i_[i];
}
}
//------------------------------------------------------------------------------
int SOR_Transparent_Container::Encode(uint8_t* buf, int len) {
int SorTransparentContainer::Encode(uint8_t* buf, int len) {
Logger::nas_mm().debug("Encoding %s", GetIeName().c_str());
int ie_len = GetIeLength();
......@@ -97,7 +97,7 @@ int SOR_Transparent_Container::Encode(uint8_t* buf, int len) {
}
//------------------------------------------------------------------------------
int SOR_Transparent_Container::Decode(uint8_t* buf, int len, bool is_iei) {
int SorTransparentContainer::Decode(uint8_t* buf, int len, bool is_iei) {
if (len < kSorTransparentContainerMinimumLength) {
Logger::nas_mm().error(
"Buffer length is less than the minimum length of this IE (%d octet)",
......
......@@ -29,11 +29,11 @@ constexpr auto kSorTransparentContainerIeName = "SOR Transparent Container";
namespace nas {
class SOR_Transparent_Container : Type6NasIe {
class SorTransparentContainer : Type6NasIe {
public:
SOR_Transparent_Container();
SOR_Transparent_Container(uint8_t header, const uint8_t (&value)[16]);
~SOR_Transparent_Container();
SorTransparentContainer();
SorTransparentContainer(uint8_t header, const uint8_t (&value)[16]);
~SorTransparentContainer();
int Encode(uint8_t* buf, int len);
int Decode(uint8_t* buf, int len, bool is_iei);
......
......@@ -35,9 +35,15 @@ class AuthenticationResult : public NasMmPlainHeader {
int Decode(uint8_t* buf, int len);
void SetHeader(uint8_t security_header_type);
void SetNgKsi(uint8_t tsc, uint8_t key_set_id);
// TODO: Get
void SetEapMessage(bstring eap);
// TODO: Get
void SetAbba(uint8_t length, uint8_t* value);
// TODO: Get
public:
NasKeySetIdentifier ie_ngKSI; // Mandatory (1/2 lower octet)
......
......@@ -111,7 +111,7 @@ bool DeregistrationRequest::getSuciSupiFormatImsi(nas::SUCI_imsi_t& imsi) {
}
//------------------------------------------------------------------------------
std::string DeregistrationRequest::get_5g_guti() {
std::string DeregistrationRequest::Get5gGuti() {
std::optional<nas::_5G_GUTI_t> guti = std::nullopt;
ie_5gs_mobility_id.Get5gGuti(guti);
if (!guti.has_value()) return {};
......
......@@ -38,26 +38,33 @@ class DeregistrationRequest : public NasMmPlainHeader {
void SetHeader(uint8_t security_header_type);
void setDeregistrationType(uint8_t dereg_type);
void getDeregistrationType(uint8_t& dereg_type);
void setDeregistrationType(_5gs_deregistration_type_t type);
void getDeregistrationType(_5gs_deregistration_type_t& type);
void SetNgKsi(uint8_t tsc, uint8_t key_set_id);
bool getngKSI(uint8_t& ng_ksi);
void setMobilityIdentityType(uint8_t type);
void getMobilityIdentityType(uint8_t& type);
void SetSuciSupiFormatImsi(
const string mcc, const string mnc, const string routingInd,
uint8_t protection_sch_id, const string msin);
void SetSuciSupiFormatImsi(
const string mcc, const string mnc, const string routingInd,
uint8_t protection_sch_id, uint8_t hnpki, const string msin);
bool getSuciSupiFormatImsi(nas::SUCI_imsi_t& imsi);
void Set5gGuti();
std::string Get5gGuti();
void SetImeiImeisv();
void Set5gSTmsi();
// TODO: Get
void getDeregistrationType(uint8_t& dereg_type);
void getDeregistrationType(_5gs_deregistration_type_t& type);
bool getngKSI(uint8_t& ng_ksi);
void getMobilityIdentityType(uint8_t& type);
std::string get_5g_guti();
bool getSuciSupiFormatImsi(nas::SUCI_imsi_t& imsi);
void Set5gSTmsi();
// TODO: Get
public:
_5GSDeregistrationType ie_deregistrationtype; // Mandatory
......
......@@ -44,6 +44,7 @@ class IdentityResponse : public NasMmPlainHeader {
void SetSuciSupiFormatImsi(
const string mcc, const string mnc, const string routingInd,
uint8_t protection_sch_id, uint8_t hnpki, const string msin);
void Set5gGuti();
void SetImeiImeisv();
void Set5gSTmsi();
......
......@@ -218,10 +218,10 @@ void RegistrationAccept::setT3502_value(uint8_t value) {
}
//------------------------------------------------------------------------------
void RegistrationAccept::setSOR_Transparent_Container(
void RegistrationAccept::SetSorTransparentContainer(
uint8_t header, const uint8_t (&value)[16]) {
ie_sor_transparent_container =
std::make_optional<SOR_Transparent_Container>(header, value);
std::make_optional<SorTransparentContainer>(header, value);
}
//------------------------------------------------------------------------------
......@@ -860,10 +860,10 @@ int RegistrationAccept::Decode(uint8_t* buf, int len) {
case 0x73: {
Logger::nas_mm().debug("Decoding IEI (0x73)");
SOR_Transparent_Container ie_sor_transparent_container_tmp = {};
SorTransparentContainer ie_sor_transparent_container_tmp = {};
decoded_size += ie_sor_transparent_container_tmp.Decode(
buf + decoded_size, len - decoded_size, true);
ie_sor_transparent_container = std::optional<SOR_Transparent_Container>(
ie_sor_transparent_container = std::optional<SorTransparentContainer>(
ie_sor_transparent_container_tmp);
octet = *(buf + decoded_size);
Logger::nas_mm().debug("Next IEI (0x%x)", octet);
......
......@@ -107,7 +107,7 @@ class RegistrationAccept : public NasMmPlainHeader {
// TODO: Emergency number list
// TODO: Extended emergency number list
void setSOR_Transparent_Container(uint8_t header, const uint8_t (&value)[16]);
void SetSorTransparentContainer(uint8_t header, const uint8_t (&value)[16]);
// TODO: Get
void SetEapMessage(bstring eap);
......@@ -173,7 +173,7 @@ class RegistrationAccept : public NasMmPlainHeader {
std::optional<GprsTimer2> ie_T3502_value; // Optional
// TODO: Emergency number list
// TODO: Extended emergency number list
std::optional<SOR_Transparent_Container>
std::optional<SorTransparentContainer>
ie_sor_transparent_container; // Optional
std::optional<EapMessage> ie_eap_message; // Optional
std::optional<NssaiInclusionMode> ie_nssai_inclusion_mode; // Optional
......
......@@ -44,9 +44,9 @@ void RegistrationComplete::SetHeader(uint8_t security_header_type) {
}
//------------------------------------------------------------------------------
void RegistrationComplete::setSOR_Transparent_Container(
void RegistrationComplete::SetSorTransparentContainer(
uint8_t header, const uint8_t (&value)[16]) {
ie_sor_transparent_container = new SOR_Transparent_Container(header, value);
ie_sor_transparent_container = new SorTransparentContainer(header, value);
}
//------------------------------------------------------------------------------
......@@ -88,7 +88,7 @@ int RegistrationComplete::Decode(
switch (octet) {
case 0x73: {
Logger::nas_mm().debug("Decoding IEI (0x73)");
ie_sor_transparent_container = new SOR_Transparent_Container();
ie_sor_transparent_container = new SorTransparentContainer();
decoded_size += ie_sor_transparent_container->Decode(
buf + decoded_size, len - decoded_size, true);
octet = *(buf + decoded_size);
......
......@@ -19,15 +19,8 @@
* contact@openairinterface.org
*/
/*! \file
\brief
\author Keliang DU, BUPT
\date 2020
\email: contact@openairinterface.org
*/
#ifndef _RegistrationComplete_H_
#define _RegistrationComplete_H_
#ifndef _REGISTRATION_COMPLETE_H_
#define _REGISTRATION_COMPLETE_H_
#include "NasIeHeader.hpp"
......@@ -37,14 +30,18 @@ class RegistrationComplete {
public:
RegistrationComplete();
~RegistrationComplete();
int Encode(uint8_t* buf, int len);
int Decode(NasMmPlainHeader* header, uint8_t* buf, int len);
void SetHeader(uint8_t security_header_type);
void setSOR_Transparent_Container(uint8_t header, const uint8_t (&value)[16]);
void SetSorTransparentContainer(uint8_t header, const uint8_t (&value)[16]);
// TODO: Get
public:
NasMmPlainHeader* plain_header;
SOR_Transparent_Container* ie_sor_transparent_container;
SorTransparentContainer* ie_sor_transparent_container;
};
} // namespace nas
......
......@@ -116,7 +116,7 @@ bool RegistrationRequest::getSuciSupiFormatImsi(nas::SUCI_imsi_t& imsi) {
}
//------------------------------------------------------------------------------
std::string RegistrationRequest::get_5g_guti() {
std::string RegistrationRequest::Get5gGuti() {
std::optional<nas::_5G_GUTI_t> guti = std::nullopt;
ie_5gs_mobile_identity.Get5gGuti(guti);
if (!guti.has_value()) return {};
......
......@@ -62,7 +62,7 @@ class RegistrationRequest : public NasMmPlainHeader {
bool getSuciSupiFormatImsi(nas::SUCI_imsi_t& imsi);
void Set5gGuti();
std::string get_5g_guti();
std::string Get5gGuti();
void SetImeiImeisv();
void Set5gSTmsi();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment