August 2026 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: IPAd: Add eimTransactionId to TC_proc_euicc_data_req
by jolly 18 Aug '26

18 Aug '26

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43278?usp=email ) Change subject: IPAd: Add eimTransactionId to TC_proc_euicc_data_req ...................................................................... IPAd: Add eimTransactionId to TC_proc_euicc_data_req As we now have an optional transaction ID within euiccDataReq, check if the same transaction ID is received with the euiccDataResp. Related: SYS#8101 Change-Id: I1bb68e1befbc208b84e866450eb51041bc5ea772 --- M ipad/IPAd_Tests.ttcn M library/euicc/SGP32Definitions_Templates.ttcn 2 files changed, 17 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/43278/1 diff --git a/ipad/IPAd_Tests.ttcn b/ipad/IPAd_Tests.ttcn index 2bdda7b..ec541fe 100644 --- a/ipad/IPAd_Tests.ttcn +++ b/ipad/IPAd_Tests.ttcn @@ -700,7 +700,8 @@ f_http_register(); /* IPAd requests a package, we tell it to execute an ipaEuiccDataRequest */ - f_esipa_transceive(valueof(ts_getEimPackageResponse_euiccDataReq), tr_getEimPackageRequest); + f_esipa_transceive(valueof(ts_getEimPackageResponse_euiccDataReq(ts_ipaEuiccDataRequest(eimTransactionId := '42'O))), + tr_getEimPackageRequest); /* IPAd will obtain the data from the eUICC */ f_vpcd_transceive(enc_EuiccConfiguredAddressesResponse(valueof(ts_euiccConfiguredAddressesResponse))); @@ -713,7 +714,7 @@ /* IPAd will return the data to us */ f_esipa_transceive(valueof(ts_provideEimPackageResultResponse_eimAck(eimAcknowledgements := {1,2,3,4})), - tr_provideEimPackageResult(*, tr_eimPackageResult_euiccDataResp)); + tr_provideEimPackageResult(*, tr_eimPackageResult_euiccDataResp(eimTransactionId := '42'O))); /* IPAd will poll again. */ f_terminate_poll_cycle(); diff --git a/library/euicc/SGP32Definitions_Templates.ttcn b/library/euicc/SGP32Definitions_Templates.ttcn index 5304c2c..faf97c8 100644 --- a/library/euicc/SGP32Definitions_Templates.ttcn +++ b/library/euicc/SGP32Definitions_Templates.ttcn @@ -330,20 +330,24 @@ /* GSMA SGP.32, section 6.3.2.6 and 2.11.1.2 */ template (present) IpaEuiccDataRequest -tr_ipaEuiccDataRequest := { - tagList := ?, - euiccCiPKIdentifierToBeUsed := *, +tr_ipaEuiccDataRequest(template (present) octetstring tagList := ?, + template octetstring euiccCiPKIdentifierToBeUsed := *, + template octetstring eimTransactionId := *) := { + tagList := tagList, + euiccCiPKIdentifierToBeUsed := euiccCiPKIdentifierToBeUsed, searchCriteriaNotification := *, searchCriteriaEuiccPackageResult := *, - eimTransactionId := * + eimTransactionId := eimTransactionId } template (value) IpaEuiccDataRequest -ts_ipaEuiccDataRequest := { - tagList := '81BF20BF228384A5A6A8A9A0A2'O, - euiccCiPKIdentifierToBeUsed := omit, +ts_ipaEuiccDataRequest(template (value) octetstring tagList := '81BF20BF228384A5A6A8A9A0A2'O, + template (omit) octetstring euiccCiPKIdentifierToBeUsed := omit, + template (omit) octetstring eimTransactionId := omit) := { + tagList := tagList, + euiccCiPKIdentifierToBeUsed := euiccCiPKIdentifierToBeUsed, searchCriteriaNotification := omit, searchCriteriaEuiccPackageResult := omit, - eimTransactionId := omit + eimTransactionId := eimTransactionId } template (present) EsipaMessageFromEimToIpa tr_getEimPackageResponse_euiccDataReq(template (present) IpaEuiccDataRequest ipaEuiccDataRequest := tr_ipaEuiccDataRequest) := { @@ -1482,7 +1486,7 @@ } } template (present) EimPackageResult -tr_eimPackageResult_euiccDataResp := { +tr_eimPackageResult_euiccDataResp(template octetstring eimTransactionId := *) := { ipaEuiccDataResponse := { ipaEuiccData := { notificationsList := *, @@ -1494,7 +1498,7 @@ associationToken := *, eumCertificate := *, euiccCertificate := *, - eimTransactionId := *, + eimTransactionId := eimTransactionId, ipaCapabilities := *, deviceInfo := * } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43278?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1bb68e1befbc208b84e866450eb51041bc5ea772 Gerrit-Change-Number: 43278 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

