September 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: GTPv2_Emulation: improve accessibility of unit-data (TEID0)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34286?usp=email ) Change subject: GTPv2_Emulation: improve accessibility of unit-data (TEID0) ...................................................................... GTPv2_Emulation: improve accessibility of unit-data (TEID0) When GTPv2 unit-data is passed around, there is always the problem that it is routed to the MTC_CT (TEID0). The reason for this is that GTPv2_Emulation cannot determine a specific receiver component because unit-data does not contain any addressing fields that would identifiy a specific vc_conn. In GTPv2_Emulation there is already a mechanism implemented that detects responses by their sequence number. Untfortunately this does only work when the vc_conn has send a unit-data message before so that the sequence number of the response can be guessed. In case the first messages comes from the IUT, there is no way to determine the receiving vc_conn, so this message is then routed to the MCT_CT (TEID0). This can be a problem for testcases that run from inside a ConnHdlr componet. The solution that is proposed in this patch uses a mechanism that allows to create an expectation for a specific messageType. When the GTPv2_Emulation sees a unit-data message with the expected messageType, it will forward it to all ConnHdlr (vc_conn) components that have registered for this messageType previously. Related: OS#5760 Change-Id: I02bb74d7bd547347168b5c64ee6512c71e8fd960 --- M library/GTPv2_Emulation.ttcn 1 file changed, 80 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn index ff6a60a..571da4e 100644 --- a/library/GTPv2_Emulation.ttcn +++ b/library/GTPv2_Emulation.ttcn @@ -69,7 +69,9 @@ var TidTableRec TidTable[256]; var SeqTableRec SeqTable[256]; var ImsiTableRec ImsiTable[256]; + var UdMsgTableRec UdMsgTable[256]; var PidTableRec PidTable[256]; + var integer g_uecups_conn_id; }; @@ -91,6 +93,12 @@ GTP2_ConnHdlr vc_conn }; +/* Unit data message type <-> ConnHdlr mapping */ +type record UdMsgTableRec { + OCT1 messageType, + GTP2_ConnHdlr vc_conn +}; + /* pid <-> ConnHdlr mapping (for UECUPS process termination indication) */ type record PidTableRec { /* process ID of the running process */ @@ -202,6 +210,18 @@ testcase.stop("No Space in IMSI Table for ", imsi); } +private function f_udmsg_tbl_add(OCT1 messageType, GTP2_ConnHdlr vc_conn) runs on GTPv2_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(UdMsgTable); i := i+1) { + if (not isbound(UdMsgTable[i].messageType)) { + UdMsgTable[i].messageType := messageType; + UdMsgTable[i].vc_conn := vc_conn; + return; + } + } + testcase.stop("No Space in UdMsg Table for messateType ", messageType); +} + private function f_pid_tbl_add(integer pid, GTP2_ConnHdlr vc_conn) runs on GTPv2_Emulation_CT { var integer i; for (i := 0; i < sizeof(PidTable); i := i+1) { @@ -419,11 +439,27 @@ } } +private function SendToUdMsgTable(Gtp2cUnitdata g2c_ud) runs on GTPv2_Emulation_CT { + var GTP2_ConnHdlr vc_conn; + + for (var integer i := 0; i < sizeof(UdMsgTable); i := i + 1) { + if (isbound(UdMsgTable[i].messageType)) { + if (UdMsgTable[i].messageType == g2c_ud.gtpc.messageType) { + vc_conn := UdMsgTable[i].vc_conn; + CLIENT.send(g2c_ud.gtpc) to vc_conn; + } + } + } + + return; +} + function main(Gtp2EmulationCfg cfg) runs on GTPv2_Emulation_CT { var Gtp2cUnitdata g2c_ud; var PDU_GTPCv2 g2c; var GTP2_ConnHdlr vc_conn; var hexstring imsi; + var OCT1 messageType; var OCT4 teid; var PDU_UECUPS rx_uecups; var UECUPS_CreateTun gtc; @@ -444,6 +480,7 @@ vc_conn := f_comp_by_seq(g2c_ud.gtpc.sequenceNumber); CLIENT.send(g2c_ud.gtpc) to vc_conn; } else { + SendToUdMsgTable(g2c_ud); TEID0.send(g2c_ud.gtpc); } } else if (ispresent(g2c_ud.gtpc.tEID) and g2c_ud.gtpc.tEID != int2oct(0, 4)) { @@ -499,6 +536,10 @@ f_imsi_tbl_add(imsi, vc_conn); CLIENT_PROC.reply(GTP2EM_register_imsi:{imsi}) to vc_conn; } + [] CLIENT_PROC.getcall(GTP2EM_register_udmsg:{?}) -> param(messageType) sender vc_conn { + f_udmsg_tbl_add(messageType, vc_conn); + CLIENT_PROC.reply(GTP2EM_register_udmsg:{messageType}) to vc_conn; + } [] CLIENT_PROC.getcall(GTP2EM_register_teid:{?}) -> param(teid) sender vc_conn { f_tid_tbl_add(teid, vc_conn); @@ -539,6 +580,7 @@ } with { extension "internal" }; signature GTP2EM_register_imsi(hexstring imsi); +signature GTP2EM_register_udmsg(OCT1 messageType); signature GTP2EM_register_teid(OCT4 teid); signature GTP2EM_allocate_teid() return OCT4; signature GTP2EM_create_tunnel(UECUPS_CreateTun gtc); @@ -546,7 +588,7 @@ signature GTP2EM_start_program(UECUPS_StartProgram sprog) return UECUPS_StartProgramRes; type port GTP2EM_PROC_PT procedure { - inout GTP2EM_register_imsi, GTP2EM_register_teid, GTP2EM_allocate_teid, + inout GTP2EM_register_imsi, GTP2EM_register_udmsg, GTP2EM_register_teid, GTP2EM_allocate_teid, GTP2EM_create_tunnel, GTP2EM_destroy_tunnel, GTP2EM_start_program; } with { extension "internal" }; @@ -565,6 +607,12 @@ } } +function f_gtp2_register_udmsg(OCT1 messageType) runs on GTP2_ConnHdlr { + GTP2_PROC.call(GTP2EM_register_udmsg:{messageType}) { + [] GTP2_PROC.getreply(GTP2EM_register_udmsg:{messageType}); + } +} + function f_gtp2_register_teid(OCT4 teid) runs on GTP2_ConnHdlr { GTP2_PROC.call(GTP2EM_register_teid:{teid}) { [] GTP2_PROC.getreply(GTP2EM_register_teid:{teid}); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34286?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I02bb74d7bd547347168b5c64ee6512c71e8fd960 Gerrit-Change-Number: 34286 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: NAS_Templates: add template for EPS update type

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34269?usp=email ) Change subject: NAS_Templates: add template for EPS update type ...................................................................... NAS_Templates: add template for EPS update type Related: OS#5760 Change-Id: I6ffac88cc1d3967dc8000e17a65cdba79a013cf7 --- M library/NAS_Templates.ttcn 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/NAS_Templates.ttcn b/library/NAS_Templates.ttcn index 97469d9..2e8be0e 100644 --- a/library/NAS_Templates.ttcn +++ b/library/NAS_Templates.ttcn @@ -316,6 +316,15 @@ } } +/* 9.9.3.14 EPS update type */ +const BIT3 c_EPS_UPD_TYPE_TA_UPD := '000'B; +const BIT3 c_EPS_UPD_TYPE_COMB_TA_LA_UPD := '001'B; +const BIT3 c_EPS_UPD_TYPE_COMB_TA_LA_UPD_IMSI_ATTACH := '010'B; +const BIT3 c_EPS_UPD_TYPE_TA_UPD_PERIODIC := '011'B; +template (value) EPS_UpdateTypeV ts_EPS_UpdateTypeV(BIT3 typeOfUpdate := c_EPS_UPD_TYPE_TA_UPD, BIT1 activeFlag := '0'B) := { + typeOfUpdate := typeOfUpdate, + activeFlag := activeFlag +} /* 8.2.3 Attach Reject */ template (value) PDU_NAS_EPS -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34269?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6ffac88cc1d3967dc8000e17a65cdba79a013cf7 Gerrit-Change-Number: 34269 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: NAS_Templates: add template for Tracking Area Update Request

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34271?usp=email ) Change subject: NAS_Templates: add template for Tracking Area Update Request ...................................................................... NAS_Templates: add template for Tracking Area Update Request Change-Id: I66843f30f70d73ff233b0da0680cbaba08838227 Related: OS#5760 --- M library/NAS_Templates.ttcn 1 file changed, 54 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/library/NAS_Templates.ttcn b/library/NAS_Templates.ttcn index f132c4e..4b98ee8 100644 --- a/library/NAS_Templates.ttcn +++ b/library/NAS_Templates.ttcn @@ -335,6 +335,50 @@ tSC := tSC } +/* 8.2.29 Tracking Area Update Request */ +template (value) PDU_NAS_EPS +ts_PDU_NAS_EPS_TrackingAreaUpdateRequest(EPS_MobileIdentityLV old_guti) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_TrackingAreaUpdateRequest := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01001000'B, + ePSupdateType := ts_EPS_UpdateTypeV, + nasKeySetId := ts_NAS_KeySetIdentifierV, + oldGUTI := old_guti, + nonCurrentNative_nasKeySetId := omit, + gprsCipheringKeySequenceNumber := omit, + old_P_TMSISignature := omit, + additionalGUTI := omit, + nonce := omit, + uENetworkCapability := omit, + lastVisitedRegisteredTAI := omit, + dRXParameter := omit, + uE_RadioCapabilityInfoUpdateNeeded := omit, + ePSBearerContextStatus := omit, + mSNetworkCapability := omit, + oldLocationAreaIdentification := omit, + tMSIStatusTV := omit, + mobileStationClassmark2 := omit, + mobileStationClassmark3 := omit, + supportedCodecList := omit, + additionalUpdateType := omit, + voiceDomainPrefandUEsettings := omit, + oldGUTI_Type := omit, + deviceProperties := omit, + mS_NetworkFeatureSupport := omit, + tMSIBasedNRIContainer := omit, + t3324 := omit, + t3412_Extended := omit, + extendedDRXParameters := omit, + uEAdditionalSecurityCapability := omit, + uEStatus := omit + } + } + } +} + /* 8.2.3 Attach Reject */ template (value) PDU_NAS_EPS ts_NAS_AttachReject(template (value) EMM_CauseV cause) := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34271?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I66843f30f70d73ff233b0da0680cbaba08838227 Gerrit-Change-Number: 34271 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: NAS_Templates: add template for NAS key set identifier

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34270?usp=email ) Change subject: NAS_Templates: add template for NAS key set identifier ...................................................................... NAS_Templates: add template for NAS key set identifier Related: OS#5760 Change-Id: I2df0c9d1bf4bf0073b5f7b77708b8de59f96a639 --- M library/NAS_Templates.ttcn 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/library/NAS_Templates.ttcn b/library/NAS_Templates.ttcn index 2e8be0e..f132c4e 100644 --- a/library/NAS_Templates.ttcn +++ b/library/NAS_Templates.ttcn @@ -326,6 +326,15 @@ activeFlag := activeFlag } +/* 9.9.3.21 NAS key set identifier */ +const BIT3 c_NAS_KEY_SET_ID_NO_KEY := '111'B; +const BIT1 c_NAS_TSC_NATIVE_SEC_CTX := '0'B; +const BIT1 c_NAS_TSC_MAPPED_SEC_CTX := '1'B; +template (value) NAS_KeySetIdentifierV ts_NAS_KeySetIdentifierV(BIT3 identifier := c_NAS_KEY_SET_ID_NO_KEY, BIT1 tSC := c_NAS_TSC_NATIVE_SEC_CTX) := { + identifier := identifier, + tSC := tSC +} + /* 8.2.3 Attach Reject */ template (value) PDU_NAS_EPS ts_NAS_AttachReject(template (value) EMM_CauseV cause) := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34270?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2df0c9d1bf4bf0073b5f7b77708b8de59f96a639 Gerrit-Change-Number: 34270 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: NAS_Templates: add template for EPS update type

