update request type /pdu session id

src/api-server/impl/SMContextsCollectionApiImpl.cpp

@@ -109,9 +109,13 @@ void SMContextsCollectionApiImpl::post_sm_contexts(const SmContextMessage &smCon
 	//PDU session ID (Mandatory)
 	//TODO:
 	//PTI (Mandatory)
+
 	//TODO:
 	//Message type (Mandatory) (PDU SESSION ESTABLISHMENT REQUEST message identity)
-	sm_context_req_msg->set_message_type(decoded_nas_msg.plain.sm.pdu_session_establishment_request.messagetype);
+	//sm_context_req_msg->set_message_type(decoded_nas_msg.plain.sm.pdu_session_establishment_request.messagetype);
+	//Logger::smf_api_server().debug("nas decode messaget type %d\n",
+	//		decoded_nas_msg.plain.sm.pdu_session_establishment_request.messagetype);
+	sm_context_req_msg->set_message_type (PDU_SESSION_ESTABLISHMENT_REQUEST); //Temporary - should be removed
 	//Integrity protection maximum data rate (Mandatory)
 	//PDU session type (Optional)
 	sm_context_req_msg->set_pdu_session_type(PDN_TYPE_E_IPV4);//TODO: should get from NAS msg

src/api-server/model/SmContextCreateData.cpp

@@ -469,7 +469,7 @@ void SmContextCreateData::unsetGpsi()
 {
     m_GpsiIsSet = false;
 }
-int32_t SmContextCreateData::getPduSessionId() const
+uint8_t SmContextCreateData::getPduSessionId() const
 {
     return m_PduSessionId;
 }
@@ -589,11 +589,11 @@ void SmContextCreateData::setServingNetwork(PlmnId const& value)
     m_ServingNetwork = value;
     
 }
-std::string SmContextCreateData::getRequestType() const
+uint8_t SmContextCreateData::getRequestType() const
 {
     return m_RequestType;
 }
-void SmContextCreateData::setRequestType(std::string const& value)
+void SmContextCreateData::setRequestType(uint8_t const& value)
 {
     m_RequestType = value;
     m_RequestTypeIsSet = true;

src/api-server/model/SmContextCreateData.h

@@ -88,7 +88,7 @@ public:
     /// <summary>
     /// 
     /// </summary>
-    int32_t getPduSessionId() const;
+    uint8_t getPduSessionId() const;
     void setPduSessionId(int32_t const value);
     bool pduSessionIdIsSet() const;
     void unsetPduSessionId();
@@ -140,8 +140,8 @@ public:
         /// <summary>
     /// 
     /// </summary>
-    std::string getRequestType() const;
-    void setRequestType(std::string const& value);
+    uint8_t getRequestType() const;
+    void setRequestType(uint8_t const& value);
     bool requestTypeIsSet() const;
     void unsetRequestType();
     /// <summary>
@@ -373,7 +373,7 @@ protected:
     bool m_PeiIsSet;
     std::string m_Gpsi;
     bool m_GpsiIsSet;
-    int32_t m_PduSessionId;
+    uint8_t m_PduSessionId;
     bool m_PduSessionIdIsSet;
     std::string m_Dnn;
     bool m_DnnIsSet;
@@ -389,7 +389,7 @@ protected:
     bool m_ServiceNameIsSet;
     PlmnId m_ServingNetwork;
 
-    std::string m_RequestType;
+    uint8_t m_RequestType;
     bool m_RequestTypeIsSet;
     RefToBinaryData m_N1SmMsg;
     bool m_N1SmMsgIsSet;

src/common/nas/3gpp_24.007.h

@@ -31,6 +31,23 @@ typedef enum extended_protocol_discriminator_e {
 
 } extended_protocol_discriminator_t;
 
+/* Procedure transaction identity */
+//8 bits
+#define PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED   (uint8_t)0
+#define PROCEDURE_TRANSACTION_IDENTITY_FIRST        (uint8_t)1
+#define PROCEDURE_TRANSACTION_IDENTITY_LAST         (uint8_t)254
+#define PROCEDURE_TRANSACTION_IDENTITY_RESERVED     (uint8_t)255
+
+
+/* PDU Session Identity */
+typedef uint8_t pdu_session_id_t;
+
+//8 bits
+#define PDU_SESSION_IDENTITY_UNASSIGNED   (uint8_t)0
+#define PDU_SESSION_IDENTITY_FIRST        (uint8_t)1
+#define PDU_SESSION_IDENTITY_LAST         (uint8_t)15
+
+
 // Integrity protection maximum data rate
 typedef struct ipmdr_s {
   uint8_t ul;

src/common/nas/common_types.h

@@ -23,7 +23,6 @@
 #ifndef FILE_COMMON_TYPES_SEEN
 #define FILE_COMMON_TYPES_SEEN
 
-#include <stdint.h>
 #include "3gpp_38.401.h"
 #include "3gpp_23.003.h"
 #include "3gpp_24.007.h"

src/common/smf.h

@@ -104,9 +104,4 @@ typedef struct pdu_session_type_s {
 } pdu_session_type_t;
 
 
-
-
-
-
-
 #endif

src/nas/mm/msg/mm_msg.h

+#ifndef MM_MSG_H_
+#define MM_MSG_H_
+
 #include "mmMsgDef.h"
 #include "AuthenticationRequest.h"
 #include "AuthenticationResponse.h"
@@ -66,3 +69,5 @@ typedef struct {
   }specific_msg;
 
 }MM_msg;
+
+#endif

src/pgwc/smf_msg.cpp

@@ -40,12 +40,12 @@ void pdu_session_create_sm_context_request::set_supi(supi_t const& supi)
 	m_supi = supi;
 }
 