[S] Change in osmo-ttcn3-hacks[master]: IPAd: Add eimTransactionId to TC_proc_euicc_pkg_dwnld_exec
by jolly 18 Aug '26

18 Aug '26

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43280?usp=email ) Change subject: IPAd: Add eimTransactionId to TC_proc_euicc_pkg_dwnld_exec ...................................................................... IPAd: Add eimTransactionId to TC_proc_euicc_pkg_dwnld_exec As we now have an optional transaction ID within euiccPackageSigned, check if the same transaction ID is received with the euiccPackageResultDataSigned. Also check if the euiccPackageRequest towards the eUICC also contains the same transaction ID. Related: SYS#8101 Change-Id: I04b456edbb1cbae4f1ec0e3a2e9c2e28b787af6b --- M ipad/IPAd_Tests.ttcn M library/euicc/SGP32Definitions_Templates.ttcn 2 files changed, 24 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/43280/1 diff --git a/ipad/IPAd_Tests.ttcn b/ipad/IPAd_Tests.ttcn index 91f160f..2e289d1 100644 --- a/ipad/IPAd_Tests.ttcn +++ b/ipad/IPAd_Tests.ttcn @@ -572,22 +572,29 @@ /* A testcase to try out an the Generic eUICC Package Download and Execution Procedure, * See also: GSMA SGP.32, section 3.3.1: Generic eUICC Package Download and Execution */ private function f_TC_proc_euicc_pkg_dwnld_exec(charstring id) runs on IPAd_ConnHdlr { + template (value) EuiccPackageSigned euiccPackageSigned := ts_euiccPackageSigned(eimTransactionId := '42'O); + template (present) EuiccPackageRequest euiccPackageRequest := ts_euiccPackageRequest(euiccPackageSigned); + f_exec_ipad(); f_es10x_init(); f_http_register(); /* Step #1-#2 */ - f_esipa_transceive(valueof(ts_getEimPackageResponse_euiccPkgReq), tr_getEimPackageRequest); + f_esipa_transceive(valueof(ts_getEimPackageResponse_euiccPkgReq(euiccPackageRequest)), tr_getEimPackageRequest); /* Step #3-#8 */ - f_vpcd_transceive(enc_EuiccPackageResult(valueof(ts_euiccPackageResult))); + var octetstring asn := f_vpcd_transceive(enc_EuiccPackageResult(valueof(ts_euiccPackageResult(eimTransactionId := '42'O))), ''O); + var EuiccPackageRequest req := dec_EuiccPackageRequest(asn); + if (not match(req, tr_euiccPackageRequest(ts_euiccPackageSigned(eimTransactionId := '42'O)))) { + setverdict(fail, "Unexprected ES10b request: ", req); + } /* Step #9 */ f_vpcd_transceive(enc_RetrieveNotificationsListResponse(valueof(ts_retrieveNotificationsListResponse_prfleInstRes))); /* Step #10-14 */ f_esipa_transceive(valueof(ts_provideEimPackageResultResponse_eimAck(eimAcknowledgements := {1,2,3,4})), - tr_provideEimPackageResult(*, tr_eimPackageResult_ePRAndNotif)); + tr_provideEimPackageResult(*, tr_eimPackageResult_ePRAndNotif(tr_euiccPackageResultSigned_enablePsmo(eimTransactionId := '42'O)))); /* Step #15-17 */ f_vpcd_transceive(enc_NotificationSentResponse(valueof(ts_notificationSentResponse))); diff --git a/library/euicc/SGP32Definitions_Templates.ttcn b/library/euicc/SGP32Definitions_Templates.ttcn index da3ac16..8be8b88 100644 --- a/library/euicc/SGP32Definitions_Templates.ttcn +++ b/library/euicc/SGP32Definitions_Templates.ttcn @@ -671,20 +671,22 @@ /* GSMA SGP.32, section 6.3.2.6 */ template (present) EuiccPackageSigned -tr_euiccPackageSigned(template (present) EuiccPackage euiccPackage := tr_euiccPackage_enablePsmo) := { +tr_euiccPackageSigned(template (present) EuiccPackage euiccPackage := tr_euiccPackage_enablePsmo, + template octetstring eimTransactionId := *) := { eimId := ?, eidValue := ?, counterValue := ?, - eimTransactionId := *, + eimTransactionId := eimTransactionId, euiccPackage := euiccPackage } template (value) EuiccPackageSigned -ts_euiccPackageSigned(template (value) EuiccPackage euiccPackage := ts_euiccPackage_enablePsmo) := { +ts_euiccPackageSigned(template (value) EuiccPackage euiccPackage := ts_euiccPackage_enablePsmo, + template (omit) octetstring eimTransactionId := omit) := { eimId := "myEim", eidValue := '00112233445566778899AABBCCDDEEFF'O, counterValue := 123, - eimTransactionId := omit, + eimTransactionId := eimTransactionId, euiccPackage := euiccPackage } @@ -806,12 +808,12 @@ /* GSMA SGP.32, section 5.9.1 */ template (present) EuiccPackageResult -tr_euiccPackageResult := { +tr_euiccPackageResult(template octetstring eimTransactionId := *) := { euiccPackageResultSigned := { euiccPackageResultDataSigned := { eimId := ?, counterValue := ?, - eimTransactionId := *, + eimTransactionId := eimTransactionId, seqNumber := ?, euiccResult := ? }, @@ -819,12 +821,12 @@ } } template (value) EuiccPackageResult -ts_euiccPackageResult := { +ts_euiccPackageResult(template (omit) octetstring eimTransactionId := omit) := { euiccPackageResultSigned := { euiccPackageResultDataSigned := { eimId := "myEim", counterValue := 333, - eimTransactionId := omit, + eimTransactionId := eimTransactionId, seqNumber := 1234, euiccResult := { { @@ -898,12 +900,12 @@ /* GSMA SGP.32, section 6.3.2.7 */ template (present) EuiccPackageResult -tr_euiccPackageResultSigned_enablePsmo := { +tr_euiccPackageResultSigned_enablePsmo(template octetstring eimTransactionId := *) := { euiccPackageResultSigned := { euiccPackageResultDataSigned := { eimId := ?, counterValue := ?, - eimTransactionId := *, + eimTransactionId := eimTransactionId, seqNumber := ?, euiccResult := { { @@ -915,12 +917,12 @@ } } template (value) EuiccPackageResult -ts_euiccPackageResultSigned_enablePsmo := { +ts_euiccPackageResultSigned_enablePsmo(template (omit) octetstring eimTransactionId := omit) := { euiccPackageResultSigned := { euiccPackageResultDataSigned := { eimId := "myEIM", counterValue := 1, - eimTransactionId := omit, + eimTransactionId := eimTransactionId, seqNumber := 123, euiccResult := { { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43280?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04b456edbb1cbae4f1ec0e3a2e9c2e28b787af6b Gerrit-Change-Number: 43280 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

