pespin submitted this change.

View Change

Approvals:
  osmith: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  laforge: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

smf: Decode NGAP coming in N1N2Message

Change-Id: Ia0b3768836e775b898ecf8c0c341d1f8593a6802
---
M smf/SMF_Session_CT_5G.ttcn
M smf/gen_links.sh
M smf/regen_makefile.sh
3 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/smf/SMF_Session_CT_5G.ttcn b/smf/SMF_Session_CT_5G.ttcn
index 71047a7..c754845 100644
--- a/smf/SMF_Session_CT_5G.ttcn
+++ b/smf/SMF_Session_CT_5G.ttcn
@@ -21,6 +21,9 @@
 import from TS29502_Nsmf_PDUSession_Templates all;
 import from TS29512_Npcf_SMPolicyControl_Templates all;
 
+import from NGAP_IEs all;
+import from NGAP_Types all;
+
 import from PFCP_Emulation all;
 import from Mutex all;
 
@@ -223,6 +226,7 @@
 	var HTTP2_Msg http2_rx;
 	[] HTTP2_CONN[HTTP2_CONN_SCP].receive(f_tr_Namf_Communication_post_n1n2_messages()) -> value http2_rx {
 		var N1N2MessageTransferReqData n1n2msg_req;
+		var NGAP_IEs.PDUSessionResourceSetupRequestTransfer setup_req_transf;
 		var template (value) N1N2MessageTransferRspData n1n2msg_rsp;
 		var template (value) HTTP2_Msg http2_tx;
 		var octetstring body_enc;
@@ -237,6 +241,12 @@
 		f_dec_N1N2MessageTransferReqData(parts[0].data, n1n2msg_req); // TODO: check returned integer.
 		log("PESPIN: N1N2MessageTransferReqData:", n1n2msg_req);
 
+		/* TODO: Decode 2nd part: 5GNAS: */
+		log("TODO: Decode 2nd part (5GNAS): ", parts[1].data);
+
+		/* Decode 3rd part: NGAP: */
+		setup_req_transf := dec_NGAP_PDUSessionResourceSetupRequestTransfer(parts[2].data);
+
 		/* Tx answer: */
 		n1n2msg_rsp := ts_N1N2MessageTransferRspData(cause := ts_N1N2MessageTransferCause(N1_N2_TRANSFER_INITIATED))
 		body_enc := f_enc_N1N2MessageTransferRspData(valueof(n1n2msg_rsp));
diff --git a/smf/gen_links.sh b/smf/gen_links.sh
index d1b3394..29d860a 100755
--- a/smf/gen_links.sh
+++ b/smf/gen_links.sh
@@ -70,6 +70,11 @@
 FILES="TS29571_CommonData.ttcn TS29502_Nsmf_PDUSession.ttcn TS29503_Nudm_SDM.ttcn TS29512_Npcf_SMPolicyControl.ttcn TS29518_Namf_Communication.ttcn "
 gen_links $DIR $FILES
 
+DIR=../library/ngap
+FILES="NGAP_CommonDataTypes.asn  NGAP_Constants.asn  NGAP_Containers.asn  NGAP_IEs.asn  NGAP_PDU_Contents.asn  NGAP_PDU_Descriptions.asn "
+FILES+="NGAP_EncDec.cc NGAP_Types.ttcn NGAP_Pixits.ttcn NGAP_Templates.ttcn "
+gen_links $DIR $FILES
+
 DIR=../library
 FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn IPCP_Templates.ttcn PAP_Types.ttcn "
 FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1C_Templates.ttcn Osmocom_Gb_Types.ttcn "
diff --git a/smf/regen_makefile.sh b/smf/regen_makefile.sh
index ad9ebd0..b8c5a9a 100755
--- a/smf/regen_makefile.sh
+++ b/smf/regen_makefile.sh
@@ -21,6 +21,7 @@
 	IPL4asp_discovery.cc
 	IP_EncDec.cc
 	Native_FunctionDefs.cc
+	NGAP_EncDec.cc
 	TCCConversion.cc
 	TCCDateTime.cc
 	TCCInterface.cc

To view, visit change 43660. To unsubscribe, or for help writing mail filters, visit settings.