Commit e4ae7895 authored by Tien Thinh NGUYEN's avatar Tien Thinh NGUYEN

Code cleanup for Service Request Msg

parent b3b96b04
...@@ -51,18 +51,18 @@ void ServiceRequest::SetNgKsi(uint8_t tsc, uint8_t key_set_id) { ...@@ -51,18 +51,18 @@ void ServiceRequest::SetNgKsi(uint8_t tsc, uint8_t key_set_id) {
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void ServiceRequest::setServiceType(uint8_t value) { void ServiceRequest::SetServiceType(uint8_t value) {
ie_service_type.Set(true, value); ie_service_type.Set(true, value);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void ServiceRequest::Set5gSTmsi( void ServiceRequest::Set5gSTmsi(
uint16_t amfSetId, uint8_t amfPointer, string tmsi) { uint16_t amf_set_id, uint8_t amf_pointer, string tmsi) {
ie_5g_s_tmsi.Set5gSTmsi(amfSetId, amfPointer, tmsi); ie_5g_s_tmsi.Set5gSTmsi(amf_set_id, amf_pointer, tmsi);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void ServiceRequest::setUplink_data_status(uint16_t value) { void ServiceRequest::SetUplinkDataStatus(uint16_t value) {
ie_uplink_data_status = std::make_optional<UplinkDataStatus>(value); ie_uplink_data_status = std::make_optional<UplinkDataStatus>(value);
} }
...@@ -72,7 +72,7 @@ void ServiceRequest::SetPduSessionStatus(uint16_t value) { ...@@ -72,7 +72,7 @@ void ServiceRequest::SetPduSessionStatus(uint16_t value) {
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void ServiceRequest::setAllowed_PDU_Session_Status(uint16_t value) { void ServiceRequest::SetAllowedPduSessionStatus(uint16_t value) {
ie_allowed_PDU_session_status = ie_allowed_PDU_session_status =
std::make_optional<AllowedPDUSessionStatus>(value); std::make_optional<AllowedPDUSessionStatus>(value);
} }
...@@ -291,14 +291,14 @@ int ServiceRequest::Decode(NasMmPlainHeader* header, uint8_t* buf, int len) { ...@@ -291,14 +291,14 @@ int ServiceRequest::Decode(NasMmPlainHeader* header, uint8_t* buf, int len) {
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
bool ServiceRequest::getngKSI(uint8_t& ng_ksi) { bool ServiceRequest::GetNgKSI(uint8_t& ng_ksi) {
ng_ksi = ng_ksi =
(ie_ngKSI.GetTypeOfSecurityContext()) | ie_ngKSI.GetNasKeyIdentifier(); (ie_ngKSI.GetTypeOfSecurityContext()) | ie_ngKSI.GetNasKeyIdentifier();
return true; return true;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
uint16_t ServiceRequest::getUplinkDataStatus() { uint16_t ServiceRequest::GetUplinkDataStatus() {
if (ie_uplink_data_status) { if (ie_uplink_data_status) {
return ie_uplink_data_status->GetValue(); return ie_uplink_data_status->GetValue();
} else { } else {
...@@ -307,7 +307,7 @@ uint16_t ServiceRequest::getUplinkDataStatus() { ...@@ -307,7 +307,7 @@ uint16_t ServiceRequest::getUplinkDataStatus() {
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
uint16_t ServiceRequest::getPduSessionStatus() { uint16_t ServiceRequest::GetPduSessionStatus() {
if (ie_PDU_session_status) { if (ie_PDU_session_status) {
return ie_PDU_session_status->GetValue(); return ie_PDU_session_status->GetValue();
} else { } else {
...@@ -316,7 +316,7 @@ uint16_t ServiceRequest::getPduSessionStatus() { ...@@ -316,7 +316,7 @@ uint16_t ServiceRequest::getPduSessionStatus() {
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
uint16_t ServiceRequest::getAllowedPduSessionStatus() { uint16_t ServiceRequest::GetAllowedPduSessionStatus() {
if (ie_allowed_PDU_session_status) { if (ie_allowed_PDU_session_status) {
return ie_allowed_PDU_session_status->GetValue(); return ie_allowed_PDU_session_status->GetValue();
} else { } else {
...@@ -335,7 +335,7 @@ bool ServiceRequest::GetNasMessageContainer(bstring& nas) { ...@@ -335,7 +335,7 @@ bool ServiceRequest::GetNasMessageContainer(bstring& nas) {
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
uint8_t ServiceRequest::getServiceType() { uint8_t ServiceRequest::GetServiceType() {
uint8_t value = 0; uint8_t value = 0;
ie_service_type.GetValue(value); ie_service_type.GetValue(value);
return value; return value;
...@@ -343,6 +343,6 @@ uint8_t ServiceRequest::getServiceType() { ...@@ -343,6 +343,6 @@ uint8_t ServiceRequest::getServiceType() {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
bool ServiceRequest::Get5gSTmsi( bool ServiceRequest::Get5gSTmsi(
uint16_t& amfSetId, uint8_t& amfPointer, string& tmsi) { uint16_t& amf_set_id, uint8_t& amf_pointer, string& tmsi) {
return ie_5g_s_tmsi.Get5gSTmsi(amfSetId, amfPointer, tmsi); return ie_5g_s_tmsi.Get5gSTmsi(amf_set_id, amf_pointer, tmsi);
} }
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
#ifndef _SERVICE_REQUEST_H_ #ifndef _SERVICE_REQUEST_H_
#define _SERVICE_REQUEST_H_ #define _SERVICE_REQUEST_H_
#include <string>
#include "bstrlib.h" #include "bstrlib.h"
#include "NasIeHeader.hpp" #include "NasIeHeader.hpp"
...@@ -40,22 +38,22 @@ class ServiceRequest : public NasMmPlainHeader { ...@@ -40,22 +38,22 @@ class ServiceRequest : public NasMmPlainHeader {
int Decode(NasMmPlainHeader* header, uint8_t* buf, int len); int Decode(NasMmPlainHeader* header, uint8_t* buf, int len);
void SetNgKsi(uint8_t tsc, uint8_t key_set_id); void SetNgKsi(uint8_t tsc, uint8_t key_set_id);
bool getngKSI(uint8_t& ng_ksi); bool GetNgKSI(uint8_t& ng_ksi);
void setServiceType(uint8_t value); void SetServiceType(uint8_t value);
uint8_t getServiceType(); uint8_t GetServiceType();
void Set5gSTmsi(uint16_t amfSetId, uint8_t amfPointer, string tmsi); void Set5gSTmsi(uint16_t amf_set_id, uint8_t amf_pointer, string tmsi);
bool Get5gSTmsi(uint16_t& amfSetId, uint8_t& amfPointer, string& tmsi); bool Get5gSTmsi(uint16_t& amf_set_id, uint8_t& amf_pointer, string& tmsi);
void setUplink_data_status(uint16_t value); void SetUplinkDataStatus(uint16_t value);
uint16_t getUplinkDataStatus(); uint16_t GetUplinkDataStatus();
void SetPduSessionStatus(uint16_t value); void SetPduSessionStatus(uint16_t value);
uint16_t getPduSessionStatus(); uint16_t GetPduSessionStatus();
void setAllowed_PDU_Session_Status(uint16_t value); void SetAllowedPduSessionStatus(uint16_t value);
uint16_t getAllowedPduSessionStatus(); uint16_t GetAllowedPduSessionStatus();
void SetNasMessageContainer(bstring value); void SetNasMessageContainer(bstring value);
bool GetNasMessageContainer(bstring& nas); bool GetNasMessageContainer(bstring& nas);
......
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