[XS] Change in osmo-iuh[master]: ranap_msg_factory: Fix API documentation regarding ip param endianness
by pespin 18 Aug '26

18 Aug '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/43257?usp=email ) Change subject: ranap_msg_factory: Fix API documentation regarding ip param endianness ...................................................................... ranap_msg_factory: Fix API documentation regarding ip param endianness The param is clearly being expected as host-byte order because it converts it when storing it into the sockaddr, which contains a net-byte order. Both users of these APIs, ie. osmo-sgsn and osmo-msc, actually end up passing a host-byte order addr despite wrongly using htonl() instead of ntohl(), but taking advantage of the fact that both functions do the same: * osmo-sgsn: sgsn_pdp_ctx_iu_rab_activate() does "htonl(pdp->lib->gsnru.v)", where "v" is stored as network-byte order. * osmo-msc: ran_iu_make_rab_assignment() does "osmo_htonl(inet_addr(ac->cn_rtp->ip))", where clearly inet_addr returns a network-byte order. Change-Id: I0a909019875714d35c27aa38dd5520a82d46e8f2 --- M src/ranap_msg_factory.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: lynxis lazus: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ranap_msg_factory.c b/src/ranap_msg_factory.c index 1005594..aecd7df 100644 --- a/src/ranap_msg_factory.c +++ b/src/ranap_msg_factory.c @@ -791,7 +791,7 @@ /*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for CS (voice). * See 3GPP TS 25.413 8.2. * RAB ID: 3GPP TS 25.413 9.2.1.2. - * \param rtp_ip MGW's RTP IPv4 address in *network* byte order. + * \param rtp_ip MGW's RTP IPv4 address in *host* byte order. */ struct msgb *ranap_new_msg_rab_assign_voice(uint8_t rab_id, uint32_t rtp_ip, uint16_t rtp_port, @@ -865,7 +865,7 @@ } /*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for PS (data) - * \param gtp_ip SGSN's GTP IPv4 address in *network* byte order. */ + * \param gtp_ip SGSN's GTP IPv4 address in *host* byte order. */ struct msgb *ranap_new_msg_rab_assign_data(uint8_t rab_id, uint32_t gtp_ip, uint32_t gtp_tei, bool use_x213_nsap) { -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/43257?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0a909019875714d35c27aa38dd5520a82d46e8f2 Gerrit-Change-Number: 43257 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-iuh[master]: ranap: Introduce new APIs to encode rab_ass for gtp and rtp
by pespin 18 Aug '26

