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

[S] Change in osmo-ttcn3-hacks[master]: S1AP_Emulation: Fix NAS_PDU decoding of InitialContextSetupRequest msg

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35376?usp=email ) Change subject: S1AP_Emulation: Fix NAS_PDU decoding of InitialContextSetupRequest msg ...................................................................... S1AP_Emulation: Fix NAS_PDU decoding of InitialContextSetupRequest msg The InitialContextSetupRequest message contains a NAS_PDU deep inside (in E-RABToBeSetupListCtxtSUReq), and it was not being rx_counted nor decoded by the S1AP_Emulation. Since we also care about the lower layer contents from the emulation user point of view, first send the S1AP_PDU and later the decoded NAS_PDU. This way the user can wait to receive the related low level S1AP_PDU, and then read again from the port to get the decoded NAS_PDU. Change-Id: Ibff5a38b92deafa8d104801f107ca1b8b82bbce0 --- M library/S1AP_Emulation.ttcn 1 file changed, 36 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/35376/1 diff --git a/library/S1AP_Emulation.ttcn b/library/S1AP_Emulation.ttcn index bb3a2a4..9f36225 100644 --- a/library/S1AP_Emulation.ttcn +++ b/library/S1AP_Emulation.ttcn @@ -503,6 +503,11 @@ if (match(nas, tr_NAS_EMM_SecurityProtected)) { nas := f_nas_try_decaps(S1apAssociationTable[assoc_id].nus, nas); } + /* DL/UlNasTransport are not interesting, don't send them */ + if (not match(mrf.msg, (tr_S1AP_DlNasTransport, tr_S1AP_UlNasTransport))) { + /* send raw S1AP */ + S1AP_CLIENT.send(mrf.msg) to vc_conn; + } /* send decoded NAS */ S1AP_CLIENT.send(nas) to vc_conn; } else { @@ -771,7 +776,7 @@ function f_S1AP_get_NAS_PDU(S1AP_PDU s1ap) return template (omit) NAS_PDU { - var integer i; + var integer i, j; if (ischosen(s1ap.initiatingMessage)) { var InitiatingMessage im := s1ap.initiatingMessage; @@ -792,6 +797,19 @@ } } } + case (tr_S1AP_IntialCtxSetupReq) { + var InitialContextSetupRequest msg := im.value_.initialContextSetupRequest; + for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { + if (msg.protocolIEs[i].id == id_E_RABToBeSetupListCtxtSUReq) { + var E_RABToBeSetupListCtxtSUReq rab_req := msg.protocolIEs[i].value_.E_RABToBeSetupListCtxtSUReq; + for (j := 0; j < lengthof(rab_req); j := j+1) { + var E_RABToBeSetupItemCtxtSUReq it := rab_req[j].value_.E_RABToBeSetupItemCtxtSUReq; + return it.nAS_PDU; + } + } + } + return omit; + } } } return omit; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35376?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: Ibff5a38b92deafa8d104801f107ca1b8b82bbce0 Gerrit-Change-Number: 35376 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: LTE_CryptoFunctions.ttcn: Increment nus.rx_count on each pkt read

by pespin

Attention is currently required from: laforge, osmith, pespin. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35366?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: LTE_CryptoFunctions.ttcn: Increment nus.rx_count on each pkt read ...................................................................... LTE_CryptoFunctions.ttcn: Increment nus.rx_count on each pkt read Before this patch, the rx_count field was never set to anything other than zero. There's still a problem with counter not being incremented when a S1AP_IntialCtxSetupReq message containing a NAS_PDU is received. This will be fixed ina follow-up patch. Change-Id: I1ee25fd8fde6fbce95444ee4b73918ce1f61b427 --- M mme/LTE_CryptoFunctions.ttcn 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/35366/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35366?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: I1ee25fd8fde6fbce95444ee4b73918ce1f61b427 Gerrit-Change-Number: 35366 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: LTE_CryptoFunctions.ttcn: Increment nus.rx_count on each pkt read

by pespin