-int32_t pdu_session_create_sm_context_request::get_pdu_session_id() const
+pdu_session_id_t pdu_session_create_sm_context_request::get_pdu_session_id() const
 {
 	return m_pdu_session_id;
 }
 
-void pdu_session_create_sm_context_request::set_pdu_session_id(int32_t const pdu_session_id)
+void pdu_session_create_sm_context_request::set_pdu_session_id(pdu_session_id_t const pdu_session_id)
 {
 	m_pdu_session_id = pdu_session_id;
 }
@@ -80,12 +80,12 @@ void pdu_session_create_sm_context_request::set_serving_nf_id(std::string const&
 	m_serving_nf_id = serving_nf_id;
 }
 
-std::string pdu_session_create_sm_context_request::get_request_type() const
+request_type_t pdu_session_create_sm_context_request::get_request_type() const
 {
 	return m_request_type;
 }
 
-void pdu_session_create_sm_context_request::set_request_type(std::string const& request_type)
+void pdu_session_create_sm_context_request::set_request_type(request_type_t const& request_type)
 {
 	m_request_type = request_type;
 }
@@ -179,15 +179,8 @@ paa_t pdu_session_create_sm_context_response::get_paa()
 	return m_paa;
 }
 
-
-Pistache::Http::ResponseWriter& pdu_session_create_sm_context_response::get_http_response()
-{
-	return m_http_response;
-
-}
-
 void pdu_session_create_sm_context_response::send_msg_to_amf(std::string resBody){
-	m_http_response.send(Pistache::Http::Code::Forbidden, resBody);//TEMP
+	m_http_response.send(m_code, resBody);
 }
 
 void pdu_session_create_sm_context_response::set_http_code(Pistache::Http::Code code)

src/pgwc/smf_msg.hpp

@@ -32,6 +32,7 @@
 #include "pistache/http.h"
 #include "3gpp_29.274.h"
 #include "3gpp_24.007.h"
+#include "3gpp_24.501.h"
 
 namespace pgwc {
 
@@ -43,8 +44,8 @@ public:
 	supi_t get_supi() const;
 	void set_supi(supi_t const& value);
 
-	int32_t get_pdu_session_id() const;
-	void set_pdu_session_id(int32_t const value);
+	pdu_session_id_t get_pdu_session_id() const;
+	void set_pdu_session_id(pdu_session_id_t const value);
 
 	std::string get_dnn() const;
 	void set_dnn(std::string const& value);
@@ -55,8 +56,8 @@ public:
 	std::string get_serving_nf_id() const;
 	void set_serving_nf_id(std::string const& value);
 
-	std::string get_request_type() const;
-	void set_request_type(std::string const& value);
+	request_type_t get_request_type() const;
+	void set_request_type(request_type_t const& value);
 
 	//	pdu_session_establishment_request_msg get_nas_msg() const;
 	//	void set_nas_msg(pdu_session_establishment_request_msg const& value);
@@ -85,7 +86,7 @@ private:
 	bool m_unauthenticated_supi;
 	//std::string m_Pei;
 	//std::string m_Gpsi;
-	int32_t m_pdu_session_id;
+	pdu_session_id_t m_pdu_session_id;
 	std::string m_dnn;
 	snssai_t m_snssai;
 	//Snssai m_HplmnSnssai;
@@ -93,7 +94,7 @@ private:
 	//Guami m_Guami;
 	//std::string m_ServiceName;
 	//PlmnId m_ServingNetwork;
-	std::string m_request_type;
+	request_type_t m_request_type;
 	//RefToBinaryData m_N1SmMsg;
 	std::string m_an_type;
 	//std::string m_SecondAnType;
@@ -156,14 +157,14 @@ private:
 class pdu_session_create_sm_context_response {
 
 public:
-	pdu_session_create_sm_context_response(Pistache::Http::ResponseWriter& http_response): m_http_response(http_response) {}
+	pdu_session_create_sm_context_response(Pistache::Http::ResponseWriter& http_response): m_http_response(http_response.clone()) {	}
 	//pdu_session_create_sm_context_response(): {}
 	void set_cause(uint8_t cause);
 	uint8_t get_cause();
 	void set_paa(paa_t paa);
 	paa_t get_paa();
-	Pistache::Http::ResponseWriter& get_http_response();
 	void send_msg_to_amf(std::string resBody);
+	void set_http_response();
 
 	void set_http_code(Pistache::Http::Code code);
 	Pistache::Http::Code get_http_code();
@@ -171,9 +172,8 @@ public:
 private:
 	uint8_t m_cause;
 	paa_t m_paa;
-	Pistache::Http::ResponseWriter& m_http_response;
+	Pistache::Http::ResponseWriter m_http_response;
 	Pistache::Http::Code m_code;
-
 };
 
 }

src/test/inputs/apitest.json

@@ -11,7 +11,7 @@
 	"guami": {"plmnId": {"mcc": "122", "mnc":"13"}, "amfId":"2"}, 
 	"serviceName": "", 
 	"servingNetwork": {"mcc": "122", "mnc":"13"},  
-	"requestType": "", 
+	"requestType": 1, 
 	"anType": "", 
 	"secondAnType": "",
 	"ratType": "",