18 Aug '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/43258?usp=email ) Change subject: ranap: Introduce new APIs to encode rab_ass for gtp and rtp ...................................................................... ranap: Introduce new APIs to encode rab_ass for gtp and rtp This allows passing IPv6 addresses, which are already supported in internal functions being called. While at it, also check that sockaddr encoding succeeds and otherwise return an error. Related: OS#7066 Change-Id: I3a8800afd03b94349c8acec778ab7003819e80af --- M TODO-RELEASE M include/osmocom/ranap/ranap_msg_factory.h M src/ranap_msg_factory.c M tests/test-ranap.c 4 files changed, 96 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..dad7e1f 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +add ranap ranap_new_msg_rab_assign_voice2(), ranap_new_msg_rab_assign_data2() diff --git a/include/osmocom/ranap/ranap_msg_factory.h b/include/osmocom/ranap/ranap_msg_factory.h index b1175b0..e71bf25 100644 --- a/include/osmocom/ranap/ranap_msg_factory.h +++ b/include/osmocom/ranap/ranap_msg_factory.h @@ -2,6 +2,9 @@ #include <stdint.h> #include <stdbool.h> + +#include <osmocom/core/socket.h> + #include <osmocom/ranap/RANAP_Cause.h> #include <osmocom/ranap/RANAP_CN-DomainIndicator.h> #include <osmocom/ranap/RANAP_GlobalRNC-ID.h> @@ -39,11 +42,21 @@ /*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for CS (voice) */ struct msgb *ranap_new_msg_rab_assign_voice(uint8_t rab_id, uint32_t rtp_ip, uint16_t rtp_port, - bool use_x213_nsap); + bool use_x213_nsap) +OSMO_DEPRECATED("Use ranap_new_msg_rab_assign_voice2 instead"); +struct msgb *ranap_new_msg_rab_assign_voice2(uint8_t rab_id, + const struct osmo_sockaddr *rtp_addr, + bool use_x213_nsap); + /*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for PS (data) */ struct msgb *ranap_new_msg_rab_assign_data(uint8_t rab_id, uint32_t gtp_ip, - uint32_t gtp_tei, bool use_x213_nsap); + uint32_t gtp_tei, bool use_x213_nsap) +OSMO_DEPRECATED("Use ranap_new_msg_rab_assign_data2 instead"); +struct msgb *ranap_new_msg_rab_assign_data2(uint8_t rab_id, + const struct osmo_sockaddr *gtp_addr, + uint32_t gtp_tei, + bool use_x213_nsap); /*! \brief generate RANAP RESET message */ struct msgb *ranap_new_msg_reset(RANAP_CN_DomainIndicator_t domain, diff --git a/src/ranap_msg_factory.c b/src/ranap_msg_factory.c index aecd7df..cbdc403 100644 --- a/src/ranap_msg_factory.c +++ b/src/ranap_msg_factory.c @@ -789,20 +789,18 @@ } /*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for CS (voice). - * See 3GPP TS 25.413 8.2. - * RAB ID: 3GPP TS 25.413 9.2.1.2. - * \param rtp_ip MGW's RTP IPv4 address in *host* byte order. + * \param[in] rab_id The RAB ID of the RAB being assigned (3GPP TS 25.413 9.2.1.2). + * \param[in] rtp_addr MGW's RTP IPv4 address and port. + * \param[in] use_x213_nsap Whether to use X.213 NSAP address encoding. */ -struct msgb *ranap_new_msg_rab_assign_voice(uint8_t rab_id, uint32_t rtp_ip, - uint16_t rtp_port, - bool use_x213_nsap) +struct msgb *ranap_new_msg_rab_assign_voice2(uint8_t rab_id, const struct osmo_sockaddr *rtp_addr, + bool use_x213_nsap) { RANAP_ProtocolIE_FieldPair_t *pair; RANAP_RAB_AssignmentRequestIEs_t ies; RANAP_RAB_AssignmentRequest_t out; struct msgb *msg; int rc; - struct osmo_sockaddr rtp_addr; memset(&ies, 0, sizeof(ies)); memset(&out, 0, sizeof(out)); @@ -818,10 +816,11 @@ first.rAB_Parameters = new_rab_par_voice(6700, 12200); first.userPlaneInformation = new_upi(RANAP_UserPlaneMode_support_mode_for_predefined_SDU_sizes, 1); /* 2? */ - rtp_addr.u.sin.sin_family = AF_INET; - rtp_addr.u.sin.sin_port = htons(rtp_port); - rtp_addr.u.sin.sin_addr.s_addr = htonl(rtp_ip); - first.transportLayerInformation = ranap_new_transp_info_rtp(&rtp_addr, use_x213_nsap); + first.transportLayerInformation = ranap_new_transp_info_rtp(rtp_addr, use_x213_nsap); + if (!first.transportLayerInformation) { + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifyItemFirst, &first); + return NULL; + } /* put together the 'Second' part */ RANAP_RAB_SetupOrModifyItemSecond_t second; @@ -864,10 +863,38 @@ return msg; } +/*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for CS (voice). + * \param[in] rab_id The RAB ID of the RAB being assigned (3GPP TS 25.413 9.2.1.2). + * \param[in] rtp_ip MGW's RTP IPv4 address in *host* byte order. + * \param[in] rtp_port MGW's RTP port in *host* byte order. + * \param[in] use_x213_nsap Whether to use X.213 NSAP address encoding. + * + * See 3GPP TS 25.413 8.2. + */ +struct msgb *ranap_new_msg_rab_assign_voice(uint8_t rab_id, uint32_t rtp_ip, + uint16_t rtp_port, + bool use_x213_nsap) +{ + struct osmo_sockaddr rtp_addr = { + .u.sin = { + .sin_family = AF_INET, + .sin_port = htons(rtp_port), + .sin_addr.s_addr = htonl(rtp_ip), + } + }; + return ranap_new_msg_rab_assign_voice2(rab_id, &rtp_addr, use_x213_nsap); +} + /*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for PS (data) - * \param gtp_ip SGSN's GTP IPv4 address in *host* byte order. */ -struct msgb *ranap_new_msg_rab_assign_data(uint8_t rab_id, uint32_t gtp_ip, - uint32_t gtp_tei, bool use_x213_nsap) + * \param[in] rab_id The RAB ID of the RAB being assigned. + * \param[in] gtp_addr SGSN's GTP IP address. sockaddr port is not used, ignored. + * \param[in] gtp_tei SGSN's GTP TEID in *host* byte order. + * \param[in] use_x213_nsap Whether to use X.213 NSAP address encoding. + */ +struct msgb *ranap_new_msg_rab_assign_data2(uint8_t rab_id, + const struct osmo_sockaddr *gtp_addr, + uint32_t gtp_tei, + bool use_x213_nsap) { RANAP_ProtocolIE_FieldPair_t *pair; RANAP_RAB_AssignmentRequestIEs_t ies; @@ -875,7 +902,6 @@ RANAP_DataVolumeReportingIndication_t *dat_vol_ind; struct msgb *msg; int rc; - struct osmo_sockaddr gtp_addr; memset(&ies, 0, sizeof(ies)); memset(&out, 0, sizeof(out)); @@ -891,10 +917,11 @@ first.rAB_Parameters = new_rab_par_data(1600000, 800000); first.userPlaneInformation = new_upi(RANAP_UserPlaneMode_transparent_mode, 1); - - gtp_addr.u.sin.sin_family = AF_INET; - gtp_addr.u.sin.sin_addr.s_addr = htonl(gtp_ip); - first.transportLayerInformation = ranap_new_transp_info_gtp(&gtp_addr, gtp_tei, use_x213_nsap); + first.transportLayerInformation = ranap_new_transp_info_gtp(gtp_addr, gtp_tei, use_x213_nsap); + if (!first.transportLayerInformation) { + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifyItemFirst, &first); + return NULL; + } /* put together the 'Second' part */ RANAP_RAB_SetupOrModifyItemSecond_t second; @@ -946,6 +973,24 @@ return msg; } +/*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for PS (data) + * \param[in] rab_id The RAB ID of the RAB being assigned + * \param[in] gtp_ip SGSN's GTP IPv4 address in *host* byte order. + * \param[in] gtp_tei SGSN's GTP TEID in *host* byte order. + * \param[in] use_x213_nsap Whether to use X.213 NSAP address encoding. + */ +struct msgb *ranap_new_msg_rab_assign_data(uint8_t rab_id, uint32_t gtp_ip, + uint32_t gtp_tei, bool use_x213_nsap) +{ + struct osmo_sockaddr gtp_addr = { + .u.sin = { + .sin_family = AF_INET, + .sin_addr.s_addr = htonl(gtp_ip), + } + }; + return ranap_new_msg_rab_assign_data2(rab_id, &gtp_addr, gtp_tei, use_x213_nsap); +} + /*! \brief generate RANAP IU RELEASE REQUEST message */ struct msgb *ranap_new_msg_iu_rel_req(const RANAP_Cause_t *cause) { diff --git a/tests/test-ranap.c b/tests/test-ranap.c index e593bd9..7213c1e 100644 --- a/tests/test-ranap.c +++ b/tests/test-ranap.c @@ -83,9 +83,20 @@ struct msgb *msg; const char *imsi = "901700123456789"; uint32_t tmsi = 0x01234567; - uint32_t rtp_ip = 0x0a0b0c0d; - uint16_t rtp_port = 2342; - uint32_t gtp_ip = 0x1a1b1c1d; + struct osmo_sockaddr rtp_addr = { + .u.sin = { + .sin_family = AF_INET, + .sin_port = htons(2342), + .sin_addr.s_addr = htonl(0x0a0b0c0d), + } + }; + struct osmo_sockaddr gtp_addr = { + .u.sin = { + .sin_family = AF_INET, + .sin_port = htons(2152), + .sin_addr.s_addr = htonl(0x1a1b1c1d), + } + }; uint32_t gtp_tei = 0x11223344; uint8_t ik[16] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; uint8_t ck[16] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 }; @@ -125,13 +136,13 @@ msgb_free(msg); printf("\n==> RAB ASSIGNMENT COMMAND (VOICE)\n"); - msg = ranap_new_msg_rab_assign_voice(1, rtp_ip, rtp_port, 1); + msg = ranap_new_msg_rab_assign_voice2(1, &rtp_addr, 1); if (msg) printf("%s\n", msgb_hexdump(msg)); msgb_free(msg); printf("\n==> RAB ASSIGNMENT COMMAND (DATA)\n"); - msg = ranap_new_msg_rab_assign_data(2, gtp_ip, gtp_tei, 1); + msg = ranap_new_msg_rab_assign_data2(2, &gtp_addr, gtp_tei, 1); if (msg) printf("%s\n", msgb_hexdump(msg)); msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/43258?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3a8800afd03b94349c8acec778ab7003819e80af Gerrit-Change-Number: 43258 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: Add empty getEimPackageResponse send template
by jolly 18 Aug '26