Attention is currently required from: laforge, osmith, pespin. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35366?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: LTE_CryptoFunctions.ttcn: Increment nus.rx_count on each pkt read ...................................................................... LTE_CryptoFunctions.ttcn: Increment nus.rx_count on each pkt read Before this patch, the rx_count field was never set to anything other than zero. This makes f_nas_check_ip() success when receiving messages from open5gs-mmed. Change-Id: I1ee25fd8fde6fbce95444ee4b73918ce1f61b427 --- M library/S1AP_Emulation.ttcn M mme/LTE_CryptoFunctions.ttcn 2 files changed, 43 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/35366/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35366?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: I1ee25fd8fde6fbce95444ee4b73918ce1f61b427 Gerrit-Change-Number: 35366 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: GTP_Emulation: SGSN_ContextRequest: Fix unconditional access to optio...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35375?usp=email ) Change subject: GTP_Emulation: SGSN_ContextRequest: Fix unconditional access to optional field IMSI ...................................................................... GTP_Emulation: SGSN_ContextRequest: Fix unconditional access to optional field IMSI Change-Id: I254f790aeb7c491200b86bec3c22ae56c452c2df --- M library/GTP_Emulation.ttcn 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/35375/1 diff --git a/library/GTP_Emulation.ttcn b/library/GTP_Emulation.ttcn index 4ea293c..6297c4f 100644 --- a/library/GTP_Emulation.ttcn +++ b/library/GTP_Emulation.ttcn @@ -136,7 +136,11 @@ } else if (ischosen(gtp.gtpc_pdu.sgsn_ContextRequest)) { return gtp.gtpc_pdu.sgsn_ContextRequest.imsi.digits; } else if (ischosen(gtp.gtpc_pdu.sgsn_ContextResponse)) { - return gtp.gtpc_pdu.sgsn_ContextResponse.imsi.digits; + if (ispresent(gtp.gtpc_pdu.sgsn_ContextResponse.imsi.digits)) { + return gtp.gtpc_pdu.sgsn_ContextResponse.imsi.digits; + } else { + return omit; + } } else if (ischosen(gtp.gtpc_pdu.forwardRelocationRequest)) { return gtp.gtpc_pdu.forwardRelocationRequest.imsi.digits; } else if (ischosen(gtp.gtpc_pdu.relocationCancelRequest)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35375?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: I254f790aeb7c491200b86bec3c22ae56c452c2df Gerrit-Change-Number: 35375 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: LTE_CryptoFunctions.ttcn: Use received SeqNum as nus.rx_count

by fixeria

Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35366?usp=email ) Change subject: LTE_CryptoFunctions.ttcn: Use received SeqNum as nus.rx_count ...................................................................... Patch Set 2: -Code-Review (1 comment) Patchset: PS2: Hmm, actually this is not 100% what I suggested. We're discussing in PM. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35366?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: I1ee25fd8fde6fbce95444ee4b73918ce1f61b427 Gerrit-Change-Number: 35366 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Dec 2023 17:16:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: LTE_CryptoFunctions.ttcn: Use received SeqNum as nus.rx_count

