- gerrit-log - lists.osmocom.org

[XS] Change in libosmocore[master]: osmo_io: Keep msgb ownership internal during segmentation until read_cb

by pespin

Attention is currently required from: daniel, fixeria, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/40369?usp=email ) Change subject: osmo_io: Keep msgb ownership internal during segmentation until read_cb ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40369?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4f41153948b7f1568c7499db53b9620bf2dd9ac4 Gerrit-Change-Number: 40369 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Jun 2025 10:29:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 3 days

1
0
0 0

[XS] Change in libosmocore[master]: osmo_io: Keep msgb ownership internal during segmentation until read_cb

by jolly

Attention is currently required from: daniel, fixeria, laforge, pespin. jolly has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/40369?usp=email ) Change subject: osmo_io: Keep msgb ownership internal during segmentation until read_cb ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40369?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4f41153948b7f1568c7499db53b9620bf2dd9ac4 Gerrit-Change-Number: 40369 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Jun 2025 10:27:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 3 days

1
0
0 0

[XS] Change in libosmocore[master]: osmo_io: Keep msgb ownership internal during segmentation until read_cb

by pespin

Attention is currently required from: daniel, fixeria, jolly, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/40369?usp=email ) Change subject: osmo_io: Keep msgb ownership internal during segmentation until read_cb ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: ping -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40369?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4f41153948b7f1568c7499db53b9620bf2dd9ac4 Gerrit-Change-Number: 40369 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Jun 2025 10:09:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