18 Aug '26

Attention is currently required from: jolly. Hello Jenkins Builder, dexter, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42966?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: Add empty getEimPackageResponse send template ...................................................................... Add empty getEimPackageResponse send template This template can be sent, if no eIM package is available for the IPAd. The IPAd will then stop polling for new eIM packages terminate (or delay). Related: SYS#8101 Change-Id: Idf777e168c2f86ed80ce184cbb65fe86cdabe56a --- M library/euicc/SGP32Definitions_Templates.ttcn 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/42966/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42966?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idf777e168c2f86ed80ce184cbb65fe86cdabe56a Gerrit-Change-Number: 42966 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu>

1 0

[M] Change in osmo-iuh[master]: ranap: Introduce new APIs to encode rab_ass for gtp and rtp
by lynxis lazus 18 Aug '26

18 Aug '26

Attention is currently required from: laforge, pespin. lynxis lazus has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-iuh/+/43258?usp=email ) Change subject: ranap: Introduce new APIs to encode rab_ass for gtp and rtp ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/43258?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3a8800afd03b94349c8acec778ab7003819e80af Gerrit-Change-Number: 43258 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Aug 2026 09:49:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in onomondo-ipa[master]: V1.2: Add function ES10b.GetConnectivityParameters
by jolly 18 Aug '26

