Skip to content

O
OpenXG-AMF
Commit 91b14a14 authored by Tien Thinh NGUYEN's avatar Tien Thinh NGUYEN
Browse files
Options

Code cleanup

parent f8b1a66e
Show whitespace changes
Inline Side-by-side
Showing with 71 additions and 72 deletions
src/nas/msgs/ConfigurationUpdateCommand.hpp
View file @ 91b14a14
......@@ -35,7 +35,7 @@ class ConfigurationUpdateCommand : public NasMmPlainHeader {
~ConfigurationUpdateCommand();
void SetHeader(uint8_t security_header_type);
void getSecurityHeaderType(uint8_t security_header_type);
void GetSecurityHeaderType(uint8_t security_header_type);
bool verifyHeader();
void setFullNameForNetwork(const NetworkName& name);
......
src/nas/msgs/RegistrationAccept.cpp
View file @ 91b14a14
......@@ -69,7 +69,7 @@ void RegistrationAccept::SetHeader(uint8_t security_header_type) {
}
//------------------------------------------------------------------------------
void RegistrationAccept::set5GSRegistrationResult(
void RegistrationAccept::Set5gsRegistrationResult(
bool emergency, bool nssaa, bool sms, const uint8_t& value) {
ie_5gs_registration_result.set(emergency, nssaa, sms, value);
}
......@@ -123,7 +123,7 @@ void RegistrationAccept::SetImeiImeisv() {}
void RegistrationAccept::Set5gSTmsi() {}
//------------------------------------------------------------------------------
void RegistrationAccept::setEquivalent_PLMNs(
void RegistrationAccept::SetEquivalentPlmns(
const std::vector<nas_plmn_t>& list) {
PlmnList ie_equivalent_plmns_tmp = {};
ie_equivalent_plmns_tmp.Set(kEquivalentPlmns, list);
......@@ -131,7 +131,7 @@ void RegistrationAccept::setEquivalent_PLMNs(
}
//------------------------------------------------------------------------------
void RegistrationAccept::setALLOWED_NSSAI(
void RegistrationAccept::SetAllowedNssai(
const std::vector<struct SNSSAI_s>& nssai) {
if (nssai.size() > 0) {
ie_allowed_nssai = std::make_optional<NSSAI>(kIeiNSSAIAllowed, nssai);
......@@ -139,7 +139,7 @@ void RegistrationAccept::setALLOWED_NSSAI(
}
//------------------------------------------------------------------------------
void RegistrationAccept::setRejected_NSSAI(
void RegistrationAccept::SetRejectedNssai(
const std::vector<Rejected_SNSSAI>& nssai) {
if (nssai.size() > 0) {
ie_rejected_nssai = std::make_optional<Rejected_NSSAI>(0x11);
......@@ -148,7 +148,7 @@ void RegistrationAccept::setRejected_NSSAI(
}
//------------------------------------------------------------------------------
void RegistrationAccept::setCONFIGURED_NSSAI(
void RegistrationAccept::SetConfiguredNssai(
const std::vector<struct SNSSAI_s>& nssai) {
if (nssai.size() > 0) {
ie_configured_nssai = std::make_optional<NSSAI>(kIeiNSSAIConfigured, nssai);
......@@ -156,25 +156,25 @@ void RegistrationAccept::setCONFIGURED_NSSAI(
}
//------------------------------------------------------------------------------
void RegistrationAccept::set_5GS_Network_Feature_Support(
void RegistrationAccept::Set5gsNetworkFeatureSupport(
uint8_t value, uint8_t value2) {
ie_5gs_network_feature_support =
std::make_optional<_5GS_Network_Feature_Support>(value, value2);
}
//------------------------------------------------------------------------------
void RegistrationAccept::setPDU_session_status(uint16_t value) {
void RegistrationAccept::SetPduSessionStatus(uint16_t value) {
ie_PDU_session_status = std::make_optional<PDUSessionStatus>(value);
}
//------------------------------------------------------------------------------
void RegistrationAccept::setPDU_session_reactivation_result(uint16_t value) {
void RegistrationAccept::SetPduSessionReactivationResult(uint16_t value) {
ie_pdu_session_reactivation_result =
std::make_optional<PDU_Session_Reactivation_Result>(value);
}
//------------------------------------------------------------------------------
void RegistrationAccept::setPDU_session_reactivation_result_error_cause(
void RegistrationAccept::SetPduSessionReactivationResultErrorCause(
uint8_t session_id, uint8_t value) {
ie_pdu_session_reactivation_result_error_cause =
std::make_optional<PDU_Session_Reactivation_Result_Error_Cause>(
......@@ -182,7 +182,7 @@ void RegistrationAccept::setPDU_session_reactivation_result_error_cause(
}
//------------------------------------------------------------------------------
void RegistrationAccept::setMICO_Indication(bool sprti, bool raai) {
void RegistrationAccept::SetMicoIndication(bool sprti, bool raai) {
ie_MICO_indication = std::make_optional<MicoIndication>(sprti, raai);
}
......@@ -194,26 +194,25 @@ void RegistrationAccept::setLADN_Information(std::vector<bstring> ladnValue) {
*/
//------------------------------------------------------------------------------
void RegistrationAccept::setNetwork_Slicing_Indication(bool dcni, bool nssci) {
void RegistrationAccept::SetNetworkSlicingIndication(bool dcni, bool nssci) {
ie_network_slicing_indication = std::make_optional<NetworkSlicingIndication>(
kIeiNetworkSlicingIndication, dcni, nssci);
}
//------------------------------------------------------------------------------
void RegistrationAccept::setT3512_Value(uint8_t unit, uint8_t value) {
void RegistrationAccept::SetT3512Value(uint8_t unit, uint8_t value) {
ie_T3512_value =
std::make_optional<GprsTimer3>(kIeiGprsTimer3T3512, unit, value);
}
//------------------------------------------------------------------------------
void RegistrationAccept::setNon_3GPP_de_registration_timer_value(
uint8_t value) {
void RegistrationAccept::SetNon3gppDeregistrationTimerValue(uint8_t value) {
ie_Non_3GPP_de_registration_timer_value = std::make_optional<GprsTimer2>(
kIeiGprsTimer2Non3gppDeregistration, value);
}
//------------------------------------------------------------------------------
void RegistrationAccept::setT3502_value(uint8_t value) {
void RegistrationAccept::SetT3502Value(uint8_t value) {
ie_T3502_value = std::make_optional<GprsTimer2>(kIeiGprsTimer2T3502, value);
}
......@@ -230,56 +229,56 @@ void RegistrationAccept::SetEapMessage(bstring eap) {
}
//------------------------------------------------------------------------------
void RegistrationAccept::setNSSAI_Inclusion_Mode(uint8_t value) {
void RegistrationAccept::SetNssaiInclusionMode(uint8_t value) {
ie_nssai_inclusion_mode = std::make_optional<NssaiInclusionMode>(value);
}
//------------------------------------------------------------------------------
void RegistrationAccept::set_5GS_DRX_arameters(uint8_t value) {
void RegistrationAccept::Set5gsDrxParameters(uint8_t value) {
ie_negotiated_drx_parameters = std::make_optional<_5GS_DRX_Parameters>(value);
}
//------------------------------------------------------------------------------
void RegistrationAccept::setNon_3GPP_NW_Provided_Policies(uint8_t value) {
void RegistrationAccept::SetNon3gppNwProvidedPolicies(uint8_t value) {
ie_non_3gpp_nw_policies =
std::make_optional<Non_3GPP_NW_Provided_Policies>(value);
}
//------------------------------------------------------------------------------
void RegistrationAccept::setEPS_Bearer_Context_Status(uint16_t value) {
void RegistrationAccept::SetEpsBearerContextsStatus(uint16_t value) {
ie_eps_bearer_context_status =
std::make_optional<EpsBearerContextStatus>(value);
}
//------------------------------------------------------------------------------
void RegistrationAccept::setExtended_DRX_Parameters(
void RegistrationAccept::SetExtendedDrxParameters(
uint8_t paging_time, uint8_t value) {
ie_extended_drx_parameters =
std::make_optional<Extended_DRX_Parameters>(paging_time, value);
}
//------------------------------------------------------------------------------
void RegistrationAccept::setT3447_Value(uint8_t unit, uint8_t value) {
void RegistrationAccept::SetT3447Value(uint8_t unit, uint8_t value) {
ie_T3447_value = std::make_optional<GprsTimer3>(0x6C, unit, value);
}
//------------------------------------------------------------------------------
void RegistrationAccept::setT3448_Value(uint8_t unit, uint8_t value) {
void RegistrationAccept::SetT3448Value(uint8_t unit, uint8_t value) {
ie_T3448_value = std::make_optional<GprsTimer3>(0x6B, unit, value);
}
//------------------------------------------------------------------------------
void RegistrationAccept::setT3324_Value(uint8_t unit, uint8_t value) {
void RegistrationAccept::SetT3324Value(uint8_t unit, uint8_t value) {
ie_T3324_value = std::make_optional<GprsTimer3>(0x6A, unit, value);
}
//------------------------------------------------------------------------------
void RegistrationAccept::setUE_Radio_Capability_ID(bstring value) {
void RegistrationAccept::SetUeRadioCapabilityId(bstring value) {
ie_ue_radio_capability_id = std::make_optional<UeRadioCapabilityId>(value);
}
//------------------------------------------------------------------------------
void RegistrationAccept::setPending_NSSAI(std::vector<struct SNSSAI_s> nssai) {
void RegistrationAccept::SetPendingNssai(std::vector<struct SNSSAI_s> nssai) {
ie_pending_nssai = std::make_optional<NSSAI>(0x39, nssai);
}
......@@ -808,7 +807,7 @@ int RegistrationAccept::Decode(uint8_t* buf, int len) {
Logger::nas_mm().debug("Next IEI (0x%x)", octet);
} break;
case 0xA: {
case kIeiNssaiInclusionMode: {
Logger::nas_mm().debug("Decoding IEI (0xA)");
NssaiInclusionMode ie_nssai_inclusion_mode_tmp = {};
if ((decoded_result = ie_nssai_inclusion_mode_tmp.Decode(
......@@ -825,7 +824,7 @@ int RegistrationAccept::Decode(uint8_t* buf, int len) {
Logger::nas_mm().debug("Next IEI (0x%x)", octet);
} break;
case 0xD: {
case kIeiNon3gppNwProvidedPolicies: {
Logger::nas_mm().debug("Decoding IEI (0xD)");
Non_3GPP_NW_Provided_Policies ie_non_3gpp_nw_policies_tmp = {};
if ((decoded_result = ie_non_3gpp_nw_policies_tmp.Decode(
......@@ -849,7 +848,7 @@ int RegistrationAccept::Decode(uint8_t* buf, int len) {
}
switch (octet) {
case 0x77: {
case kIei5gGuti: {
Logger::nas_mm().debug("Decoding IEI (0x77)");
_5GSMobileIdentity ie_5g_guti_tmp = {};
if ((decoded_result = ie_5g_guti_tmp.Decode(
......@@ -971,7 +970,7 @@ int RegistrationAccept::Decode(uint8_t* buf, int len) {
Logger::nas_mm().debug("Next IEI (0x%x)", octet);
} break;
case 0x72: {
case kIeiPduSessionReactivationResultErrorCause: {
Logger::nas_mm().debug("Decoding IEI (0x72)");
PDU_Session_Reactivation_Result_Error_Cause
ie_pdu_session_reactivation_result_error_cause_tmp = {};
......@@ -1054,7 +1053,7 @@ int RegistrationAccept::Decode(uint8_t* buf, int len) {
Logger::nas_mm().debug("Next IEI (0x%x)", octet);
} break;
case 0x73: {
case kIeiSorTransparentContainer: {
Logger::nas_mm().debug("Decoding IEI (0x73)");
SorTransparentContainer ie_sor_transparent_container_tmp = {};
if ((decoded_result = ie_sor_transparent_container_tmp.Decode(
......@@ -1072,7 +1071,7 @@ int RegistrationAccept::Decode(uint8_t* buf, int len) {
Logger::nas_mm().debug("Next IEI (0x%x)", octet);
} break;
case 0x78: {
case kIeiEapMessage: {
Logger::nas_mm().debug("Decoding IEI (0x78)");
EapMessage ie_eap_message_tmp = {};
if ((decoded_result = ie_eap_message_tmp.Decode(
......@@ -1105,7 +1104,7 @@ int RegistrationAccept::Decode(uint8_t* buf, int len) {
Logger::nas_mm().debug("Next IEI (0x%x)", octet);
} break;
case 0x60: {
case kIeiEpsBearerContextStatus: {
Logger::nas_mm().debug("Decoding IEI (0x60)");
EpsBearerContextStatus ie_eps_bearer_context_status_tmp = {};
if ((decoded_result = ie_eps_bearer_context_status_tmp.Decode(
......@@ -1122,7 +1121,7 @@ int RegistrationAccept::Decode(uint8_t* buf, int len) {
Logger::nas_mm().debug("Next IEI (0x%x)", octet);
} break;
case 0x6E: {
case kIeiExtendedDrxParameters: {
Logger::nas_mm().debug("Decoding IEI (0x6E)");
Extended_DRX_Parameters ie_extended_drx_parameters_tmp = {};
if ((decoded_result = ie_extended_drx_parameters_tmp.Decode(
......@@ -1188,7 +1187,7 @@ int RegistrationAccept::Decode(uint8_t* buf, int len) {
Logger::nas_mm().debug("Next IEI (0x%x)", octet);
} break;
case 0x67: {
case kIeiUeRadioCapabilityId: {
Logger::nas_mm().debug("Decoding IEI (0x67)");
UeRadioCapabilityId ie_ue_radio_capability_id_tmp = {};
if ((decoded_result = ie_ue_radio_capability_id_tmp.Decode(
......@@ -1205,7 +1204,7 @@ int RegistrationAccept::Decode(uint8_t* buf, int len) {
Logger::nas_mm().debug("Next IEI (0x%x)", octet);
} break;
case 0x39: {
case kIeiNSSAIPending: {
Logger::nas_mm().debug("Decoding IEI (0x39)");
NSSAI ie_pending_nssai_tmp = {};
if ((decoded_result = ie_pending_nssai_tmp.Decode(
......@@ -1221,7 +1220,7 @@ int RegistrationAccept::Decode(uint8_t* buf, int len) {
Logger::nas_mm().debug("Next IEI (0x%x)", octet);
} break;
case 0x4A: {
case kEquivalentPlmns: {
Logger::nas_mm().debug("Decoding IEI (0x4A)");
PlmnList ie_equivalent_plmns_tmp = {};
if ((decoded_result = ie_equivalent_plmns_tmp.Decode(
......
src/nas/msgs/RegistrationAccept.hpp
View file @ 91b14a14
......@@ -32,13 +32,13 @@ class RegistrationAccept : public NasMmPlainHeader {
~RegistrationAccept();
void SetHeader(uint8_t security_header_type);
void getSecurityHeaderType(uint8_t security_header_type); // TODO
void GetSecurityHeaderType(uint8_t security_header_type); // TODO
bool verifyHeader(); // TODO
int Encode(uint8_t* buf, int len);
int Decode(uint8_t* buf, int len);
void set5GSRegistrationResult(
void Set5gsRegistrationResult(
bool emergency, bool nssaa, bool sms, const uint8_t& value);
// TODO: Get
......@@ -60,48 +60,48 @@ class RegistrationAccept : public NasMmPlainHeader {
// TODO: Get
// Equivalent PLMNs
void setEquivalent_PLMNs(const std::vector<nas_plmn_t>& list);
void SetEquivalentPlmns(const std::vector<nas_plmn_t>& list);
// TODO: Get
void setTaiList(std::vector<p_tai_t> tai_list);
void setALLOWED_NSSAI(const std::vector<struct SNSSAI_s>& nssai);
void SetAllowedNssai(const std::vector<struct SNSSAI_s>& nssai);
// TODO: Get
void setRejected_NSSAI(const std::vector<Rejected_SNSSAI>& nssai);
void SetRejectedNssai(const std::vector<Rejected_SNSSAI>& nssai);
// TODO: Get
void setCONFIGURED_NSSAI(const std::vector<struct SNSSAI_s>& nssai);
void SetConfiguredNssai(const std::vector<struct SNSSAI_s>& nssai);
// TODO: Get
void set_5GS_Network_Feature_Support(uint8_t value, uint8_t value2);
void Set5gsNetworkFeatureSupport(uint8_t value, uint8_t value2);
// TODO: Get
void setPDU_session_status(uint16_t value);
void SetPduSessionStatus(uint16_t value);
// TODO: Get
void setPDU_session_reactivation_result(uint16_t value);
void SetPduSessionReactivationResult(uint16_t value);
// TODO: Get
void setPDU_session_reactivation_result_error_cause(
void SetPduSessionReactivationResultErrorCause(
uint8_t session_id, uint8_t value);
// TODO: Get
// TODO: LADN information
void setMICO_Indication(bool sprti, bool raai);
void SetMicoIndication(bool sprti, bool raai);
// TODO: Get
void setNetwork_Slicing_Indication(bool dcni, bool nssci);
void SetNetworkSlicingIndication(bool dcni, bool nssci);
// TODO: Get
// TODO: Service Area List
void setT3512_Value(uint8_t unit, uint8_t value);
void SetT3512Value(uint8_t unit, uint8_t value);
// TODO: Get
void setNon_3GPP_de_registration_timer_value(uint8_t value);
void SetNon3gppDeregistrationTimerValue(uint8_t value);
// TODO: Get
void setT3502_value(uint8_t value);
void SetT3502Value(uint8_t value);
// TODO: Get
// TODO: Emergency number list
......@@ -113,36 +113,36 @@ class RegistrationAccept : public NasMmPlainHeader {
void SetEapMessage(bstring eap);
// TODO: Get
void setNSSAI_Inclusion_Mode(uint8_t value);
void SetNssaiInclusionMode(uint8_t value);
// TODO: Get
// TODO: Operator-defined access category definitions
void set_5GS_DRX_arameters(uint8_t value);
void Set5gsDrxParameters(uint8_t value);
// TODO: Get
void setNon_3GPP_NW_Provided_Policies(uint8_t value);
void SetNon3gppNwProvidedPolicies(uint8_t value);
// TODO: Get
void setEPS_Bearer_Context_Status(uint16_t value);
void SetEpsBearerContextsStatus(uint16_t value);
// TODO: Get
void setExtended_DRX_Parameters(uint8_t paging_time, uint8_t value);
void SetExtendedDrxParameters(uint8_t paging_time, uint8_t value);
// TODO: Get
void setT3447_Value(uint8_t unit, uint8_t value);
void SetT3447Value(uint8_t unit, uint8_t value);
// TODO: Get
void setT3448_Value(uint8_t unit, uint8_t value);
void SetT3448Value(uint8_t unit, uint8_t value);
// TODO: Get
void setT3324_Value(uint8_t unit, uint8_t value);
void SetT3324Value(uint8_t unit, uint8_t value);
// TODO: Get
void setUE_Radio_Capability_ID(bstring value);
void SetUeRadioCapabilityId(bstring value);
// TODO: Get
void setPending_NSSAI(std::vector<struct SNSSAI_s> nssai);
void SetPendingNssai(std::vector<struct SNSSAI_s> nssai);
// TODO: Get
public:
......
src/nas/msgs/RegistrationReject.cpp
View file @ 91b14a14
......@@ -65,7 +65,7 @@ void RegistrationReject::SetEapMessage(bstring eap) {
}
//------------------------------------------------------------------------------
void RegistrationReject::setRejected_NSSAI(
void RegistrationReject::SetRejectedNssai(
const std::vector<Rejected_SNSSAI>& nssai) {
ie_rejected_nssai = std::make_optional<Rejected_NSSAI>(kIeiRejectedNssaiRr);
ie_rejected_nssai.value().SetRejectedSNssais(nssai);
......
src/nas/msgs/RegistrationReject.hpp
View file @ 91b14a14
......@@ -32,7 +32,7 @@ class RegistrationReject : public NasMmPlainHeader {
~RegistrationReject();
void SetHeader(uint8_t security_header_type);
void getSecurityHeaderType(uint8_t security_header_type);
void GetSecurityHeaderType(uint8_t security_header_type);
bool verifyHeader();
int Encode(uint8_t* buf, int len);
......@@ -48,7 +48,7 @@ class RegistrationReject : public NasMmPlainHeader {
// TOGO: Get
void SetEapMessage(bstring eap);
void setRejected_NSSAI(const std::vector<Rejected_SNSSAI>& nssai);
void SetRejectedNssai(const std::vector<Rejected_SNSSAI>& nssai);
// TODO: Get
public:
......
src/nas/msgs/RegistrationRequest.cpp
View file @ 91b14a14
......@@ -380,7 +380,7 @@ uint8_t RegistrationRequest::getUEsUsageSetting() {
}
//------------------------------------------------------------------------------
void RegistrationRequest::set_5GS_DRX_arameters(uint8_t value) {
void RegistrationRequest::Set5gsDrxParameters(uint8_t value) {
ie_5gs_drx_parameters = std::make_optional<_5GS_DRX_Parameters>(value);
}
......@@ -457,7 +457,7 @@ bool RegistrationRequest::GetPayloadContainer(
}
//------------------------------------------------------------------------------
void RegistrationRequest::setNetwork_Slicing_Indication(bool dcni, bool nssci) {
void RegistrationRequest::SetNetworkSlicingIndication(bool dcni, bool nssci) {
ie_network_slicing_indication = std::make_optional<NetworkSlicingIndication>(
kIeiNetworkSlicingIndication, dcni, nssci);
}
......@@ -512,7 +512,7 @@ bool RegistrationRequest::GetNasMessageContainer(bstring& nas) {
}
//------------------------------------------------------------------------------
void RegistrationRequest::setEPS_Bearer_Context_Status(uint16_t value) {
void RegistrationRequest::SetEpsBearerContextsStatus(uint16_t value) {
ie_eps_bearer_context_status =
std::make_optional<EpsBearerContextStatus>(value);
}
......
src/nas/msgs/RegistrationRequest.hpp
View file @ 91b14a14
......@@ -41,7 +41,7 @@ class RegistrationRequest : public NasMmPlainHeader {
int Decode(uint8_t* buf, int len);
void SetHeader(uint8_t security_header_type);
void getSecurityHeaderType(uint8_t security_header_type);
void GetSecurityHeaderType(uint8_t security_header_type);
bool verifyHeader();
void set5gsRegistrationType(bool is_for, uint8_t type);
......@@ -113,7 +113,7 @@ class RegistrationRequest : public NasMmPlainHeader {
void setUES_Usage_Setting(bool ues_usage_setting);
uint8_t getUEsUsageSetting();
void set_5GS_DRX_arameters(uint8_t value);
void Set5gsDrxParameters(uint8_t value);
uint8_t get5GSDrxParameters();
void setEPS_NAS_Message_Container(bstring value);
......@@ -127,7 +127,7 @@ class RegistrationRequest : public NasMmPlainHeader {
void SetPayloadContainer(std::vector<PayloadContainerEntry> content);
bool GetPayloadContainer(std::vector<PayloadContainerEntry>& content);
void setNetwork_Slicing_Indication(bool dcni, bool nssci);
void SetNetworkSlicingIndication(bool dcni, bool nssci);
bool getNetworkSlicingIndication(uint8_t& dcni, uint8_t& nssci);
void set_5GS_Update_Type(
......@@ -142,7 +142,7 @@ class RegistrationRequest : public NasMmPlainHeader {
bool getEpsNasMessageContainer(bstring& epsNas);
// bool getEpsNasMessageContainer(bstring& epsNas);
void setEPS_Bearer_Context_Status(uint16_t value);
void SetEpsBearerContextsStatus(uint16_t value);
bool getEpsBearerContextStatus(uint16_t& value);
public:
......
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