by fixeria

Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35366?usp=email ) Change subject: LTE_CryptoFunctions.ttcn: Use received SeqNum as nus.rx_count ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Patchset: PS2: > Thanks @vyanitskiy@sysmocom. […] Happy to hear it worked! File mme/LTE_CryptoFunctions.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35366/comment/792e74e1_d91a… PS1, Line 151: nus.rx_count := nus.rx_count + 1; > @laforge@gnumonks.org I tried fixing the following problem with this, but still not working: […] Marking as resolved. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35366?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: I1ee25fd8fde6fbce95444ee4b73918ce1f61b427 Gerrit-Change-Number: 35366 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Dec 2023 16:58:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-iuh[master]: Bump version: 1.5.0.3-a99b → 1.5.1

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/35374?usp=email ) Change subject: Bump version: 1.5.0.3-a99b → 1.5.1 ...................................................................... Bump version: 1.5.0.3-a99b → 1.5.1 Change-Id: I01d1cebfe4fdd0bce53260d69e3f037068194ea8 --- M debian/changelog M src/Makefile.am 2 files changed, 21 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve diff --git a/debian/changelog b/debian/changelog index ff0fb0a..0720fa0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +osmo-iuh (1.5.1) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * ranap_transp_layer_addr_decode2(): Fix decoding X.213 IPv4 address len=7 + + [ Daniel Willmann ] + * iu_client: Use local variable to track conn_id + * iu_client: Handle empty CR and InitialUE Message in DATA.ind + + -- Oliver Smith <osmith(a)sysmocom.de> Fri, 15 Dec 2023 15:05:11 +0100 + osmo-iuh (1.5.0) unstable; urgency=medium [ arehbein ] diff --git a/src/Makefile.am b/src/Makefile.am index 146c8aa..44c4c43 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -62,7 +62,7 @@ # build the shared RANAP + SABP library # HNBAP_LIBVERSION=1:0:1 -RANAP_LIBVERSION=8:0:1 +RANAP_LIBVERSION=8:1:1 RUA_LIBVERSION=1:1:1 SABP_LIBVERSION=2:0:1 lib_LTLIBRARIES = libosmo-hnbap.la libosmo-ranap.la libosmo-rua.la libosmo-sabp.la -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/35374?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I01d1cebfe4fdd0bce53260d69e3f037068194ea8 Gerrit-Change-Number: 35374 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: mme: Implement missing UE attach steps

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35367?usp=email ) Change subject: mme: Implement missing UE attach steps ...................................................................... Patch Set 2: (1 comment) File library/s1ap/S1AP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35367/comment/8ac04cce_c5f7… PS2, Line 603: /*OPTIONAL: template (value) E_RABList rab_items */ > No, I tried and it throws Dynamic Test Error when trying to assing E_RABList := omit. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35367?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: Ib4a69aef40bf9dd17d640f650e459668f8415aaa Gerrit-Change-Number: 35367 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Dec 2023 16:23:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-iuh[master]: Bump version: 1.5.0.3-a99b → 1.5.1

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/35374?usp=email ) Change subject: Bump version: 1.5.0.3-a99b → 1.5.1 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/35374?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I01d1cebfe4fdd0bce53260d69e3f037068194ea8 Gerrit-Change-Number: 35374 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Dec 2023 16:23:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: mme: Implement missing UE attach steps

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35367?usp=email ) Change subject: mme: Implement missing UE attach steps ...................................................................... mme: Implement missing UE attach steps Related: OS#6294 Change-Id: Ib4a69aef40bf9dd17d640f650e459668f8415aaa --- M library/GTPv2_Templates.ttcn M library/NAS_Templates.ttcn M library/s1ap/S1AP_Templates.ttcn M mme/MME_Tests.ttcn 4 files changed, 318 insertions(+), 27 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn index 1ccbcb8..c09bca8 100644 --- a/library/GTPv2_Templates.ttcn +++ b/library/GTPv2_Templates.ttcn @@ -1040,6 +1040,65 @@ privateExtension := omit }}); +template (present) PDU_GTPCv2 +tr_GTP2C_ModifyBearerReq(template (present) OCT4 d_teid := ?, + template (present) OCT3 seq := ?) := +tr_PDU_GTP2C(d_teid, seq, { + modifyBearerRequest := { + mEI := *, + userLocationInfo := *, + servingNetwork := *, + rAT_Type := *, + indicationFlags := *, + fullyQualifiedTEID := *, + ambr := *, + delayDownlinkPacketNotificationReq := *, + bearerContextGrouped := *, + recovery := *, + uE_TimeZone := *, + csid := *, + user_CSG_Information := *, + iP_Addr := *, + portNumber := *, + lDN := *, + //maxMBR_APN_AMBR := *, + cNOperatorSelectionEntity := *, + presenceReportingAreaInformation := *, + overloadControlInformationGrouped := *, + servingPLMNRateControl := *, + counter := *, + privateExtension := * + }}); + +template (value) PDU_GTPCv2 +ts_GTP2C_ModifyBearerResp(template (value) OCT4 d_teid, + template (value) OCT3 seq, + template (value) GTP2C_Cause cause, + template (value) uint4_t bearer_id, + template (omit) BearerContextGrouped_List bearerContextGrouped := omit) := +ts_PDU_GTP2C(d_teid, seq, '23'O, { + modifyBearerResponse := { + cause := ts_GTP2C_Cause(cause, '0'B), + mSISDN := omit, + linkedEPS_Bearer_ID := ts_GTP2C_EpsBearerId(bearer_id), + aPN_Restriction := omit, + protocolConfigOptions := omit, + bearerContextGrouped := bearerContextGrouped, + changeReportingAction := omit, + cSG_InformationReportingAction := omit, + heNBInformationReporting := omit, + chargingGatewayName := omit, + chargingGatewayAddress := omit, + csid := omit, + recovery := omit, + lDN := omit, + indicationFlags := omit, + presenceReportingAreaAction := omit, + loadControlInformationGrouped := omit, + overloadControlInformationGrouped := omit, + pDNConnectionChargingID := omit, + privateExtension := omit + }}); template (value) PDU_GTPCv2 ts_GTP2C_DeleteBearerReq(template (value) OCT4 d_teid, diff --git a/library/NAS_Templates.ttcn b/library/NAS_Templates.ttcn index 45f5f8d..70561b3 100644 --- a/library/NAS_Templates.ttcn +++ b/library/NAS_Templates.ttcn @@ -1025,6 +1025,55 @@ } } } +template (present) PDU_NAS_EPS +tr_NAS_ActDefEpsBearCtxReq(template (present) BIT4 bearer_id := ?, + template (present) BIT8 proc_tid := ?, + template (present) EPS_QualityOfServiceV qos := ?, + template (present) octetstring apn := ?, + template (present) BIT3 addr_type := ?, + template (present) octetstring addr_info := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_ActDefEPSBearerContextRequest := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11000001'B, + ePS_QoS := { + lengthIndicator := ?, + ePS_QualityOfServiceV := qos + }, + accessPointName := { + lengthIndicator := 0, + accessPointNameValue := apn + }, + pDN_Address := { + lengthIndicator := 0, + typeValue := addr_type, + spare := '00000'B, + addressInformation := addr_info + }, + transactionIdentifier := *, + negotiatedQoS := *, + negotiated_LLC_SAPI := *, + radioPriority := *, + packetFlowID := *, + aPN_AMBR := *, + esmCause := *, + protocolConfigOptions := *, + connectivityType := *, + wLANOffloadIndication := *, + nBIFOMContainer := *, + headerCompressinConfiguration := *, + controlPlaneOnlyIndication := *, + extendedProtocolConfigurationOptions := *, + servingPLMNRateControl := *, + extended_APN_AMBR := *, + extendedQoS := * + } + } + } +} /* 8.3.4 Activate Default EPS Bearer Context Accept */ template (value) PDU_NAS_EPS diff --git a/library/s1ap/S1AP_Templates.ttcn b/library/s1ap/S1AP_Templates.ttcn index 9e75cec..26e1ae1 100644 --- a/library/s1ap/S1AP_Templates.ttcn +++ b/library/s1ap/S1AP_Templates.ttcn @@ -22,7 +22,7 @@ *********************************************************************************/ /********************************************************************************* - * 9.1.8 Management Messages + * 9.1.8 Management Messages *********************************************************************************/ /* 9.1.8.4 S1 SETUP REQUEST */ @@ -578,11 +578,30 @@ } /* 9.1.4.3 INITIAL CONTEXT SETUP RESPONSE */ +template (value) E_RABSetupItemCtxtSURes +ts_S1AP_RABSetupItemCtxtSURes(template (value) E_RAB_ID rab_id := 5, + template (value) TransportLayerAddress tla := '00001010000101110001100000000100'B, + template (value) GTP_TEID gtp_teid := '00000002'O) := { + e_RAB_ID := rab_id, + transportLayerAddress := tla, + gTP_TEID := gtp_teid, + iE_Extensions := omit +} +template (value) E_RABSetupListCtxtSURes +ts_S1AP_RABSetupListCtxtSURes(template (value) E_RABSetupItemCtxtSURes it := ts_S1AP_RABSetupItemCtxtSURes()) := { + { + id := S1AP_Constants.id_E_RABSetupItemCtxtSURes, + criticality := ignore, + value_ := { E_RABSetupItemCtxtSURes := it } + } +} + template (value) S1AP_PDU ts_S1AP_InitialCtxSetupResp(template (value) MME_UE_S1AP_ID mme_id, template (value) ENB_UE_S1AP_ID enb_id, - template (value) E_RABSetupListCtxtSURes rab_setup_items, - template (value) E_RABList rab_items) := { + template (value) E_RABSetupListCtxtSURes rab_setup_items + /*OPTIONAL: template (value) E_RABList rab_items */ + ) := { successfulOutcome := { procedureCode := id_InitialContextSetup, criticality := reject, @@ -598,14 +617,15 @@ criticality := reject, value_ := {ENB_UE_S1AP_ID := enb_id} }, { - id := S1AP_Constants.id_E_RABSetupListBearerSURes, + id := S1AP_Constants.id_E_RABSetupListCtxtSURes, criticality := ignore, value_ := {E_RABSetupListCtxtSURes := rab_setup_items} - }, { + } + /*, { id := S1AP_Constants.id_E_RABFailedToSetupListBearerSURes, criticality := ignore, value_ := {E_RABList := rab_items} - } + }*/ } } } diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index ce30279..eca6b04 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -13,6 +13,7 @@ import from General_Types all; import from Native_Functions all; import from IPL4asp_Types all; +import from Misc_Helpers all; import from S1AP_Types all; import from S1AP_Templates all; import from S1AP_Emulation all; @@ -63,9 +64,34 @@ SupportedTAs supported_tas } +type record BearerConfig { + /* EPS Bearer ID */ + uint4_t ebi optional, + /* TEI (Data) local side, S11 (SGW) */ + OCT4 s11_teid_local optional, + /* TEI (Data) remote side, S11 (SGW) */ + OCT4 s11_teid_remote optional, + /* TEI (Data) local side, S5c (PGW) */ + OCT4 s5c_teid_local optional, + /* TEI (Data) remote side, S5c (PGW) */ + OCT4 s5c_teid_remote optional +}; + /* parameters of emulated UE */ type record UeParams { - hexstring imsi + hexstring imsi, + charstring ue_ip, + + /* TEI (Control) local side, S11 (SGW) */ + OCT4 s11_teic_local, + /* TEI (Control) remote side, S11 (SGW) */ + OCT4 s11_teic_remote optional, + /* TEI (Control) local side, S5c (PGW) */ + OCT4 s5c_teic_local, + /* TEI (Control) remote side, S5c (PGW) */ + OCT4 s5c_teic_remote optional, + + BearerConfig bearer optional } type component MTC_CT { @@ -168,6 +194,9 @@ integer mp_s11_local_port := 2123; charstring mp_s11_remote_ip := "127.0.0.2"; integer mp_s11_remote_port := 2123; + + /* PGW information announced by SGWC. MME never really interacts with these. */ + charstring mp_s5c_pgw_ip := "1.2.3.4"; } /* send incoming unit data messages (like reset) to global SGsAP_UNIT port */ @@ -246,7 +275,19 @@ } friend function f_init_one_ue(inout UeParams uep, integer imsi_suffix) { uep := { - imsi := f_gen_imsi(imsi_suffix) + imsi := f_gen_imsi(imsi_suffix), + ue_ip := "192.168.123.50", + s11_teic_local := '00000000'O, + s11_teic_remote := omit, + s5c_teic_local := '00000000'O, + s5c_teic_remote := omit, + bearer := { + ebi := omit, + s11_teid_local := omit, + s11_teid_remote := omit, + s5c_teid_local := omit, + s5c_teid_remote := omit + } } } friend function f_init_s1ap(charstring id, integer imsi_suffix) runs on MTC_CT { @@ -561,6 +602,33 @@ } } + +private altstep as_s1ap_handle_IntialCtxSetupReq() runs on ConnHdlr { + var S1AP_PDU rx_msg; + var PDU_NAS_EPS rx_nas; + [] S1AP.receive(tr_S1AP_IntialCtxSetupReq) -> value rx_msg { + var template (omit) MME_UE_S1AP_ID mme_ue_id := f_S1AP_get_MME_UE_S1AP_ID(rx_msg); + var template (omit) ENB_UE_S1AP_ID enb_ue_id := f_S1AP_get_ENB_UE_S1AP_ID(rx_msg); + var template (value) E_RABSetupItemCtxtSURes rab_setup_it; + var template (value) E_RABSetupListCtxtSURes rab_setup_items; + var octetstring esm_enc; + var template (value) PDU_NAS_EPS nas; + + rab_setup_it := ts_S1AP_RABSetupItemCtxtSURes(rab_id := 5, + tla := oct2bit(f_inet_addr(mp_mme_ip)), + gtp_teid := '00000002'O); + rab_setup_items := ts_S1AP_RABSetupListCtxtSURes(rab_setup_it); + S1AP.send(ts_S1AP_InitialCtxSetupResp(valueof(mme_ue_id), valueof(enb_ue_id), rab_setup_items)); + + nas := ts_NAS_ActDefEpsBearCtxAck(int2bit(g_pars.ue_pars.bearer.ebi, 4), '00000000'B, omit); + esm_enc := enc_PDU_NAS_EPS(valueof(nas)); + S1AP.send(ts_NAS_AttachComplete(esm_enc)); + } + [] S1AP.receive(PDU_NAS_EPS:?) -> value rx_nas { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Rx Unexpected NAS PDU msg: ", rx_nas)); + } +} + /* Exepect AuthInfoReq (AIR) from HSS; respond with AuthInforAnswer (AIA) */ private altstep as_DIA_AuthInfo() runs on ConnHdlr { var PDU_DIAMETER rx_dia; @@ -616,18 +684,95 @@ } } -private function f_TC_attach(ConnHdlrPars pars) runs on ConnHdlr { +private altstep as_GTP2C_CreateSession_success() runs on ConnHdlr { + var PDU_GTPCv2 rx_msg; + var BearerContextIEs rx_bctx_ies; + var template (value) FullyQualifiedTEID s11_fteid_c_ie, s11_fteid_u_ie, s5c_fteid_c_ie, s5c_fteid_u_ie; + var template (value) PDN_AddressAllocation paa; + var template (value) BearerContextIEs bctx_ies; - f_init_handler(pars); - var template (value) EPS_MobileIdentityV mi := ts_NAS_MobileId_IMSI(pars.ue_pars.imsi); + [] GTP2.receive(tr_GTP2C_CreateSessionReq(g_pars.ue_pars.imsi)) -> value rx_msg { + /* Parse TEIC and Bearer EBI and TEID and store it in g_pars */ + g_pars.ue_pars.s11_teic_remote := rx_msg.gtpcv2_pdu.createSessionRequest.fullyQualifiedTEID[0].tEID_GRE_Key; + g_pars.ue_pars.s5c_teic_remote := rx_msg.gtpcv2_pdu.createSessionRequest.fullyQualifiedTEID[1].tEID_GRE_Key; + + rx_bctx_ies := rx_msg.gtpcv2_pdu.createSessionRequest.bearerContextGrouped[0].bearerContextIEs; + g_pars.ue_pars.bearer.ebi := rx_bctx_ies.ePS_Bearer_ID.ePS_Bearer_ID_Value; + + /* allocate + register TEID-C on local side */ + g_pars.ue_pars.s11_teic_local := f_gtp2_allocate_teid(); + g_pars.ue_pars.bearer.s11_teid_local := g_pars.ue_pars.s11_teic_local; + g_pars.ue_pars.s5c_teic_local := f_gtp2_allocate_teid(); + g_pars.ue_pars.bearer.s5c_teid_local := g_pars.ue_pars.s5c_teic_local; + + s11_fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S11_MME_GTPC, g_pars.ue_pars.s11_teic_local, 0, + f_inet_addr(mp_s11_local_ip), omit); + s5c_fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_PGW_GTPC, g_pars.ue_pars.s5c_teic_local, 1, + f_inet_addr(mp_s5c_pgw_ip), omit); + s11_fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S1U_SGW_GTPU, g_pars.ue_pars.bearer.s11_teid_local, 0, + f_inet_addr(mp_s11_local_ip), omit); + s5c_fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_PGW_GTPU, g_pars.ue_pars.bearer.s5c_teid_local, 2, + f_inet_addr(mp_s5c_pgw_ip), omit); + paa := ts_GTP2C_PdnAddrAlloc_v4(f_inet_addr(g_pars.ue_pars.ue_ip)); + bctx_ies := ts_GTP2C_BcContextIE(ebi := g_pars.ue_pars.bearer.ebi, + teid_list := { s11_fteid_u_ie, s5c_fteid_u_ie }, + qos := ts_GTP2C_BearerQos('09'O, 0, 0, 0, 0), + charging_id := ts_GTP2C_ChargingID(g_pars.ue_pars.bearer.s11_teid_local)); + + GTP2.send(ts_GTP2C_CreateSessionResp(g_pars.ue_pars.s11_teic_remote, + rx_msg.sequenceNumber, + { s11_fteid_c_ie, s5c_fteid_c_ie }, + paa, { ts_GTP2C_BcGrouped(bctx_ies) } )); + setverdict(pass); + } + [] GTP2.receive { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unexpected GTPv2/S11 message from MME")); + } +} + +private altstep as_GTP2C_ModifyBearer_success() runs on ConnHdlr { + var PDU_GTPCv2 rx_msg; + var BearerContextIEs rx_bctx_ies; + var template (value) FullyQualifiedTEID s11_fteid_c_ie, s11_fteid_u_ie, s5c_fteid_c_ie, s5c_fteid_u_ie; + var template (value) BearerContextIEs bctx_ies; + + [] GTP2.receive(tr_GTP2C_ModifyBearerReq(g_pars.ue_pars.s11_teic_local)) -> value rx_msg { + + rx_bctx_ies := rx_msg.gtpcv2_pdu.modifyBearerRequest.bearerContextGrouped[0].bearerContextIEs; + + /* TODO: validate the S1-U fullyQualifiedTEID announces the IP address provided by the ENB in InitialCtxSetupResp */ + // rx_bctx_ies.fullyQualifiedTEID[0]. == f_inet_addr(mp_mme_ip) + + /* Update S11 TEID */ + g_pars.ue_pars.bearer.s11_teid_remote := rx_bctx_ies.fullyQualifiedTEID[0].tEID_GRE_Key; + + s11_fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S1U_SGW_GTPU, g_pars.ue_pars.bearer.s11_teid_local, 0, + f_inet_addr(mp_s11_local_ip), omit); + bctx_ies := ts_GTP2C_BcContextIE(ebi := g_pars.ue_pars.bearer.ebi, + teid_list := { s11_fteid_u_ie }, + qos := ts_GTP2C_BearerQos('09'O, 0, 0, 0, 0), + charging_id := ts_GTP2C_ChargingID(g_pars.ue_pars.bearer.s11_teid_local)); + + GTP2.send(ts_GTP2C_ModifyBearerResp(g_pars.ue_pars.s11_teic_remote, + rx_msg.sequenceNumber, + Request_accepted, + g_pars.ue_pars.bearer.ebi, + { ts_GTP2C_BcGrouped(bctx_ies) } )); + setverdict(pass); + } + [] GTP2.receive { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unexpected GTPv2/S11 message from MME")); + } +} + + +private function f_attach() runs on ConnHdlr { + var template (value) EPS_MobileIdentityV mi := ts_NAS_MobileId_IMSI(g_pars.ue_pars.imsi); var template (value) PDU_NAS_EPS nas_esm, nas_emm; timer T := 5.0; -/* - nas_esm := ts_NAS_ActDefEpsBearCtxReq(bearer_id := '0000'B, proc_tid := int2bit(1,8), - qos := c_NAS_defaultQoS, apn := c_NAS_defaultAPN, - addr_type := '000'B, addr_info := ''O); -*/ nas_esm := ts_NAS_PdnConnReq(bearer_id := '0000'B, proc_tid := int2bit(1,8), pdn_type := NAS_PDN_T_IPv4, req_type := '001'B); nas_emm := ts_NAS_AttachRequest(att_type := '000'B, kset_id := '000'B, mobile_id := mi, @@ -652,23 +797,31 @@ } /* We now expect the MME to send a Create Session Request to the SGW-C */ - /* TODO: be more restrictive, fix and use tr_GTP2C_CreateSessionReq */ f_gtp2_register_udmsg('20'O); T.start; alt { - [] GTP2.receive(tr_PDU_GTP2C) { - setverdict(pass); - } - [] GTP2.receive { - setverdict(fail, "unexpected GTPv2/S11 message from MME"); - } - [] T.timeout { - setverdict(fail, "no message from MME"); - } + [] as_GTP2C_CreateSession_success(); + [] T.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("No message from MME")); } } - /* TODO: Finish this procedure until Attach Complete */ + T.start; + alt { + [] as_s1ap_handle_IntialCtxSetupReq(); + [] T.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("No message from MME")); } + } + /* We now expect the MME to send a Modify Bearer Request to the SGW-C */ + f_gtp2_register_udmsg('22'O); + T.start; + alt { + [] as_GTP2C_ModifyBearer_success(); + [] T.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("No message from MME")); } + } +} + +private function f_TC_attach(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); + f_attach(); } testcase TC_s1ap_attach() runs on MTC_CT { var charstring id := testcasename(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35367?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: Ib4a69aef40bf9dd17d640f650e459668f8415aaa Gerrit-Change-Number: 35367 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2023