18 Aug '26

Attention is currently required from: dexter, laforge. jolly has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43054?usp=email ) Change subject: V1.2: Add function ES10b.GetConnectivityParameters ...................................................................... Patch Set 7: (1 comment) Patchset: PS7: > btw, do we somewhere specify which exact asn1c version / repo / commit we're using to generate the C […] Refer to Change-Id: I1ac4cf8980af501bb119208213242468ee4f3c06 -- To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43054?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: onomondo-ipa Gerrit-Branch: master Gerrit-Change-Id: I075590e095dbbe05fa6cdb0a96d5b38c7a17ff78 Gerrit-Change-Number: 43054 Gerrit-PatchSet: 7 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Aug 2026 09:48:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in osmo-iuh[master]: ranap_msg_factory: Fix API documentation regarding ip param endianness
by lynxis lazus 18 Aug '26

18 Aug '26

Attention is currently required from: laforge, pespin. lynxis lazus has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-iuh/+/43257?usp=email ) Change subject: ranap_msg_factory: Fix API documentation regarding ip param endianness ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/43257?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0a909019875714d35c27aa38dd5520a82d46e8f2 Gerrit-Change-Number: 43257 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Aug 2026 09:47:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-iuh[master]: ranap_msg_factory: Fix API documentation regarding ip param endianness
by pespin 18 Aug '26

