Commit 7317ea9e authored by Tien Thinh NGUYEN's avatar Tien Thinh NGUYEN

Code cleanup for UL NAS Transfport

parent 15a1a93e
...@@ -3263,7 +3263,8 @@ void amf_n1::ul_nas_transport_handle( ...@@ -3263,7 +3263,8 @@ void amf_n1::ul_nas_transport_handle(
auto ul_nas = std::make_unique<ULNASTransport>(); auto ul_nas = std::make_unique<ULNASTransport>();
ul_nas->Decode((uint8_t*) bdata(nas), blength(nas)); ul_nas->Decode((uint8_t*) bdata(nas), blength(nas));
uint8_t payload_type = ul_nas->GetPayloadContainerType(); uint8_t payload_type = ul_nas->GetPayloadContainerType();
uint8_t pdu_session_id = ul_nas->GetPduSessionId(); uint8_t pdu_session_id = 0;
ul_nas->GetPduSessionId(pdu_session_id);
uint8_t request_type = 0; uint8_t request_type = 0;
if (!ul_nas->GetRequestType(request_type)) { if (!ul_nas->GetRequestType(request_type)) {
...@@ -3314,7 +3315,7 @@ void amf_n1::ul_nas_transport_handle( ...@@ -3314,7 +3315,7 @@ void amf_n1::ul_nas_transport_handle(
bstring dnn = bfromcstr("default"); bstring dnn = bfromcstr("default");
if (!ul_nas->getDnn(dnn)) { if (!ul_nas->GetDnn(dnn)) {
Logger::amf_n1().debug( Logger::amf_n1().debug(
"No DNN available in ULNASTransport, use default DNN!"); "No DNN available in ULNASTransport, use default DNN!");
// TODO: use default DNN for the corresponding NSSAI // TODO: use default DNN for the corresponding NSSAI
......
...@@ -81,7 +81,7 @@ S_NSSAI::S_NSSAI(std::optional<uint8_t> iei, SNSSAI_s snssai) { ...@@ -81,7 +81,7 @@ S_NSSAI::S_NSSAI(std::optional<uint8_t> iei, SNSSAI_s snssai) {
S_NSSAI::~S_NSSAI() {} S_NSSAI::~S_NSSAI() {}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void S_NSSAI::getValue(SNSSAI_t& snssai) { void S_NSSAI::getValue(SNSSAI_t& snssai) const {
uint8_t len = {0}; uint8_t len = {0};
// SST // SST
snssai.sst = sst_; snssai.sst = sst_;
......
...@@ -43,7 +43,7 @@ class S_NSSAI : public Type4NasIe { ...@@ -43,7 +43,7 @@ class S_NSSAI : public Type4NasIe {
int Encode(uint8_t* buf, int len); int Encode(uint8_t* buf, int len);
int Decode(uint8_t* buf, int len, const bool is_option = true); int Decode(uint8_t* buf, int len, const bool is_option = true);
void getValue(SNSSAI_t& snssai); void getValue(SNSSAI_t& snssai) const;
void SetSNSSAI( void SetSNSSAI(
std::optional<int8_t> iei, uint8_t sst, std::optional<int32_t> sd, std::optional<int8_t> iei, uint8_t sst, std::optional<int32_t> sd,
......
This diff is collapsed.
...@@ -37,39 +37,42 @@ class ULNASTransport : public NasMmPlainHeader { ...@@ -37,39 +37,42 @@ class ULNASTransport : public NasMmPlainHeader {
int Decode(uint8_t* buf, int len); int Decode(uint8_t* buf, int len);
void SetPayloadContainerType(uint8_t value); void SetPayloadContainerType(uint8_t value);
uint8_t GetPayloadContainerType(); uint8_t GetPayloadContainerType() const;
void SetPayloadContainer(std::vector<PayloadContainerEntry> content); void SetPayloadContainer(const std::vector<PayloadContainerEntry>& content);
void GetPayloadContainer(std::vector<PayloadContainerEntry>& content); void GetPayloadContainer(std::vector<PayloadContainerEntry>& content) const;
void GetPayloadContainer(bstring& content); void GetPayloadContainer(bstring& content) const;
void SetPduSessionIdentity2(uint8_t value); void SetPduSessionId(uint8_t value);
uint8_t GetPduSessionId(); bool GetPduSessionId(uint8_t& value) const;
void SetOldPduSessionIdentity2(uint8_t value); void SetOldPduSessionId(uint8_t value);
bool GetOldPduSessionId(uint8_t& value); bool GetOldPduSessionId(uint8_t& value) const;
void SetRequestType(uint8_t value); void SetRequestType(uint8_t value);
bool GetRequestType(uint8_t& value); bool GetRequestType(uint8_t& value) const;
void SetSNssai(SNSSAI_s snssai); void SetSNssai(const SNSSAI_s& snssai);
bool GetSNssai(SNSSAI_s& snssai); bool GetSNssai(SNSSAI_s& snssai) const;
void setDNN(bstring dnn); void SetDnn(const bstring& dnn);
bool getDnn(bstring& dnn); bool GetDnn(bstring& dnn) const;
void SetAdditionalInformation(const bstring& value); void SetAdditionalInformation(const bstring& value);
// TODO: Get
void SetMaPduSessionInformation(uint8_t value); void SetMaPduSessionInformation(uint8_t value);
// TODO: Get
void SetReleaseAssistanceIndication(uint8_t value); void SetReleaseAssistanceIndication(uint8_t value);
// TODO: Get
public: public:
PayloadContainerType ie_payload_container_type; // Mandatory PayloadContainerType ie_payload_container_type; // Mandatory
Payload_Container ie_payload_container; // Mandatory Payload_Container ie_payload_container; // Mandatory
std::optional<PduSessionIdentity2> ie_pdu_session_identity_2; // Optional std::optional<PduSessionIdentity2> ie_pdu_session_id; // Optional
std::optional<PduSessionIdentity2> ie_old_pdu_session_identity_2; // Optional std::optional<PduSessionIdentity2> ie_old_pdu_session_id; // Optional
std::optional<RequestType> ie_request_type; // Optional std::optional<RequestType> ie_request_type; // Optional
std::optional<S_NSSAI> ie_s_nssai; // Optional std::optional<S_NSSAI> ie_s_nssai; // Optional
std::optional<DNN> ie_dnn; // Optional std::optional<DNN> ie_dnn; // Optional
......
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