3 weeks, 3 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Initial NAS transmitting support

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40412?usp=email ) Change subject: 5gc: Initial NAS transmitting support ...................................................................... 5gc: Initial NAS transmitting support With this patch it is already possible to transmit the NAS Auth Response in the test ConnHdlr. We still lack generating a proper RES to have the response properly accepted. Change-Id: I951e98217b0150eed58fabb8e50a4782c1a3b510 --- M 5gc/C5G_Tests.ttcn M library/NGAP_Emulation.ttcn M library/NGAP_Functions.ttcn M library/NG_NAS_Osmo_Templates.ttcn 4 files changed, 98 insertions(+), 48 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index 320d61f..9b45298 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -275,6 +275,12 @@ var template (present) NAS_KeySetIdentifier kset_id := f_tr_ConnHdlr_kset_id(); [] NGAP.receive(cr_NG_AUTHENTICATION_REQUEST) -> value rx_nas { log("Rx NAS message: ", rx_nas); + + g_pars.kset_id := rx_nas.authentication_Request.ngNasKeySetId; + + /* TODO: generate proper RES, 3GPP TS 33.501 A.4 */ + const OCT8 res := '6a91970e838fd079'O; + NGAP.send(cs_NG_AUTHENTICATION_RESPONSE(cs_AuthenticationResponseParameter(oct2bit(res)))); } } @@ -284,14 +290,12 @@ var template (value) NG_NAS_UL_Message_Type nas_ul_msg; var NAS_PDU nas_pdu; - p_ueLocInf := m_uPTransportLayerInformation_userLocationInformationNR( m_userLocationInformationNR( g_pars.ngran_pars[g_pars.c5g_idx].cell_identity.nR_CGI, ts_ngran_NGAP_TAI(g_pars.ngran_pars[g_pars.c5g_idx]) )); - nas_ul_msg := cs_NG_REGISTRATION_REQUEST(cs_RegistrationType(tsc_NG_RegistrationInitial, '1'B), g_pars.kset_id.nasKeySetId, g_pars.kset_id.tsc, @@ -299,17 +303,26 @@ f_SUCI_IMSI()), p_UESecurityCap := cs_NG_UE_SecurityCapability); nas_pdu := enc_NG_NAS_UL_Message_Type(valueof(nas_ul_msg)); - - tx_pdu := m_ngap_initMsg(m_n2_initialUeMessage(g_pars.c5g_idx, nas_pdu, /* Registration request */ p_ueLocInf, mo_Signalling)); - NGAP.send(tx_pdu); + + /* Expect updated KSI from network following 5G Core standards + *(open5gs.git 70310979c58fe186e9eaa06bec9d9a31f24ff7a1): */ + if (g_pars.kset_id.nasKeySetId != tsc_NasKsi_NoKey) { + if (g_pars.kset_id.nasKeySetId == '110'B) { + g_pars.kset_id.nasKeySetId := '000'B; + } else { + g_pars.kset_id.nasKeySetId := int2bit(bit2int(g_pars.kset_id.nasKeySetId) + 1, 3); + } + } + as_ngap_handle_auth(); /* TODO: handle Auth, SecurityModeCommand, InitialContextSetup, PDUSessionresource, */ + f_sleep(5.0); } /* NG Setup procedure to 5GC using a Global gNB ID containing unknown/foreign PLMN. diff --git a/library/NGAP_Emulation.ttcn b/library/NGAP_Emulation.ttcn index 46f1d63..12487ae 100644 --- a/library/NGAP_Emulation.ttcn +++ b/library/NGAP_Emulation.ttcn @@ -144,9 +144,8 @@ type record AssociationData { NGAP_ConnHdlr comp_ref, /* component handling this UE connection */ uint32_t ran_ue_ngap_id optional, /* eNB side NGAP ID */ - uint40_t amf_ue_ngap_id optional//, /* AMF side NGAP ID */ - //EUTRAN_CGI cgi optional, - //TAI tai optional, + uint40_t amf_ue_ngap_id optional, /* AMF side NGAP ID */ + UserLocationInformation uli optional //NAS_UE_State nus }; @@ -329,8 +328,7 @@ for (var integer i := 0; i < sizeof(NGapAssociationTable); i := i+1) { NGapAssociationTable[i].amf_ue_ngap_id := omit; NGapAssociationTable[i].ran_ue_ngap_id := omit; - //NGapAssociationTable[i].cgi := omit; - //NGapAssociationTable[i].tai := omit; + NGapAssociationTable[i].uli := omit; //NGapAssociationTable[i].nus := valueof(t_NAS_UE_State(g_pars.role)); NGapAssociationTable[i].comp_ref := null; } @@ -356,26 +354,27 @@ } function handle_NGAP_UeContextReleaseCmd(template (present) NGAP_PDU rel_cmd) runs on NGAP_Emulation_CT { -// if (ispresent(rel_cmd.initiatingMessage.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair)) { -// var template AMF_UE_NGAP_ID amf_ue_id; -// var template RAN_UE_NGAP_ID ran_ue_id; -// var integer assoc_id; -// var NGAP_ConnHdlr vc_conn -// -// amf_ue_id := rel_cmd.initiatingMessage.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.mME_UE_NGAP_ID; -// ran_ue_id := rel_cmd.initiatingMessage.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.eNB_UE_NGAP_ID; -// -// assoc_id := f_assoc_id_by_ngap_ids(amf_ue_id, ran_ue_id); -// vc_conn := NGapAssociationTable[assoc_id].comp_ref; -// -// f_ngap_id_table_del(vc_conn, valueof(ran_ue_id)); -// } else { -// /* TODO: The UE CONTEXT RELEASE COMMAND (see also: 3GPP TS 36.413, section 9.1.4.6), may identify the -// * context by either an uE_NGAP_ID_pair (AMF_UE_NGAP_ID and RAN_UE_NGAP_ID) or an AMF_UE_NGAP_ID alone. -// * The latter case is not implemented here yet. */ -// setverdict(fail, "complete implementation of UeContextReleaseCmd handling"); -// mtc.stop; -// } + if (ispresent(rel_cmd.initiatingMessage.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair)) { + var UE_NGAP_ID_pair ids := valueof(rel_cmd.initiatingMessage.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair); + var template AMF_UE_NGAP_ID amf_ue_id; + var template RAN_UE_NGAP_ID ran_ue_id; + var integer assoc_id; + var NGAP_ConnHdlr vc_conn + + amf_ue_id := ids.aMF_UE_NGAP_ID; + ran_ue_id := ids.rAN_UE_NGAP_ID; + + assoc_id := f_assoc_id_by_ngap_ids(amf_ue_id, ran_ue_id); + vc_conn := NGapAssociationTable[assoc_id].comp_ref; + + f_ngap_id_table_del(vc_conn, valueof(ran_ue_id)); + } else { + /* TODO: The UE CONTEXT RELEASE COMMAND (see also: 3GPP TS 36.413, section 9.1.4.6), may identify the + * context by either an uE_NGAP_ID_pair (AMF_UE_NGAP_ID and RAN_UE_NGAP_ID) or an AMF_UE_NGAP_ID alone. + * The latter case is not implemented here yet. */ + setverdict(fail, "complete implementation of UeContextReleaseCmd handling"); + mtc.stop; + } } private function SendToNGapExpectTableProc(NGAP_PDU msg) runs on NGAP_Emulation_CT { @@ -446,7 +445,7 @@ while (true) { var NGAP_ConnHdlr vc_conn; - //var PDU_NAS_EPS nas; + var NG_NAS_UL_Message_Type ul_nas_msg; var AMF_UE_NGAP_ID amf_id; var RAN_UE_NGAP_ID ran_id; var integer procedureCode; @@ -461,12 +460,24 @@ [] NGAP_CLIENT.receive(mw_ngap_initMsg(mw_n2_initialUeMessage)) -> value msg sender vc_conn { /* create a table entry about this connection */ ai := f_ngap_id_table_add(vc_conn, omit, valueof(f_NGAP_get_RAN_UE_NGAP_ID(msg))); - /* Store CGI + TAI so we can use it for generating UlNasTransport from NAS */ -// NGapAssociationTable[ai].tai := msg.initiatingMessage.value_.InitialUEMessage.protocolIEs[2].value_.TAI; -// NGapAssociationTable[ai].cgi := msg.initiatingMessage.value_.InitialUEMessage.protocolIEs[3].value_.EUTRAN_CGI; + /* Store ULI so we can use it for generating UlNasTransport from NAS */ + NGapAssociationTable[ai].uli := msg.initiatingMessage.value_.InitialUEMessage.protocolIEs[2].value_.userLocationInformation; // /* Pass message through */ NGAP.send(t_NGAP_Send(g_ngap_conn_id, msg)); } + /* NAS from client: Wrap in NGAP Uplink NAS Transport */ + [] NGAP_CLIENT.receive(NG_NAS_UL_Message_Type:?) -> value ul_nas_msg sender vc_conn { + var integer assoc_id := f_assoc_id_by_comp(vc_conn); + var AssociationData ad := NGapAssociationTable[assoc_id]; + //ul_nas_msg := f_nas_encaps(NGapAssociationTable[assoc_id].nus, ul_nas_msg); + var NAS_PDU nas_enc := enc_NG_NAS_UL_Message_Type(ul_nas_msg); + NGAP.send(t_NGAP_Send(g_ngap_conn_id, + m_ngap_initMsg( + m_n2_UplinkNASTransport(ad.amf_ue_ngap_id, + ad.ran_ue_ngap_id, + nas_enc, + ad.uli)))); + } /* NGAP from client: pass on transparently */ [] NGAP_CLIENT.receive(NGAP_PDU:?) -> value msg sender vc_conn { /* Pass message through */ diff --git a/library/NGAP_Functions.ttcn b/library/NGAP_Functions.ttcn index 1323ab9..70d8941 100644 --- a/library/NGAP_Functions.ttcn +++ b/library/NGAP_Functions.ttcn @@ -25,10 +25,8 @@ case (mw_n2_DownlinkNASTransport) { return im.value_.downlinkNASTransport.protocolIEs[0].value_.aMF_UE_NGAP_ID; } - case (?) { - return omit; - /* TODO */ - /* return im.value_.InitialUEMessage.protocolIEs[0].value_.AMF_UE_NGAP_ID; */ + case (mw_n2_UEContextReleaseCommand) { + return im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.aMF_UE_NGAP_ID; } /* TODO */ } @@ -67,6 +65,9 @@ case (mw_n2_DownlinkNASTransport) { return im.value_.downlinkNASTransport.protocolIEs[1].value_.RAN_UE_NGAP_ID; } + case (mw_n2_UEContextReleaseCommand) { + return im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.rAN_UE_NGAP_ID; + } /* TODO */ } } else if (ischosen(ngap.successfulOutcome)) { diff --git a/library/NG_NAS_Osmo_Templates.ttcn b/library/NG_NAS_Osmo_Templates.ttcn index a22c542..1108947 100644 --- a/library/NG_NAS_Osmo_Templates.ttcn +++ b/library/NG_NAS_Osmo_Templates.ttcn @@ -31,10 +31,11 @@ } return len; } -template (value) NG_UE_SecurityCapability cs_NG_UE_SecurityCapability(template (value) O1_Type ngeaCap := 'f0'O, - template (value) O1_Type ngiaCap := '70'O, - template (omit) O1_Type eeaCap := omit, - template (omit) O1_Type eiaCap := omit) := +template (value) NG_UE_SecurityCapability +cs_NG_UE_SecurityCapability(template (value) O1_Type ngeaCap := 'f0'O, + template (value) O1_Type ngiaCap := '70'O, + template (omit) O1_Type eeaCap := omit, + template (omit) O1_Type eiaCap := omit) := { iei := '2E'O, iel := int2oct(f_cs_NG_UE_SecurityCapability_length(eeaCap, eiaCap), 1), @@ -45,14 +46,23 @@ spare := omit }; +template (value) AuthenticationResponseParameter +cs_AuthenticationResponseParameter(template (value) B32_128_Type p_ExpectedRES) := +{ + iei := '2D'O, + iel := int2oct(lengthof(bit2oct(valueof(p_ExpectedRES))), 1), + res := p_ExpectedRES +} + /* 24.501 cl. 8.2.1 */ -template (present) NG_NAS_DL_Message_Type cr_NG_AUTHENTICATION_REQUEST(template (present) NAS_KsiValue p_KeySetId := ?, - template (present) ABBA p_ABBA := ?, - template RAND p_RAND := *, - template AUTN p_AUTN := *, - template EAP_Message p_EAP := * - ) := +template (present) NG_NAS_DL_Message_Type +cr_NG_AUTHENTICATION_REQUEST(template (present) NAS_KsiValue p_KeySetId := ?, + template (present) ABBA p_ABBA := ?, + template RAND p_RAND := *, + template AUTN p_AUTN := *, + template EAP_Message p_EAP := * + ) := { /* 24.501 cl. 8.2.1 */ authentication_Request := { protocolDiscriminator := tsc_EPD_GMM, /* cl. 9.2 M V 1 */ @@ -68,4 +78,19 @@ } } +/* 24.501 cl. 8.2.2 */ +template (value) NG_NAS_UL_Message_Type +cs_NG_AUTHENTICATION_RESPONSE(template (value) AuthenticationResponseParameter p_Res, + template (omit) EAP_Message p_EAP := omit) := +{ + authentication_Response := { + protocolDiscriminator := tsc_EPD_GMM, /* cl. 9.2 M V 1 */ + spareHalfOctet := tsc_SpareHalfOctet, /* cl. 9.3 M V 1/2 */ + securityHeaderType := tsc_SHT_NoSecurityProtection, + messageType := tsc_MT_NG_AuthenticationResponse, /* cl. 9.7 M V 1 */ + authResponseParam := p_Res, /* cl. 9.11.3.17 O TLV 18 IEI=2D */ + eapMessage := p_EAP /* cl. 9.11.2.2 O TLV-E 7-1503 IEI=78 */ +} +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40412?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I951e98217b0150eed58fabb8e50a4782c1a3b510 Gerrit-Change-Number: 40412 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: podman: Install newer libcurl from bookworm-backports

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40411?usp=email ) Change subject: testenv: podman: Install newer libcurl from bookworm-backports ...................................................................... testenv: podman: Install newer libcurl from bookworm-backports It was already spotted a few days ago that libcurl4 7.88.1-10+deb12u12, currently being shipped by debian12, contains some sort of bug where it doesn't properly format/read HTTP2 requests when used in open5gs. It was found out that installing a newer version of libcurl4 fixes the problem. This patch also fixes the problems spotted in the 5gc testsuite when running within podman (they didn't show up outside podman because I'm using Archlinux and hence using newer libcurl 8.13.0 too). Change-Id: I799eeac73c49b9596502ad98acaa11dba3b88e97 --- M _testenv/data/podman/Dockerfile 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index 097fdc4..dca8a75 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -93,6 +93,25 @@ && \ apt-get clean +# Install newer libcurl4 from bookworm-backports, libcurl4 7.88.1-10+deb12u12 +# shipped with debian12 is buggy and generates wrong HTTP2 for open5gs. +ENV BACKPORTS_SOURCES_LIST="/etc/apt/sources.list.d/debian-backports.sources" +RUN set -x && \ + echo "Types: deb deb-src" >>"$BACKPORTS_SOURCES_LIST" && \ + echo "URIs: http://deb.debian.org/debian" >>"$BACKPORTS_SOURCES_LIST" && \ + echo "Suites: stable-backports" >>"$BACKPORTS_SOURCES_LIST" && \ + echo "Components: main" >>"$BACKPORTS_SOURCES_LIST" && \ + echo "Enabled: yes" >>"$BACKPORTS_SOURCES_LIST" && \ + echo "Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg" >>"$BACKPORTS_SOURCES_LIST" && \ + apt-get update && \ + apt-get -t bookworm-backports install \ + -y \ + --no-install-recommends \ + -o Dpkg::Options::="--force-confold" \ + libcurl4 \ + && \ + apt-get clean + # Install rebar3 as described in https://rebar3.org/docs/getting-started/ # instead of using the Debian package, as the latter pulls in ~600 MB of GUI # dependencies that we don't need: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40411?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I799eeac73c49b9596502ad98acaa11dba3b88e97 Gerrit-Change-Number: 40411 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: 5gc: Initial NAS receiving support

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40408?usp=email ) Change subject: 5gc: Initial NAS receiving support ...................................................................... 5gc: Initial NAS receiving support With this patch it is already possible to receive the NAS Auth Request in the test ConnHdlr. nas.git dep needs updating to include a new patch fixing decoding of NG_AUTHENTICATION_REQUEST. Change-Id: I6697f30f95777fc9aed16a529a669d10f42c57be --- M 5gc/C5G_Tests.ttcn M 5gc/create_test_subscribers.sh M 5gc/gen_links.sh M deps/Makefile M library/NGAP_Emulation.ttcn M library/NGAP_Functions.ttcn A library/NG_NAS_Osmo_Templates.ttcn M library/Osmocom_Types.ttcn 8 files changed, 273 insertions(+), 96 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index 62553fc..320d61f 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -17,6 +17,7 @@ import from Misc_Helpers all; import from Osmocom_Types all; +import from GSM_Types all; import from NGAP_PDU_Descriptions all; import from NGAP_IEs all; @@ -29,10 +30,14 @@ import from NGAP_Functions all; import from NGAP_Emulation all; +import from NAS_CommonTypeDefs all; + import from NG_NAS_Common all; import from NG_NAS_MsgContainers all; import from NAS_CommonTemplates all; import from NG_NAS_Templates all; + +import from NG_NAS_Osmo_Templates all; import from NG_NAS_Functions all; /* (maximum) number of emulated eNBs */ @@ -48,7 +53,9 @@ integer mp_5gc_ngap_port := 38412; charstring mp_local_ngap_ip := "127.0.0.1"; integer mp_local_ngap_port := 50000; - PLMNIdentity mp_plmn_id := '99f907'O; + GsmMcc mp_mcc := '999'H; + GsmMnc mp_mnc := '70'H; + hexstring mp_imsi := '999700000000000'H; uint24_t mp_tac := 1; } @@ -86,9 +93,9 @@ /* copied over from MTC_CT on start of component */ UeParams ue_pars, /* currently used 5GC (index into ngran_pars, NGAP, ...) */ - integer c5g_idx//, + integer c5g_idx, /* Currently set KSI */ - //NAS_KeySetIdentifierV kset_id + NAS_KeySetIdentifier kset_id } /* send incoming unit data messages (like reset) to global NGAP_UNIT port */ @@ -108,17 +115,18 @@ remote_ip := mp_5gc_ngap_ip, remote_sctp_port := mp_5gc_ngap_port, local_ip := mp_local_ngap_ip, - local_sctp_port := mp_local_ngap_port + num //, - //role := NAS_ROLE_UE + local_sctp_port := mp_local_ngap_port + num, + role := NGAP_NAS_ROLE_UE }; + var PLMNIdentity plmn_id := f_enc_mcc_mnc(mp_mcc, mp_mnc); var NGRANParams ngran_pars := { - global_ngran_id := valueof(m_globalRANNodeID_globalGNB_ID(m_ie_globalGnbId(mp_plmn_id, int2bit(num, 22)))), - cell_identity := { nR_CGI := valueof(m_nR_CGI(mp_plmn_id, int2bit(num, 36))) }, + global_ngran_id := valueof(m_globalRANNodeID_globalGNB_ID(m_ie_globalGnbId(plmn_id, int2bit(num, 22)))), + cell_identity := { nR_CGI := valueof(m_nR_CGI(plmn_id, int2bit(num, 36))) }, supported_ta_list := { { tAC := int2oct(mp_tac, 3), broadcastPLMNList := { - valueof(m_ie_broadcastPLMNItem(mp_plmn_id, { m_sliceSupportItem(m_s_NSSAI('01'O)) })) + valueof(m_ie_broadcastPLMNItem(plmn_id, { m_sliceSupportItem(m_s_NSSAI('01'O)) })) }, iE_Extensions := omit } @@ -136,17 +144,17 @@ friend function f_init_one_ue(inout UeParams uep, integer imsi_suffix) { uep := { - imsi := f_gen_imsi(imsi_suffix), + imsi := f_concat_pad(lengthof(mp_imsi), substr(mp_imsi, 0, lengthof(mp_imsi) - 6), imsi_suffix), ue_ip := "192.168.123.50" } } -friend function f_init_ngap(integer imsi_suffix) runs on MTC_CT { +friend function f_init_ngap(integer imsi_suffix := 0) runs on MTC_CT { var integer i; for (i := 0; i < NUM_NGRAN; i := i+1) { f_init_one_ngran(i); } for (i := 0; i < NUM_UE; i := i+1) { - f_init_one_ue(g_ue_pars[i], i*1000 + imsi_suffix); + f_init_one_ue(g_ue_pars[i], 1000*imsi_suffix + i); } } @@ -156,8 +164,8 @@ var ConnHdlrPars pars := { ngran_pars := g_ngran_pars, ue_pars := g_ue_pars[ue_idx], - c5g_idx := 0//, - //kset_id := valueof(ts_NAS_KeySetIdentifierV('000'B, c_NAS_TSC_NATIVE_SEC_CTX)) + c5g_idx := 0, + kset_id := valueof(cs_NAS_KeySetIdentifier_lv(tsc_NasKsi_NoKey, '0'B)) }; return pars; } @@ -203,6 +211,14 @@ iE_Extensions := omit } +private function f_SUCI_IMSI() runs on ConnHdlr return octetstring { + var hexstring imsi := g_pars.ue_pars.imsi; + var GsmMcc mcc := substr(imsi, 0, 3); + var GsmMnc mnc := substr(imsi, 3, 2); + var octetstring imsi_suffix := imsi_hex2oct(substr(imsi, lengthof(imsi)-10, 10)); + return f_enc_mcc_mnc(mcc, mnc) & '21430001'O & imsi_suffix; +} + friend function f_ngap_setup(integer idx := 0, template (omit) NGAP_IEs.Cause cause := omit) runs on MTC_CT { var template (present) NGAP_IEs.Cause exp_cause := ?; var boolean exp_fail := false; @@ -243,6 +259,25 @@ } } +private function f_tr_ConnHdlr_kset_id() runs on ConnHdlr return template (present) NAS_KeySetIdentifier { + /* KSI not yet set, expect whatever assignment from network: */ + if (g_pars.kset_id.nasKeySetId == tsc_NasKsi_NoKey) { + return cr_NAS_KeySetIdentifier(?, ?); + } else { + /* Expect specific kset_id. Upon transmitting it UE->Network, f_attach() + * has updated it to the expected value. */ + return g_pars.kset_id; + } +} + +private altstep as_ngap_handle_auth() runs on ConnHdlr { + var NG_NAS_DL_Message_Type rx_nas; + var template (present) NAS_KeySetIdentifier kset_id := f_tr_ConnHdlr_kset_id(); + [] NGAP.receive(cr_NG_AUTHENTICATION_REQUEST) -> value rx_nas { + log("Rx NAS message: ", rx_nas); + } +} + private function f_register() runs on ConnHdlr { var template (value) UserLocationInformation p_ueLocInf; var template (value) NGAP_PDU tx_pdu; @@ -258,10 +293,11 @@ )); nas_ul_msg := cs_NG_REGISTRATION_REQUEST(cs_RegistrationType(tsc_NG_RegistrationInitial, '1'B), - tsc_NasKsi_NoKey, - '0'B, + g_pars.kset_id.nasKeySetId, + g_pars.kset_id.tsc, cs_NG_MobileIdentitySUCI('0000'B /* Type IMSI */, - '00f110214300014444330302'O)); + f_SUCI_IMSI()), + p_UESecurityCap := cs_NG_UE_SecurityCapability); nas_pdu := enc_NG_NAS_UL_Message_Type(valueof(nas_ul_msg)); @@ -271,7 +307,7 @@ mo_Signalling)); NGAP.send(tx_pdu); - f_sleep(5.0); + as_ngap_handle_auth(); /* TODO: handle Auth, SecurityModeCommand, InitialContextSetup, PDUSessionresource, */ } @@ -279,21 +315,21 @@ /* NG Setup procedure to 5GC using a Global gNB ID containing unknown/foreign PLMN. * Related: https://github.com/open5gs/open5gs/issues/3544 */ testcase TC_ng_setup_unknown_global_gnb_id_plmn() runs on MTC_CT { - f_init_ngap(1); + f_init_ngap(); g_ngran_pars[0].global_ngran_id.globalGNB_ID.pLMNIdentity := '62F224'O; f_ngap_setup(0); } /* Unsuccessful NG Setup procedure to AMF (wrong PLMN) */ testcase TC_ng_setup_wrong_tac() runs on MTC_CT { - f_init_ngap(2); + f_init_ngap(); g_ngran_pars[0].supported_ta_list[0].broadcastPLMNList[0].pLMNIdentity := '62F224'O; f_ngap_setup(0, {misc:=unknown_PLMN_or_SNPN}); } /* NG Setup procedure to 5GC using a correct Global gNB ID. */ testcase TC_ng_setup() runs on MTC_CT { - f_init_ngap(3); + f_init_ngap(); f_ngap_setup(0); } @@ -302,7 +338,7 @@ f_register(); } testcase TC_ng_register() runs on MTC_CT { - f_init_ngap(4); + f_init_ngap(); f_ngap_setup(0); var ConnHdlrPars pars := f_init_pars(ue_idx := 0); diff --git a/5gc/create_test_subscribers.sh b/5gc/create_test_subscribers.sh index f5b6c5b..a400e0f 100755 --- a/5gc/create_test_subscribers.sh +++ b/5gc/create_test_subscribers.sh @@ -18,10 +18,10 @@ done # Create a test subscriber with IMSI=001010000000000 -$DBCTL_CMD add 001010000000000 3c6e0b8a9c15224a8228b9a98ca1531d 762a2206fe0b4151ace403c86a11e479 +$DBCTL_CMD add 999700000000000 3c6e0b8a9c15224a8228b9a98ca1531d 762a2206fe0b4151ace403c86a11e479 # Mark test subscriber with IMSI=001010000000001 as: # Subscriber-Status=OPERATOR_DETERMINED_BARRING (1) # Operator-Determined-Barring="Barring of all outgoing inter-zonal calls except those directed to the home PLMN country" (7) -$DBCTL_CMD add 001010000000001 3c6e0b8a9c15224a8228b9a98ca1531d 762a2206fe0b4151ace403c86a11e479 -$DBCTL_CMD subscriber_status 001010000000001 1 7 +$DBCTL_CMD add 999700000000001 3c6e0b8a9c15224a8228b9a98ca1531d 762a2206fe0b4151ace403c86a11e479 +$DBCTL_CMD subscriber_status 999700000000001 1 7 diff --git a/5gc/gen_links.sh b/5gc/gen_links.sh index 2cab445..295ca24 100755 --- a/5gc/gen_links.sh +++ b/5gc/gen_links.sh @@ -66,7 +66,7 @@ FILES+="SCTP_Templates.ttcn " FILES+="DNS_Helpers.ttcn " FILES+="NGAP_CodecPort.ttcn NGAP_CodecPort_CtrlFunctDef.cc NGAP_CodecPort_CtrlFunct.ttcn NGAP_Functions.ttcn NGAP_Emulation.ttcn " -FILES+="NG_NAS_Functions.ttcn " +FILES+="NG_NAS_Osmo_Templates.ttcn NG_NAS_Functions.ttcn " gen_links $DIR $FILES gen_links_finish diff --git a/deps/Makefile b/deps/Makefile index b4a411a..aa2b36c 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -85,7 +85,7 @@ # Do not put references to branches here, except for local testing: this breaks the caching # logic of docker containers, which only invalidate their cached ttcn3 dependencies if this # file changed. -nas_commit= 205e24167517500ba2d49322dfa1754ab8a0fc43 +nas_commit= 4371752494b7c85cd5a3bc32bc6f498171c7aa13 titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= b58f92046e48a7b1ed531e243a2319ebca53bf4c titan.ProtocolEmulations.SCCP_commit= 750a3e836831e58eae59d4757ef5d0c759f9ca5d diff --git a/library/NGAP_Emulation.ttcn b/library/NGAP_Emulation.ttcn index e885a4d..46f1d63 100644 --- a/library/NGAP_Emulation.ttcn +++ b/library/NGAP_Emulation.ttcn @@ -33,8 +33,16 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +import from General_Types all; +import from Osmocom_Types all; +import from IPL4asp_Types all; +import from DNS_Helpers all; + +import from SCTP_Templates all; + import from NGAP_CodecPort all; import from NGAP_CodecPort_CtrlFunct all; +import from NGAP_CommonDataTypes all; import from NGAP_Types all; import from NGAP_Constants all; import from NGAP_PDU_Contents all; @@ -42,13 +50,14 @@ import from NGAP_IEs all; import from NGAP_Templates all; import from NGAP_Functions all; -import from SCTP_Templates all; -import from General_Types all; -import from Osmocom_Types all; -import from IPL4asp_Types all; -import from DNS_Helpers all; +import from NG_NAS_MsgContainers all; +import from NG_NAS_Functions all; +type enumerated NGAP_NAS_Role { + NGAP_NAS_ROLE_UE, /* ATS implements/emulates UE */ + NGAP_NAS_ROLE_AMF /* ATS implements/emulates AMF */ +}; type component NGAP_ConnHdlr { port NGAP_Conn_PT NGAP; @@ -58,7 +67,7 @@ /* port between individual per-connection components and this dispatcher */ type port NGAP_Conn_PT message { - inout NGAP_PDU; + inout NGAP_PDU, NG_NAS_UL_Message_Type, NG_NAS_DL_Message_Type; } with { extension "internal" }; @@ -135,7 +144,7 @@ type record AssociationData { NGAP_ConnHdlr comp_ref, /* component handling this UE connection */ uint32_t ran_ue_ngap_id optional, /* eNB side NGAP ID */ - uint40_t amf_ue_ngap_id optional//, /* MME side NGAP ID */ + uint40_t amf_ue_ngap_id optional//, /* AMF side NGAP ID */ //EUTRAN_CGI cgi optional, //TAI tai optional, //NAS_UE_State nus @@ -182,8 +191,8 @@ HostName remote_ip, IPL4asp_Types.PortNumber remote_sctp_port, HostName local_ip, - IPL4asp_Types.PortNumber local_sctp_port//, - //NAS_Role role + IPL4asp_Types.PortNumber local_sctp_port, + NGAP_NAS_Role role } function tr_NGAP_RecvFrom_R(template NGAP_PDU msg) @@ -205,8 +214,8 @@ var integer i; log("f_ngap_ids_known(",amf_id,", ",ran_id,")"); for (i := 0; i < sizeof(NGapAssociationTable); i := i+1) { - log("tbl[",i,"]: mme=", NGapAssociationTable[i].amf_ue_ngap_id, - ", enb=", NGapAssociationTable[i].ran_ue_ngap_id); + log("tbl[",i,"]: amf=", NGapAssociationTable[i].amf_ue_ngap_id, + ", ran=", NGapAssociationTable[i].ran_ue_ngap_id); /* skip empty records */ if (NGapAssociationTable[i].amf_ue_ngap_id == omit and NGapAssociationTable[i].ran_ue_ngap_id == omit) { @@ -214,11 +223,11 @@ continue; } if (NGapAssociationTable[i].amf_ue_ngap_id == omit) { - log("entry ", i, " has no MME ID yet (enb=", NGapAssociationTable[i].ran_ue_ngap_id); - /* Table doesn't yet know the MME side ID, let's look-up only + log("entry ", i, " has no AMF ID yet (ran=", NGapAssociationTable[i].ran_ue_ngap_id); + /* Table doesn't yet know the AMF side ID, let's look-up only * based on the eNB side ID */ if (match(NGapAssociationTable[i].ran_ue_ngap_id, ran_id)) { - /* update table with MME side ID */ + /* update table with AMF side ID */ NGapAssociationTable[i].amf_ue_ngap_id := valueof(amf_id); return true; } @@ -256,7 +265,7 @@ } } } - setverdict(fail, "NGAP Association Table not found by ENB-ID=", ran_id, " MME-ID=", amf_id); + setverdict(fail, "NGAP Association Table not found by RAN-ID=", ran_id, " AMF-ID=", amf_id); mtc.stop; } @@ -346,20 +355,20 @@ return mrf.msg; } -//function handle_NGAP_UeContextReleaseCmd(template (present) NGAP_PDU rel_cmd) runs on NGAP_Emulation_CT { +function handle_NGAP_UeContextReleaseCmd(template (present) NGAP_PDU rel_cmd) runs on NGAP_Emulation_CT { // if (ispresent(rel_cmd.initiatingMessage.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair)) { -// var template AMF_UE_NGAP_ID mme_ue_id; -// var template RAN_UE_NGAP_ID enb_ue_id; +// var template AMF_UE_NGAP_ID amf_ue_id; +// var template RAN_UE_NGAP_ID ran_ue_id; // var integer assoc_id; // var NGAP_ConnHdlr vc_conn // -// mme_ue_id := rel_cmd.initiatingMessage.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.mME_UE_NGAP_ID; -// enb_ue_id := rel_cmd.initiatingMessage.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.eNB_UE_NGAP_ID; +// amf_ue_id := rel_cmd.initiatingMessage.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.mME_UE_NGAP_ID; +// ran_ue_id := rel_cmd.initiatingMessage.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.eNB_UE_NGAP_ID; // -// assoc_id := f_assoc_id_by_ngap_ids(mme_ue_id, enb_ue_id); +// assoc_id := f_assoc_id_by_ngap_ids(amf_ue_id, ran_ue_id); // vc_conn := NGapAssociationTable[assoc_id].comp_ref; // -// f_ngap_id_table_del(vc_conn, valueof(enb_ue_id)); +// f_ngap_id_table_del(vc_conn, valueof(ran_ue_id)); // } else { // /* TODO: The UE CONTEXT RELEASE COMMAND (see also: 3GPP TS 36.413, section 9.1.4.6), may identify the // * context by either an uE_NGAP_ID_pair (AMF_UE_NGAP_ID and RAN_UE_NGAP_ID) or an AMF_UE_NGAP_ID alone. @@ -367,7 +376,7 @@ // setverdict(fail, "complete implementation of UeContextReleaseCmd handling"); // mtc.stop; // } -//} +} private function SendToNGapExpectTableProc(NGAP_PDU msg) runs on NGAP_Emulation_CT { var integer procedureCode; @@ -395,6 +404,19 @@ return; } +template ProcedureCode tr_NGAP_ProcedureCode_non_UErelated := +(id_NGSetup, id_RANConfigurationUpdate, id_AMFStatusIndication, id_NGReset, id_ErrorIndication, id_OverloadStart, id_OverloadStop); +template (present) NGAP_PDU +tr_NGAP_nonUErelated := (mw_ngap_initMsg({procedureCode := tr_NGAP_ProcedureCode_non_UErelated, + criticality := ?, + value_ := ?}), + mw_ngap_succMsg({procedureCode := tr_NGAP_ProcedureCode_non_UErelated, + criticality := ?, + value_ := ?}), + mw_ngap_unsuccMsg({procedureCode := tr_NGAP_ProcedureCode_non_UErelated, + criticality := ?, + value_ := ?})); + function main(NGAPOps ops, NGAP_conn_parameters p, charstring id) runs on NGAP_Emulation_CT { var Result res; g_pars := p; @@ -430,7 +452,7 @@ var integer procedureCode; var NGAP_RecvFrom mrf; var NGAP_PDU msg; - var charstring vlr_name, mme_name; + var charstring vlr_name, amf_name; var integer ai; var octetstring kasme; @@ -458,54 +480,59 @@ NGAP.send(t_NGAP_Send(g_ngap_conn_id, msg)); } - /* NGAP received from peer (MME) */ + /* NGAP received from peer (AMF) */ [] NGAP.receive(tr_NGAP_RecvFrom_R(?)) -> value mrf { -// if (match(mrf.msg, tr_NGAP_nonUErelated)) { + if (match(mrf.msg, tr_NGAP_nonUErelated)) { /* non-UE-related NGAP message */ SendToNGapExpectTableProc(mrf.msg); var template NGAP_PDU resp := ops.unitdata_cb.apply(mrf.msg); if (isvalue(resp)) { NGAP.send(t_NGAP_Send(g_ngap_conn_id, valueof(resp))); } -// } else { -// /* Ue-related NGAP message */ -// /* obtain MME + ENB UE NGAP ID */ -// var template (omit) AMF_UE_NGAP_ID mme_ue_id := f_NGAP_get_AMF_UE_NGAP_ID(mrf.msg); -// var template (omit) RAN_UE_NGAP_ID enb_ue_id := f_NGAP_get_RAN_UE_NGAP_ID(mrf.msg); -// /* check if those IDs are known in our table */ -// if (f_ngap_ids_known(mme_ue_id, enb_ue_id)) { -// /* if yes, dispatch to the ConnHdlr for this Ue-Connection */ -// var template (omit) octetstring nas_enc; -// var integer assoc_id := f_assoc_id_by_ngap_ids(mme_ue_id, enb_ue_id); -// vc_conn := NGapAssociationTable[assoc_id].comp_ref; -// nas_enc := f_NGAP_get_NAS_PDU(mrf.msg); -// if (isvalue(nas_enc)) { -// nas := dec_PDU_NAS_EPS(valueof(nas_enc)); -// if (match(nas, tr_NAS_EMM_SecurityProtected)) { -// nas := f_nas_try_decaps(NGapAssociationTable[assoc_id].nus, nas); -// } -// /* DL/UlNasTransport are not interesting, don't send them */ -// if (not match(mrf.msg, (tr_NGAP_DlNasTransport, tr_NGAP_UlNasTransport))) { -// /* send raw NGAP */ -// NGAP_CLIENT.send(mrf.msg) to vc_conn; -// } -// /* send decoded NAS */ -// NGAP_CLIENT.send(nas) to vc_conn; -// } else { -// /* send raw NGAP */ -// NGAP_CLIENT.send(mrf.msg) to vc_conn; -// } -// } else { -// /* if not, call create_cb so it can create new ConnHdlr */ -// vc_conn := ops.create_cb.apply(mrf.msg, mme_ue_id, enb_ue_id, id); -// f_ngap_id_table_add(vc_conn, mme_ue_id, valueof(enb_ue_id)); -// NGAP_CLIENT.send(mrf.msg) to vc_conn; -// } -// if (match(mrf.msg, tr_NGAP_UeContextReleaseCmd)) { -// handle_NGAP_UeContextReleaseCmd(mrf.msg); -// } -// } + } else { + /* Ue-related NGAP message */ + /* obtain AMF + NGRAN UE NGAP ID */ + var template (omit) AMF_UE_NGAP_ID amf_ue_id := f_NGAP_get_AMF_UE_NGAP_ID(mrf.msg); + var template (omit) RAN_UE_NGAP_ID ran_ue_id := f_NGAP_get_RAN_UE_NGAP_ID(mrf.msg); + /* check if those IDs are known in our table */ + if (f_ngap_ids_known(amf_ue_id, ran_ue_id)) { + /* if yes, dispatch to the ConnHdlr for this Ue-Connection */ + var template (omit) octetstring nas_enc; + var integer assoc_id := f_assoc_id_by_ngap_ids(amf_ue_id, ran_ue_id); + vc_conn := NGapAssociationTable[assoc_id].comp_ref; + nas_enc := f_NGAP_get_NAS_PDU(mrf.msg); + if (isvalue(nas_enc)) { + if (g_pars.role == NGAP_NAS_ROLE_UE) { + var NG_NAS_DL_Message_Type dl_nas := dec_NG_NAS_DL_Message_Type(valueof(nas_enc)); +// if (match(dl_nas, tr_NAS_EMM_SecurityProtected)) { +// dl_nas := f_nas_try_decaps(NGapAssociationTable[assoc_id].nus, dl_nas); +// } + /* DL/UlNasTransport are not interesting, don't send them */ + if (not match(mrf.msg, mw_ngap_initMsg(mw_n2_DownlinkNASTransport))) { + /* send raw NGAP */ + NGAP_CLIENT.send(mrf.msg) to vc_conn; + } + /* send decoded NAS */ + NGAP_CLIENT.send(dl_nas) to vc_conn; + } else { + log("Incoming NAS HANDLING in AMF role not supported!"); + var NG_NAS_UL_Message_Type ul_nas := dec_NG_NAS_UL_Message_Type(valueof(nas_enc)); + } + } else { + /* send raw NGAP */ + NGAP_CLIENT.send(mrf.msg) to vc_conn; + } + } else { + /* if not, call create_cb so it can create new ConnHdlr */ + vc_conn := ops.create_cb.apply(mrf.msg, amf_ue_id, ran_ue_id, id); + f_ngap_id_table_add(vc_conn, amf_ue_id, valueof(ran_ue_id)); + NGAP_CLIENT.send(mrf.msg) to vc_conn; + } + if (match(mrf.msg, mw_ngap_initMsg(mw_n2_UEContextReleaseCommand))) { + handle_NGAP_UeContextReleaseCmd(mrf.msg); + } } + } [] NGAP.receive(tr_SctpAssocChange) { } [] NGAP.receive(tr_SctpPeerAddrChange) { } [] NGAP_PROC.getcall(NGAPEM_register:{?,?,?}) -> param(amf_id, ran_id, vc_conn) { diff --git a/library/NGAP_Functions.ttcn b/library/NGAP_Functions.ttcn index 7ab2f5a..1323ab9 100644 --- a/library/NGAP_Functions.ttcn +++ b/library/NGAP_Functions.ttcn @@ -21,7 +21,10 @@ { if (ischosen(ngap.initiatingMessage)) { var InitiatingMessage im := ngap.initiatingMessage; - select (ngap) { + select (im) { + case (mw_n2_DownlinkNASTransport) { + return im.value_.downlinkNASTransport.protocolIEs[0].value_.aMF_UE_NGAP_ID; + } case (?) { return omit; /* TODO */ @@ -31,7 +34,7 @@ } } else if (ischosen(ngap.successfulOutcome)) { var SuccessfulOutcome so := ngap.successfulOutcome; - select (ngap) { + select (so) { case (?) { return omit; /* TODO */ @@ -41,7 +44,7 @@ } } else if (ischosen(ngap.unsuccessfulOutcome)) { var UnsuccessfulOutcome uo := ngap.unsuccessfulOutcome; - select (ngap) { + select (uo) { case (?) { return omit; /* TODO */ @@ -61,11 +64,14 @@ case (mw_n2_initialUeMessage) { return im.value_.InitialUEMessage.protocolIEs[0].value_.RAN_UE_NGAP_ID; } + case (mw_n2_DownlinkNASTransport) { + return im.value_.downlinkNASTransport.protocolIEs[1].value_.RAN_UE_NGAP_ID; + } /* TODO */ } } else if (ischosen(ngap.successfulOutcome)) { var SuccessfulOutcome so := ngap.successfulOutcome; - select (ngap) { + select (so) { case (?) { return omit; /* TODO */ @@ -75,7 +81,7 @@ } } else if (ischosen(ngap.unsuccessfulOutcome)) { var UnsuccessfulOutcome uo := ngap.unsuccessfulOutcome; - select (ngap) { + select (uo) { case (?) { return omit; /* TODO */ @@ -87,4 +93,41 @@ return omit; } +function f_NGAP_get_NAS_PDU(NGAP_PDU ngap) return template (omit) NAS_PDU +{ + var integer i, j; + + if (ischosen(ngap.initiatingMessage)) { + var InitiatingMessage im := ngap.initiatingMessage; + select (im) { + case (mw_n2_DownlinkNASTransport) { + var DownlinkNASTransport msg := im.value_.DownlinkNASTransport; + for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { + if (msg.protocolIEs[i].id == id_NAS_PDU) { + return msg.protocolIEs[i].value_.NAS_PDU; + } + } + } + case (mw_n2_UplinkNASTransport) { + var UplinkNASTransport msg := im.value_.UplinkNASTransport; + for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { + if (msg.protocolIEs[i].id == id_NAS_PDU) { + return msg.protocolIEs[i].value_.NAS_PDU; + } + } + } + case (mw_n2_initialUeMessage) { + var InitialUEMessage msg := im.value_.InitialUEMessage; + for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { + if (msg.protocolIEs[i].id == id_NAS_PDU) { + return msg.protocolIEs[i].value_.NAS_PDU; + } + } + return omit; + } + } + } + return omit; +} + } diff --git a/library/NG_NAS_Osmo_Templates.ttcn b/library/NG_NAS_Osmo_Templates.ttcn new file mode 100644 index 0000000..a22c542 --- /dev/null +++ b/library/NG_NAS_Osmo_Templates.ttcn @@ -0,0 +1,71 @@ +/* Our own NG NAS templates on top of deps/nas/ttcn/Lib3GPP/NG_NAS/NG_NAS_Templates.ttcn. */ +module NG_NAS_Osmo_Templates { + +/* (C) 2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from CommonDefs all; +import from NAS_CommonTypeDefs all; +import from NAS_CommonTemplates all; +import from NG_NAS_Common all; +import from NG_NAS_TypeDefs all; +import from NG_NAS_Templates all; +import from NG_NAS_MsgContainers all; + +/* 24.501 cl. 9.11.3.54 */ +private function f_cs_NG_UE_SecurityCapability_length(template (omit) O1_Type eeaCap := omit, + template (omit) O1_Type eiaCap := omit) +return integer { + var integer len := 2; + if (isvalue(eeaCap)) { + len := len + 1; + } + if (isvalue(eiaCap)) { + len := len + 1; + } + return len; +} +template (value) NG_UE_SecurityCapability cs_NG_UE_SecurityCapability(template (value) O1_Type ngeaCap := 'f0'O, + template (value) O1_Type ngiaCap := '70'O, + template (omit) O1_Type eeaCap := omit, + template (omit) O1_Type eiaCap := omit) := +{ + iei := '2E'O, + iel := int2oct(f_cs_NG_UE_SecurityCapability_length(eeaCap, eiaCap), 1), + ngeaCap := ngeaCap, + ngiaCap := ngiaCap, + eeaCap := eeaCap, + eiaCap := eiaCap, + spare := omit +}; + + +/* 24.501 cl. 8.2.1 */ +template (present) NG_NAS_DL_Message_Type cr_NG_AUTHENTICATION_REQUEST(template (present) NAS_KsiValue p_KeySetId := ?, + template (present) ABBA p_ABBA := ?, + template RAND p_RAND := *, + template AUTN p_AUTN := *, + template EAP_Message p_EAP := * + ) := +{ /* 24.501 cl. 8.2.1 */ + authentication_Request := { + protocolDiscriminator := tsc_EPD_GMM, /* cl. 9.2 M V 1 */ + spareHalfOctet := tsc_SpareHalfOctet, /* cl. 9.3 M V 1/2 */ + securityHeaderType := tsc_SHT_NoSecurityProtection, + messageType := tsc_MT_NG_AuthenticationRequest, /* cl. 9.7 M V 1 */ + spareHalfOctet2 := tsc_SpareHalfOctet, /* cl. 9.5 M V 1/2 */ + ngNasKeySetId := cr_NAS_KeySetIdentifier(p_KeySetId, tsc_NasKsi_NativeSecurityContext), /* cl. 9.11.3.32 M V 1/2 */ + abba := p_ABBA, /* cl. 9.11.3.10 M LV 3-n */ + rand := p_RAND, /* cl. 9.11.3.16 O TV 17 IEI=21 */ + autn := p_AUTN, /* cl. 9.11.3.15 O TLV 18 IEI=20 */ + eapMessage := p_EAP /* cl. 9.11.2.2 O TLV-E 7-1503 IEI=78 */ + } +} + +} diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index 995342a..21d7abf 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -343,7 +343,7 @@ } -private function f_concat_pad(integer tot_len, hexstring prefix, integer suffix) return hexstring { +function f_concat_pad(integer tot_len, hexstring prefix, integer suffix) return hexstring { var integer suffix_len := tot_len - lengthof(prefix); var charstring suffix_ch := int2str(suffix); var integer pad_len := suffix_len - lengthof(suffix_ch); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40408?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6697f30f95777fc9aed16a529a669d10f42c57be Gerrit-Change-Number: 40408 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-Reviewer: pespin <pespin(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Fix upfd failing to start outside podman

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40405?usp=email ) ( 6 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: 5gc: Fix upfd failing to start outside podman ...................................................................... 5gc: Fix upfd failing to start outside podman tuns need to be recreated beforehand with sudo, as already done in ttcn3-ggsn-tests-ogs, otherwise upfd would need root access to create them. Change-Id: I5d3e0c3b7391d312304190acf07b347320481275 --- M 5gc/open5gs/open5gs-upf.yaml A 5gc/open5gs/testenv.sh M 5gc/testenv.cfg 3 files changed, 99 insertions(+), 8 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/5gc/open5gs/open5gs-upf.yaml b/5gc/open5gs/open5gs-upf.yaml index 5b86b67..f73cbc3 100644 --- a/5gc/open5gs/open5gs-upf.yaml +++ b/5gc/open5gs/open5gs-upf.yaml @@ -18,10 +18,22 @@ server: - address: 127.0.0.7 session: - - subnet: 10.45.0.0/16 - gateway: 10.45.0.1 - - subnet: 2001:db8:cafe::/48 - gateway: 2001:db8:cafe::1 + - subnet: 176.16.16.0/20 + #gateway: 176.16.16.1 + dnn: internet + dev: ogstun4 + - subnet: 2001:780:44:2000:0:0:0:0/56 + #gateway: 2001:780:44:2000:0:0:0:1/56 + dnn: inet6 + dev: ogstun6 + - subnet: 176.16.32.0/20 + #gateway: 176.16.32.1 + dnn: inet46 + dev: ogstun4 + - subnet: 2001:780:44:2100:0:0:0:0/56 + #gateway: 2001:780:44:2100:0:0:0:1/56 + dnn: inet46 + dev: ogstun46 metrics: server: - address: 127.0.0.7 diff --git a/5gc/open5gs/testenv.sh b/5gc/open5gs/testenv.sh new file mode 100755 index 0000000..718dee0 --- /dev/null +++ b/5gc/open5gs/testenv.sh @@ -0,0 +1,81 @@ +#!/bin/sh -ex + +check_usage() { + if [ -z "$TESTENV_CLEAN_REASON" ]; then + set +x + echo "Do not run this script manually." + echo "Run 'testenv.py run 5gc' instead." + exit 1 + fi +} + +setcap_open5gs_upfd() { + sudo setcap CAP_NET_RAW=+eip $(which open5gs-upfd) +} + +add_tun() { + local name="$1" + if ! grep "$name" /proc/net/dev > /dev/null; then + sudo ip tuntap add name $name mode tun + fi +} + +add_addr() { + local name="$1" + local addr="$2" + + sudo ip addr add "$addr" dev "$name" +} + +add_tun_all() { + add_tun "ogstun4" + add_tun "ogstun6" + add_tun "ogstun46" + + add_addr "ogstun4" "176.16.16.1/20" + add_addr "ogstun6" "2001:780:44:2000:0:0:0:1/56" + add_addr "ogstun46" "176.16.32.1/20" + add_addr "ogstun46" "2001:780:44:2100:0:0:0:1/56" + + sudo ip link set ogstun4 up + sudo ip link set ogstun6 up + sudo ip link set ogstun46 up +} + +del_tun() { + local name="$1" + + if ip link ls dev "$name" >/dev/null 2>&1; then + sudo ip link set "$name" down + sudo ip link del "$name" + fi +} + +del_tun_all() { + del_tun "ogstun4" + del_tun "ogstun6" + del_tun "ogstun46" +} + +check_usage + +# Add a bridge reachable through the GTP tunnel that can answer ICMP +# pings (for e.g. TC_pdp4_act_deact_gtpu_access). The bridge is also used to +# connect the SUT when it runs in QEMU. +EXTRA_IPS="172.18.3.201 fd02:db8:3::201" add_remove_testenv0_bridge.sh + +case "$TESTENV_CLEAN_REASON" in + prepare) + setcap_open5gs_upfd + del_tun_all + add_tun_all + ;; + crashed|finished) + del_tun_all + ;; + *) + set +x + echo "ERROR: unexpected TESTENV_CLEAN_REASON: $TESTENV_CLEAN_REASON" + exit 1 + ;; +esac diff --git a/5gc/testenv.cfg b/5gc/testenv.cfg index a20e9a4..89c4727 100644 --- a/5gc/testenv.cfg +++ b/5gc/testenv.cfg @@ -52,10 +52,8 @@ program=open5gs-upfd -c open5gs-upf.yaml make=open5gs package=open5gs-upf -copy=open5gs/open5gs-upf.yaml -# TODO: add tuns manually, see ggsn_tests/open5gs/testenv.sh -#copy=open5gs/open5gs-upf.yaml open5gs/testenv.sh -#clean=./testenv.sh +copy=open5gs/open5gs-upf.yaml open5gs/testenv.sh +clean=./testenv.sh [ausf] program=open5gs-ausfd -c open5gs-ausf.yaml -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40405?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5d3e0c3b7391d312304190acf07b347320481275 Gerrit-Change-Number: 40405 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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>

3 weeks, 3 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: podman: Install newer libcurl from bookworm-backports

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40411?usp=email ) Change subject: testenv: podman: Install newer libcurl from bookworm-backports ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40411?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I799eeac73c49b9596502ad98acaa11dba3b88e97 Gerrit-Change-Number: 40411 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 02 Jun 2025 10:09:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 3 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Initial NAS transmitting support

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40412?usp=email ) Change subject: 5gc: Initial NAS transmitting support ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40412?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I951e98217b0150eed58fabb8e50a4782c1a3b510 Gerrit-Change-Number: 40412 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Jun 2025 10:09:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 3 days

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: 5gc: Initial NAS receiving support

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40408?usp=email ) Change subject: 5gc: Initial NAS receiving support ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40408?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6697f30f95777fc9aed16a529a669d10f42c57be Gerrit-Change-Number: 40408 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Jun 2025 10:09:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 3 days

1
0
0 0

2025

2024

2023

2022

gerrit-log