18 Aug '26

Attention is currently required from: laforge, lynxis lazus. Hello Jenkins Builder, laforge, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/43257?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by lynxis lazus Change subject: ranap_msg_factory: Fix API documentation regarding ip param endianness ...................................................................... ranap_msg_factory: Fix API documentation regarding ip param endianness The param is clearly being expected as host-byte order because it converts it when storing it into the sockaddr, which contains a net-byte order. Both users of these APIs, ie. osmo-sgsn and osmo-msc, actually end up passing a host-byte order addr despite wrongly using htonl() instead of ntohl(), but taking advantage of the fact that both functions do the same: * osmo-sgsn: sgsn_pdp_ctx_iu_rab_activate() does "htonl(pdp->lib->gsnru.v)", where "v" is stored as network-byte order. * osmo-msc: ran_iu_make_rab_assignment() does "osmo_htonl(inet_addr(ac->cn_rtp->ip))", where clearly inet_addr returns a network-byte order. Change-Id: I0a909019875714d35c27aa38dd5520a82d46e8f2 --- M src/ranap_msg_factory.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/57/43257/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/43257?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0a909019875714d35c27aa38dd5520a82d46e8f2 Gerrit-Change-Number: 43257 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-iuh[master]: ranap: Introduce new APIs to encode rab_ass for gtp and rtp
by pespin 18 Aug '26

18 Aug '26

Attention is currently required from: laforge, lynxis lazus. Hello Jenkins Builder, laforge, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/43258?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by lynxis lazus, Verified+1 by Jenkins Builder Change subject: ranap: Introduce new APIs to encode rab_ass for gtp and rtp ...................................................................... ranap: Introduce new APIs to encode rab_ass for gtp and rtp This allows passing IPv6 addresses, which are already supported in internal functions being called. While at it, also check that sockaddr encoding succeeds and otherwise return an error. Related: OS#7066 Change-Id: I3a8800afd03b94349c8acec778ab7003819e80af --- M TODO-RELEASE M include/osmocom/ranap/ranap_msg_factory.h M src/ranap_msg_factory.c M tests/test-ranap.c 4 files changed, 96 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/58/43258/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/43258?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3a8800afd03b94349c8acec778ab7003819e80af Gerrit-Change-Number: 43258 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

2026

2025

2024

2023

2022

gerrit-log August 2026