by laforge

Attention is currently required from: dexter, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34269?usp=email ) Change subject: NAS_Templates: add template for EPS update type ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34269?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6ffac88cc1d3967dc8000e17a65cdba79a013cf7 Gerrit-Change-Number: 34269 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Sep 2023 20:20:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: NAS_Templates: fix ts_NAS_GUTI

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34267?usp=email ) Change subject: NAS_Templates: fix ts_NAS_GUTI ...................................................................... NAS_Templates: fix ts_NAS_GUTI The template ts_NAS_GUTI permutates the MCC/MNC digits in a weird way, which seems to map to a format that is not used anywhere else. Also the template is not used anywhere yet. Let's not permutate the MCC/MNC digit, instead let's put a comment that makes clear which format has to be used. Change-Id: I9546993987b873e8ae921664238b234608e37bba Related: OS#5760 --- M library/NAS_Templates.ttcn 1 file changed, 23 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/NAS_Templates.ttcn b/library/NAS_Templates.ttcn index f819862..bbe7237 100644 --- a/library/NAS_Templates.ttcn +++ b/library/NAS_Templates.ttcn @@ -111,13 +111,15 @@ template (value) GUTI ts_NAS_GUTI(hexstring mcc_mnc, OCT2 mmegi, OCT1 mmec, OCT4 tmsi) := { oddevenIndicator := '0'B, spare := '1111'B, - /* mcc_mnc specified in format 262f42 */ + /* use the mcc_mnc format as specified in 3GPP TS 24.301, figure 9.9.3.12.1. + * Example: mcc=262, mnc=42 => 262f42. + * mcc=001, mnc=01 => 001f01. */ mccDigit1 := mcc_mnc[0], mccDigit2 := mcc_mnc[1], mccDigit3 := mcc_mnc[2], - mncDigit3 := mcc_mnc[5], - mncDigit1 := mcc_mnc[3], - mncDigit2 := mcc_mnc[4], + mncDigit3 := mcc_mnc[3], + mncDigit1 := mcc_mnc[4], + mncDigit2 := mcc_mnc[5], mMEGI := mmegi, mMEC := mmec, mTMSI := tmsi -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34267?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9546993987b873e8ae921664238b234608e37bba Gerrit-Change-Number: 34267 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: MME_Tests: Add S11/GTPv2 interface

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34266?usp=email ) Change subject: MME_Tests: Add S11/GTPv2 interface ...................................................................... MME_Tests: Add S11/GTPv2 interface The S11 interface is used by the MME to talk to the SGW-C. At the moment we do not simulate the S11 interface in our testcases. This is in particular a problem for TC_s1ap_attach, which needs to answer the Create Session Request, comming from the MME in order to continue. As a first step, lets add evrything that is required to run an S11 interface in the testsuite. Change-Id: I545dd6cef3cef7283f2e04c2406a2703c2fdd01a Related: OS#5760 --- M mme/MME_Tests.ttcn M mme/gen_links.sh M mme/regen_makefile.sh 3 files changed, 71 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index cc75377..55cb021 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -44,6 +44,10 @@ import from Osmocom_Types all; import from Osmocom_Gb_Types all; +import from GTPv2_Types all; +import from GTPv2_Templates all; +import from GTPv2_Emulation all; + friend module MME_Tests_SGsAP; /* (maximum) number of emulated eNBs */ @@ -84,6 +88,10 @@ /* Gn interface (GTPv1C) of emulated SGSN (Rel. 7) */ var GTP_Emulation_CT vc_GTP; + /* S11 interface (GTPv2C) of emulated SGW-C */ + var GTPv2_Emulation_CT vc_GTP2; + port GTP2EM_PT TEID0; + var UeParams g_ue_pars[NUM_UE]; } @@ -116,7 +124,7 @@ return substr(encoded, 11, global_enb_id_len); } -type component ConnHdlr extends S1AP_ConnHdlr, SGsAP_ConnHdlr, DIAMETER_ConnHdlr, GTP_ConnHdlr { +type component ConnHdlr extends S1AP_ConnHdlr, SGsAP_ConnHdlr, DIAMETER_ConnHdlr, GTP_ConnHdlr, GTP2_ConnHdlr { var ConnHdlrPars g_pars; timer g_Tguard := 30.0; @@ -153,6 +161,12 @@ charstring mp_gn_local_ip := "127.0.0.22"; integer mp_gn_local_port := 2123; charstring mp_gn_remote_ip := "127.0.0.2"; + + /* S11 interface (GTPv2C, interface between MME and SGW) */ + charstring mp_s11_local_ip := "127.0.0.3"; + integer mp_s11_local_port := 2123; + charstring mp_s11_remote_ip := "127.0.0.2"; + integer mp_s11_remote_port := 2123; } /* send incoming unit data messages (like reset) to global SGsAP_UNIT port */ @@ -290,7 +304,25 @@ vc_GTP.start(GTP_Emulation.main(gtp_cfg)); } -friend template (value) TAI ts_enb_S1AP_TAI(EnbParams enb) := { +friend function f_init_gtpv2_s11(charstring id) runs on MTC_CT { + id := id & "-GTPV2"; + + var Gtp2EmulationCfg cfg := { + gtpc_bind_ip := mp_s11_local_ip, + gtpc_bind_port := mp_s11_local_port, + gtpc_remote_ip := mp_s11_remote_ip, + gtpc_remote_port := mp_s11_remote_port, + sgw_role := true, + use_gtpu_daemon := false + }; + + vc_GTP2 := GTPv2_Emulation_CT.create(id); + map(vc_GTP2:GTP2C, system:GTP2C); + connect(vc_GTP2:TEID0, self:TEID0); + vc_GTP2.start(GTPv2_Emulation.main(cfg)); +} + +friend template (value) S1AP_IEs.TAI ts_enb_S1AP_TAI(EnbParams enb) := { pLMNidentity := enb.global_enb_id.pLMNidentity, tAC := enb.supported_tas[0].tAC, iE_Extensions := omit @@ -339,6 +371,10 @@ connect(vc_conn:GTP, vc_GTP:CLIENT); connect(vc_conn:GTP_PROC, vc_GTP:CLIENT_PROC); } + if (isbound(vc_GTP2)) { + connect(vc_conn:GTP2, vc_GTP2:CLIENT); + connect(vc_conn:GTP2_PROC, vc_GTP2:CLIENT_PROC); + } /* We cannot use vc_conn.start(f_init_handler(fn, id, pars)); as we cannot have * a stand-alone 'derefers()' call, see https://www.eclipse.org/forums/index.php/t/1091364/ */ @@ -371,8 +407,8 @@ -friend function f_s1ap_setup(integer idx := 0, template Cause cause := omit) runs on MTC_CT { - var template (present) Cause exp_cause; +friend function f_s1ap_setup(integer idx := 0, template S1AP_IEs.Cause cause := omit) runs on MTC_CT { + var template (present) S1AP_IEs.Cause exp_cause; var boolean exp_fail := false; timer T := 5.0; if (not istemplatekind(cause, "omit")) { @@ -911,7 +947,7 @@ f_init_s1ap(id, 3); f_s1ap_setup(0); - var template (value) Cause reset_cause := {misc := om_intervention}; + var template (value) S1AP_IEs.Cause reset_cause := {misc := om_intervention}; var template (value) ResetType reset_type := {s1_Interface := reset_all}; timer T := 5.0; diff --git a/mme/gen_links.sh b/mme/gen_links.sh index e0a038b..f10a161 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -51,6 +51,14 @@ FILES="BSSGP_EncDec.cc BSSGP_Types.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.GTPv2_v13.7.0/src +FILES="GTPv2_Types.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/osmo-uecups/ttcn3 +FILES="UECUPS_CodecPort.ttcn UECUPS_CodecPort_CtrlFunct.ttcn UECUPS_CodecPort_CtrlFunctDef.cc UECUPS_Types.ttcn " +gen_links $DIR $FILES + DIR=$BASEDIR/titan.ProtocolModules.DIAMETER_ProtocolModule_Generator/src FILES="DIAMETER_EncDec.cc" gen_links $DIR $FILES @@ -69,6 +77,8 @@ FILES+="NAS_Templates.ttcn GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn DIAMETER_Templates.ttcn " FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn GTP_Templates.ttcn Osmocom_Gb_Types.ttcn " +FILES+="GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " +FILES+="GTPv2_CodecPort.ttcn GTPv2_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunct.ttcn GTPv2_Emulation.ttcn " FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " gen_links $DIR $FILES diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index df5151e..e153d35 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -12,6 +12,7 @@ GTPC_EncDec.cc GTPU_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc + GTPv2_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc LTE_CryptoFunctionDefs.cc @@ -23,6 +24,7 @@ TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc + UECUPS_CodecPort_CtrlFunctDef.cc " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34266?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I545dd6cef3cef7283f2e04c2406a2703c2fdd01a Gerrit-Change-Number: 34266 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Emulation: make sure g_uecups_conn_id is populated.

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34265?usp=email ) Change subject: GTPv2_Emulation: make sure g_uecups_conn_id is populated. ...................................................................... GTPv2_Emulation: make sure g_uecups_conn_id is populated. In function f_init, we activate altstep as_uecups_ind at the end of the function. In as_uecups we use the template generator function tr_UECUPS_RecvFrom_R(). In this function we use g_uecups_conn_id, which is only populated when use_gtpu_daemon is set to true. When use_gtpu_daemon is false g_uecups_conn_id will be <unbound>, which leads into an error. Related: OS#5760 Change-Id: Ifc2e8d9de13d5d183d6f052b2092c356ab4973d1 --- M library/GTPv2_Emulation.ttcn 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn index 5bb3b1e..ff6a60a 100644 --- a/library/GTPv2_Emulation.ttcn +++ b/library/GTPv2_Emulation.ttcn @@ -389,6 +389,8 @@ remPort := g_gtp2_cfg.gtpc_remote_port } + g_uecups_conn_id := res.connId; + if (g_gtp2_cfg.use_gtpu_daemon) { map(self:UECUPS, system:UECUPS); res := UECUPS_CodecPort_CtrlFunct.f_IPL4_connect(UECUPS, mp_uecups_host, mp_uecups_port, "", -1, -1, { sctp := valueof(ts_SCTP) }); @@ -396,7 +398,6 @@ setverdict(fail, "Could not connect UECUPS socket, check your configuration"); testcase.stop; } - g_uecups_conn_id := res.connId; /* clear all tunnel state in the daemon at start */ f_uecups_xceive({reset_all_state := {}}, {reset_all_state_res:=?}, 30.0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34265?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifc2e8d9de13d5d183d6f052b2092c356ab4973d1 Gerrit-Change-Number: 34265 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: NAS_Templates: add templates for EPS_Mobile_ID_IMSI/IMEI/GUTI

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34268?usp=email ) Change subject: NAS_Templates: add templates for EPS_Mobile_ID_IMSI/IMEI/GUTI ...................................................................... NAS_Templates: add templates for EPS_Mobile_ID_IMSI/IMEI/GUTI We do have ts_NAS_MobileId_IMSI/IMEI/GUTI, those can not be used when crafting EPS messages. However, we can use them to craft ts_EPS_MobileId_IMSI/IMEI/GUTI templates. Related: OS#5760 Change-Id: I1adf8c652530904a8e9bd988e78c995c75bb49ab --- M library/NAS_Templates.ttcn 1 file changed, 30 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/NAS_Templates.ttcn b/library/NAS_Templates.ttcn index bbe7237..97469d9 100644 --- a/library/NAS_Templates.ttcn +++ b/library/NAS_Templates.ttcn @@ -149,6 +149,22 @@ } } +/* 9.9.3.12 EPS mobile identity */ +template (value) EPS_MobileIdentityLV +ts_EPS_MobileId_IMSI(hexstring imsi) := { + ePS_MobileIdentity := ts_NAS_MobileId_IMSI(imsi) +} + +template (value) EPS_MobileIdentityLV +ts_EPS_MobileId_IMEI(hexstring imei) := { + ePS_MobileIdentity := ts_NAS_MobileId_IMEI(imei) +} + +template (value) EPS_MobileIdentityLV +ts_EPS_MobileId_GUTI(hexstring mcc_mnc, OCT2 mmegi, OCT1 mmec, OCT4 tmsi) := { + ePS_MobileIdentity := ts_NAS_MobileId_GUTI(mcc_mnc, mmegi, mmec, tmsi) +} + template (value) PDU_NAS_EPS ts_NAS_EMM_SecurityProtected(BIT4 sec_hdr_t, integer seq_nr, octetstring inner_nas) := { protocolDiscriminator := c_EPS_NAS_PD_EMM, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34268?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1adf8c652530904a8e9bd988e78c995c75bb49ab Gerrit-Change-Number: 34268 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: MME_Tests: Add S11/GTPv2 interface

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34266?usp=email ) Change subject: MME_Tests: Add S11/GTPv2 interface ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34266?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I545dd6cef3cef7283f2e04c2406a2703c2fdd01a Gerrit-Change-Number: 34266 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Sep 2023 20:19:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023