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

[S] Change in osmo-msc[master]: libvlr: add missing declaration of vlr_ra_update()
by laforge 22 Aug '26

22 Aug '26

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/43354?usp=email ) Change subject: libvlr: add missing declaration of vlr_ra_update() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iaf86bb8857c04237aa31623dc018ad21c33b9480 Gerrit-Change-Number: 43354 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Sat, 22 Aug 2026 08:03:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmocore[master]: usb: osmo_libusb_open_claim_interface: print an error when no device ...
by laforge 22 Aug '26

22 Aug '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/43346?usp=email ) Change subject: usb: osmo_libusb_open_claim_interface: print an error when no device was found ...................................................................... usb: osmo_libusb_open_claim_interface: print an error when no device was found When no device was found, osmo_libusb_open_claim_interface() was silent and the other had no idea what went wrong. Change-Id: I59d31f80a9d5b6bf7b33ca80f4387748531b4cce --- M src/usb/osmo_libusb.c 1 file changed, 8 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/usb/osmo_libusb.c b/src/usb/osmo_libusb.c index a249d10..e08a607 100644 --- a/src/usb/osmo_libusb.c +++ b/src/usb/osmo_libusb.c @@ -543,14 +543,14 @@ if (rc < 0) { fprintf(stderr, "Cannot open device: %s\n", libusb_error_name(rc)); usb_devh = NULL; - break; + goto out; } rc = libusb_get_configuration(usb_devh, &config); if (rc < 0) { fprintf(stderr, "Cannot get current configuration: %s\n", libusb_error_name(rc)); libusb_close(usb_devh); usb_devh = NULL; - break; + goto out; } if (config != ifm->configuration) { rc = libusb_set_configuration(usb_devh, ifm->configuration); @@ -558,7 +558,7 @@ fprintf(stderr, "Cannot set configuration: %s\n", libusb_error_name(rc)); libusb_close(usb_devh); usb_devh = NULL; - break; + goto out; } } rc = libusb_claim_interface(usb_devh, ifm->interface); @@ -566,7 +566,7 @@ fprintf(stderr, "Cannot claim interface: %s\n", libusb_error_name(rc)); libusb_close(usb_devh); usb_devh = NULL; - break; + goto out; } rc = libusb_set_interface_alt_setting(usb_devh, ifm->interface, ifm->altsetting); if (rc < 0) { @@ -574,11 +574,14 @@ libusb_release_interface(usb_devh, ifm->interface); libusb_close(usb_devh); usb_devh = NULL; - break; + goto out; } } } + if (!usb_devh) + fprintf(stderr, "Failed to find a matching usb device\n"); +out: /* unref / free list */ for (dev = list; *dev; dev++) libusb_unref_device(*dev); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/43346?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I59d31f80a9d5b6bf7b33ca80f4387748531b4cce Gerrit-Change-Number: 43346 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: usb: osmo_libusb_open_claim_interface: print an error when no device ...
by laforge 22 Aug '26

22 Aug '26

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/libosmocore/+/43346?usp=email ) Change subject: usb: osmo_libusb_open_claim_interface: print an error when no device was found ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File src/usb/osmo_libusb.c: https://gerrit.osmocom.org/c/libosmocore/+/43346/comment/31bc2024_b414da2c?… : PS1, Line 583: > Without the goto you will have: […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/43346?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: I59d31f80a9d5b6bf7b33ca80f4387748531b4cce Gerrit-Change-Number: 43346 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Sat, 22 Aug 2026 08:03:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-ttcn3-hacks[master]: SGSN: f_routing_area_update: add authentication argument
by laforge 22 Aug '26

22 Aug '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39018?usp=email ) Change subject: SGSN: f_routing_area_update: add authentication argument ...................................................................... SGSN: f_routing_area_update: add authentication argument The RAU should always contain an authentication when the MS/UE is not authenticated or the traffic not encrypted. Change-Id: I7125ed8aa81fbda48a19f7f4fc711bc1bf2c875f --- M sgsn/BSSGP_ConnHdlr.ttcn 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/sgsn/BSSGP_ConnHdlr.ttcn b/sgsn/BSSGP_ConnHdlr.ttcn index 696aa83..6879b0a 100644 --- a/sgsn/BSSGP_ConnHdlr.ttcn +++ b/sgsn/BSSGP_ConnHdlr.ttcn @@ -112,6 +112,12 @@ GlobalRNC_ID grnc_id optional }; +type enumerated SGSN_auth_mode { + SGSN_AUTH_MODE_DISABLED, + SGSN_AUTH_MODE_PERMITTED, + SGSN_AUTH_MODE_REQUIRED +}; + function f_new_BSSGP_ConnHdlrPars(integer imsi_suffix, template (value) BssgpCellIds cell_ids, template (value) SGSN_ConnHdlrNetworkPars net_pars := t_NetPars(), @@ -688,8 +694,10 @@ function f_routing_area_update(RoutingAreaIdentificationV old_ra, GprsUpdateType upd_type := GPRS_UPD_T_RA, integer ran_index := 0, - float Tval := 2.0) runs on BSSGP_ConnHdlr { + float Tval := 2.0, + SGSN_auth_mode auth_mode := SGSN_AUTH_MODE_REQUIRED) runs on BSSGP_ConnHdlr { var template (omit) OCT4 p_tmsi := omit; + var boolean authed := false; timer T := Tval; if (is_iu(ran_index)) { @@ -700,6 +708,11 @@ T.start; alt { + [auth_mode != SGSN_AUTH_MODE_DISABLED] as_gmm_auth( + umts_aka_challenge := true, ran_index := ran_index, expect_sai := true) { + authed := true; + repeat; + } [] as_routing_area_update(ran_index) { setverdict(pass); } [is_gb(ran_index)] BSSGP[ran_index].receive { repeat; } [is_iu(ran_index)] RAN_CONN.receive { repeat; } @@ -708,6 +721,11 @@ mtc.stop; } } + + if (auth_mode == SGSN_AUTH_MODE_REQUIRED and not authed) { + setverdict(fail, "RAU succeeded but without required authentication"); + mtc.stop; + } } /* Iu only -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39018?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: I7125ed8aa81fbda48a19f7f4fc711bc1bf2c875f Gerrit-Change-Number: 39018 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: SGSN_Tests: fix TC_sgsn_context_req_out
by laforge 22 Aug '26

22 Aug '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39017?usp=email ) Change subject: SGSN_Tests: fix TC_sgsn_context_req_out ...................................................................... SGSN_Tests: fix TC_sgsn_context_req_out The TC_sgsn_context_req_out wasn't complete when merged and didn't work as expected. Change-Id: I0666a518aed57c2594653ab6b0f801c4193fd2f3 --- M sgsn/SGSN_Tests.ttcn M sgsn/gen_links.sh 2 files changed, 151 insertions(+), 17 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 51eabd4..1d58b46 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -69,6 +69,10 @@ import from BSSGP_ConnHdlr all; +import from NAS_EPS_Templates all; +import from NAS_EPS_Types all; + + modulepar { /* IP/port on which we run our internal GSUP/HLR emulation */ charstring mp_hlr_ip := "127.0.0.1"; @@ -1730,7 +1734,7 @@ /* Attempt an attach, but loose the Identification Request (IMEI) */ private function f_TC_attach_no_imei_response(charstring id) runs on BSSGP_ConnHdlr { var integer count_req := 0; - var MobileIdentityLV mi; + var MobileL3_CommonIE_Types.MobileIdentityLV mi; f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); @@ -1776,7 +1780,7 @@ /* Attempt an attach, but loose the Identification Request (IMSI) */ private function f_TC_attach_no_imsi_response(charstring id) runs on BSSGP_ConnHdlr { var integer count_req := 0; - var MobileIdentityLV mi; + var MobileL3_CommonIE_Types.MobileIdentityLV mi; /* set p_tmsi to use it in Attach Req via f_mi_get_lv() */ g_pars.p_tmsi := 'c0000035'O; @@ -2060,7 +2064,7 @@ private function f_TC_attach_gmm_attach_req_while_gmm_attach(charstring id) runs on BSSGP_ConnHdlr { var integer count_req := 0; - var MobileIdentityLV mi; + var MobileL3_CommonIE_Types.MobileIdentityLV mi; var RoutingAreaIdentificationV rand_rai := f_random_RAI(); var PDU_L3_SGSN_MS l3_mt; @@ -3147,24 +3151,112 @@ f_cleanup(); } +/* 3GPP TS 23.401 D.3.5, TS 23.003 2.8.2.1 */ +function guti2rai_ptmsi(in NAS_EPS_Types.GUTI guti, in OCT2 truncated_nas_token, out RoutingAreaIdentificationV rai, out OCT4 ptmsi, out OCT3 ptmsi_sig) { + var bitstring mtmsi_bits := oct2bit(guti.mTMSI); + var bitstring ptmsi_bits; + var bitstring ptmsi_sig_bits; + + rai := { + mccDigit1 := guti.mccDigit1, + mccDigit2 := guti.mccDigit2, + mccDigit3 := guti.mccDigit3, + mncDigit3 := guti.mncDigit3, + mncDigit1 := guti.mncDigit1, + mncDigit2 := guti.mncDigit2, + lac := guti.mMEGI, + rac := guti.mMEC + }; + /* 3GPP TS 23.003 2.8.2.0: "P-TMSI shall be of 32 bits length where the two topmost bits are + * reserved and always set to '11'. Hence, for a UE which may handover to GERAN/UTRAN (based on + * subscription and UE capabilities), the corresponding bits in the M-TMSI are set to '11'" + */ + ptmsi_bits := '11'B & substr(mtmsi_bits, 2, 6) & oct2bit(guti.mMEC) & substr(mtmsi_bits, 16, 16); + ptmsi_sig_bits := substr(mtmsi_bits, 8, 8) & oct2bit(truncated_nas_token); + ptmsi := bit2oct(ptmsi_bits); + ptmsi_sig := bit2oct(ptmsi_sig_bits); + /* TODO: The UE shall fill the remaining 2 octets of the <P-TMSI signature> according to clauses 9.1.1, 9.4.1, 10.2.1, or + * 10.5.1 of 3GPP TS.33.401 [89] , as appropriate, for RAU/Attach procedures.*/ +} + +function rai_to_oct(in RoutingAreaIdentity rai) return OCT6 { + var OCT6 ret; + ret := hex2oct(rai.mcc_digits[1] & rai.mcc_digits[0]) & + hex2oct(rai.mnc_digits[2] & rai.mcc_digits[2]) & + hex2oct(rai.mnc_digits[1] & rai.mnc_digits[0]) & + rai.lac & rai.rac; + return ret; +} + +function raiv_to_gtp_rai(in RoutingAreaIdentificationV rai) return template (value) RoutingAreaIdentity { + return ts_RoutingAreaIdentity( + mcc_digits := rai.mccDigit1 & rai.mccDigit2 & rai.mccDigit3, + mnc_digits := rai.mccDigit3 & rai.mccDigit1 & rai.mccDigit2, + lac := rai.lac, + rac := rai.rac) +} + /* SGSN originated SGSN Context Request procedure (SGSN requests, we respond) * 3GPP TS 23.401, Figure D.3.5-1 "Routing Area Update procedure" */ private function f_TC_sgsn_context_req_out(charstring id) runs on BSSGP_ConnHdlr { var integer seq_nr := f_rnd_int(65535); var Gtp1cUnitdata gtpc_ud; - var OCT4 teidc := f_gtp_teic_random(); + /* Used by SGSN Ctx Req/Resp/Ack */ + var OCT4 ctx_teidc := f_gtp_teic_random(); + /* Used for the UE which is transmited via Ctx Response */ + var OCT4 pdp_teidc := f_gtp_teic_random(); timer T; + var RoutingAreaIdentificationV rai; + var P_TMSI_TypeTV p_tmsi_type; + var OCT3 p_tmsi_sig; + var OCT4 add_p_tmsi; + var RoutingAreaIdentificationV add_rai; + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); + + var Gtp1cPeer peer := { + connId := 1, + remName := mp_sgsn_gtp_ip, + remPort := GTP1C_PORT + } + g_pars.vec := f_gen_auth_vec_3g(); + + /* SGSN Context Req doesn't necessarily contain IMSI, hence expect it through TEID=0 */ + f_gtp1u_register_teid('00000000'O); + f_gtp1u_register_teid(ctx_teidc); + f_gtp1u_register_teid(pdp_teidc); + + g_pars.ra := f_random_RAI(); + var NAS_EPS_Types.GUTI guti := valueof(ts_NAS_GUTI( + mcc_mnc := g_pars.ra.mccDigit1 & g_pars.ra.mccDigit2 & g_pars.ra.mccDigit3 & + g_pars.ra.mncDigit3 & g_pars.ra.mncDigit1 & g_pars.ra.mncDigit2, + mmegi := '000c'O, + mmec := '06'O, + tmsi := '12345678'O)); + + guti2rai_ptmsi(guti, '8888'O, add_rai, add_p_tmsi, p_tmsi_sig); /* The MS goes to GERAN/UTRAN from an LTE cell */ - f_send_l3(ts_GMM_RAU_REQ(mi_lv := valueof(ts_MI_TMSI_LV('DE42DE42'O)), + f_send_l3(ts_GMM_RAU_REQ(mi_lv := valueof(ts_MI_TMSI_LV(add_p_tmsi)), upd_type := GPRS_UPD_T_RA, - old_ra := f_random_RAI()), 0); + old_ra := add_rai, + p_tmsi_sig := ts_PtmsiSigTV(p_tmsi_sig), + p_tmsi_type := ts_PtmsiTypeTV(c_GMM_PMTSI_TYPE_MAPPED), + ms_network_cap := ts_GMM_MsNetCapV + ), + 0); - + var GTPv1C_Templates.GTP_RATType rat_type := GTP_RAT_TYPE_EUTRAN; /* The SGSN has no idea about the MS and inquires the MME about it */ T.start(2.0); alt { - [] GTP[GTP_GGSN_IDX].receive(tr_GTPC_SGSNContextReq(?, ?)) -> value gtpc_ud { + [] GTP[GTP_GGSN_IDX].receive( + tr_GTPC_SGSNContextReq( + peer, + tr_SGSNContextReqPDU( + rai := raiv_to_gtp_rai(rai), + ptmsi := ts_PTMSI(add_p_tmsi), + ptmsi_sig := ts_PTMSI_sig(p_tmsi_sig), + rat_type := int2oct(enum2int(rat_type), 1)))) -> value gtpc_ud { log("Rx SGSN Context Req from SGSN"); setverdict(pass); T.stop; @@ -3189,24 +3281,39 @@ } /* The MME responds */ - var OCT8 kc := f_rnd_octstring(8); + var OCT16 ck := f_rnd_octstring(16); + var OCT16 ik := f_rnd_octstring(16); var template (value) PDP_Context_GTPC pdp_ctx; pdp_ctx := ts_PDP_Context_GTPC(pdp_addr := f_inet_addr("10.10.10.10"), ggsn_gsn_addr := f_inet_addr(mp_ggsn_ip), - apn := '08696E7465726E6574'O); + apn := '08696E7465726E6574'O, + ggsn_teic := pdp_teidc); var template (value) GTPC_PDUs ctx_rsp; + var OCT4 old_sgsn_remote_teid := gtpc_ud.gtpc.gtpc_pdu.sgsn_ContextRequest.teidControlPlane.teidControlPlane; ctx_rsp := ts_SGSNContextRespPDU(cause := GTP_CAUSE_REQUEST_ACCEPTED, imsi := g_pars.imsi, - teic := teidc, - mm_context := ts_MM_ContextGSM(kc), + teic := ctx_teidc, + mm_context := ts_MM_ContextUMTS(ck, ik), pdp_ctx_list := { pdp_ctx }); - GTP[GTP_GGSN_IDX].send(ts_GTPC_SGSNContextResp(gtpc_ud.peer, '12345678'O, seq_nr, ctx_rsp)); + GTP[GTP_GGSN_IDX].send(ts_GTPC_SGSNContextResp(gtpc_ud.peer, + old_sgsn_remote_teid, + oct2int(gtpc_ud.gtpc.opt_part.sequenceNumber), + ctx_rsp)); - /* TODO: Security Functions (auth/ciphering?) */ + /* TODO: Create a test case which fails at auth! */ + /* We expect a Send Auth Information and ignoring all keys received by the MME */ + T.start(2.0); + alt { + [] as_gmm_auth(umts_aka_challenge := true, expect_sai := true) {}; + [] T.timeout { + setverdict(fail, "Timeout waiting for SGSN SAI"); + mtc.stop; + } + } - /* The SGSN ACKs */ + /* Step 4: The SGSN ACKs */ T.start(2.0); alt { [] GTP[GTP_GGSN_IDX].receive(tr_GTPC_SGSNContextAck) -> value gtpc_ud { @@ -3220,8 +3327,30 @@ } } - /* TODO: Update PDP Context Req/Resp */ - /* TODO: 7..10 Update Location, ISD */ + /* 7..10 Update Location, ISD */ + T.start(2.0); + alt { + [] as_gmm_gsup_lu_isd(); + [] T.timeout { + setverdict(fail, "Timeout waiting for Update Location, ISD"); + mtc.stop; + } + } + + /* Step 5: There is no such step */ + /* Step 6: Update PDP Context Req/Resp */ + T.start(2.0); + alt { + [] as_ggsn_gtp_ctx_upd_req(apars, exp_dir_tun := false) { + log("Rx GTP PDP Context Update Request"); + setverdict(pass); + T.stop; + } + [] T.timeout { + setverdict(fail, "Timeout waiting for Update PDP Context Req"); + mtc.stop; + } + } /* RAU procedure completion */ T.start(2.0); diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index 338b9f5..2b565c4 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -82,6 +82,10 @@ FILES+="RANAP_Types.ttcn RANAP_Templates.ttcn RANAP_CodecPort.ttcn RANAP_EncDec.cc " gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.NAS_EPS_15.2.0.1/src +FILES="NAS_EPS_Types.ttcn" +gen_links $DIR $FILES + DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn " FILES+="RAW_NS.ttcnpp NS_Provider_IPL4.ttcn NS_Emulation.ttcnpp " @@ -91,6 +95,7 @@ FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcnpp " FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " FILES+="ITU_X213_Types.ttcn " +FILES+="NAS_EPS_Templates.ttcn " FILES+="RAN_Emulation.ttcnpp SCCP_Adapter.ttcnpp RAN_Adapter.ttcnpp SCCP_Templates.ttcn " # IPA_Emulation + dependencies FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc Native_Functions.ttcn Native_FunctionDefs.cc " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39017?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: I0666a518aed57c2594653ab6b0f801c4193fd2f3 Gerrit-Change-Number: 39017 Gerrit-PatchSet: 13 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in onomondo-eim[master]: rest_api_resource/response_schema: add spec ref for ICCID
by laforge 22 Aug '26

22 Aug '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/onomondo-eim/+/43207?usp=email ) Change subject: rest_api_resource/response_schema: add spec ref for ICCID ...................................................................... rest_api_resource/response_schema: add spec ref for ICCID This eIM accepts the ICCID in it raw form (as found in EF.ICCID). Let's add a spec ref so users can look up the exact format quicker. Related: SYS#8100 Change-Id: Idf6f29386b9b6df9255e10d0dd2909c7297709e4 --- M contrib/rest_api_resource_schema.json M contrib/rest_api_response_schema.json 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: jolly: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/rest_api_resource_schema.json b/contrib/rest_api_resource_schema.json index 2e0d330..0a7764b 100644 --- a/contrib/rest_api_resource_schema.json +++ b/contrib/rest_api_resource_schema.json @@ -42,7 +42,7 @@ "type": "object", "properties": { "iccid": { - "description": "ICCID of the profile. (ICCID in nibble-swapped raw format)", + "description": "ICCID of the profile. (ICCID in nibble-swapped raw format, see also ETSI TS 102 221, section 13.2)", "type": "string", "pattern": "^[0-9,A-F]{2,32}$" }, @@ -62,7 +62,7 @@ "type": "object", "properties": { "iccid": { - "description": "ICCID of the profile. (ICCID in nibble-swapped raw format)", + "description": "ICCID of the profile. (ICCID in nibble-swapped raw format, see also ETSI TS 102 221, section 13.2)", "type": "string", "pattern": "^[0-9,A-F]{2,32}$" } @@ -104,7 +104,7 @@ }, { "iccid": { - "description": "ICCID of the profile. (ICCID in nibble-swapped raw format)", + "description": "ICCID of the profile. (ICCID in nibble-swapped raw format, see also ETSI TS 102 221, section 13.2)", "type": "string", "pattern": "^[0-9,A-F]{2,32}$" } diff --git a/contrib/rest_api_response_schema.json b/contrib/rest_api_response_schema.json index 7ec2735..867baa4 100644 --- a/contrib/rest_api_response_schema.json +++ b/contrib/rest_api_response_schema.json @@ -93,7 +93,7 @@ "type": "object", "properties": { "iccid": { - "description": "ICCID of the profile. (ICCID in nibble-swapped raw format)", + "description": "ICCID of the profile. (ICCID in nibble-swapped raw format, see also ETSI TS 102 221, section 13.2)", "type": "string", "pattern": "^[0-9,A-F]{2,32}$" }, @@ -402,7 +402,7 @@ ] }, "iccid": { - "description": "ICCID of the profile. (ICCID in nibble-swapped raw format)", + "description": "ICCID of the profile. (ICCID in nibble-swapped raw format, see also ETSI TS 102 221, section 13.2)", "type": "string", "pattern": "^[0-9,A-F]{2,32}$" } -- To view, visit https://gerrit.osmocom.org/c/onomondo-eim/+/43207?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: onomondo-eim Gerrit-Branch: master Gerrit-Change-Id: Idf6f29386b9b6df9255e10d0dd2909c7297709e4 Gerrit-Change-Number: 43207 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[M] Change in onomondo-eim[master]: esipa_rest_utils: add support for PSMOs added in SGP.32 V.1.2
by laforge 22 Aug '26

22 Aug '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/onomondo-eim/+/42881?usp=email ) Change subject: esipa_rest_utils: add support for PSMOs added in SGP.32 V.1.2 ...................................................................... esipa_rest_utils: add support for PSMOs added in SGP.32 V.1.2 SGP.32 adds 3 additional PSMOs: - setFallbackAttribute - unsetFallbackAttribute - setDefaultDpAddress Change-Id: I03cdd70065a83dfc611d614cf32d817c13fad347 Related: SYS#8100 --- M contrib/rest_api_resource_schema.json M contrib/rest_api_response_schema.json M src/esipa_rest_utils.erl 3 files changed, 116 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve diff --git a/contrib/rest_api_resource_schema.json b/contrib/rest_api_resource_schema.json index a2a6812..2e0d330 100644 --- a/contrib/rest_api_resource_schema.json +++ b/contrib/rest_api_resource_schema.json @@ -157,6 +157,44 @@ "immediateEnableFlag" ] } + }, + { + "unsetFallbackAttribute": { + "description": "order the execution of a setFallbackAttribute PSMO, see also GSMA SGP.32, section 3.4.6", + "type": "object", + "properties": { + "iccid": { + "description": "ICCID of the profile. (ICCID in nibble-swapped raw format, see also ETSI TS 102 221, section 13.2)", + "type": "string", + "pattern": "^[0-9A-F]{18,20}$" + } + }, + "required": [ + "iccid" + ] + } + }, + { + "unsetFallbackAttribute": { + "description": "order the execution of a unsetFallbackAttribute PSMO, see also GSMA SGP.32, section 3.4.7", + "type": "object", + "properties": {} + } + }, + { + "setDefaultDpAddress": { + "description": "order the execution of a setDefaultDpAddress PSMO, see also GSMA SGP.32, section 5.9.25", + "type": "object", + "properties": { + "defaultDpAddress": { + "description": "Address of the default SM-DP+", + "type": "string" + } + }, + "required": [ + "defaultDpAddress" + ] + } } ] } diff --git a/contrib/rest_api_response_schema.json b/contrib/rest_api_response_schema.json index 60330bd..7ec2735 100644 --- a/contrib/rest_api_response_schema.json +++ b/contrib/rest_api_response_schema.json @@ -215,6 +215,42 @@ } }, { + "setFallbackAttributeResult": { + "description": "setFallbackAttributeResult PSMO result, see also SGP32Definitions.asn1", + "type": "string", + "enum": [ + "ok", + "iccidOrAidNotFound", + "fallbackNotAllowed", + "fallbackProfileEnabled", + "undefinedError" + ] + } + }, + { + "unsetFallbackAttributeResult": { + "description": "unsetFallbackAttributeResult PSMO result, see also SGP32Definitions.asn1", + "type": "string", + "enum": [ + "ok", + "noFallbackAttribute", + "fallbackProfileEnabled", + "commandError", + "undefinedError" + ] + } + }, + { + "setDefaultDpAddressResult": { + "description": "setDefaultDpAddressResult PSMO result, see also SGP32Definitions.asn1", + "type": "string", + "enum": [ + "ok", + "undefinedError" + ] + } + }, + { "addEimResult": { "description": "addEimResult eCO result", "type": "object", diff --git a/src/esipa_rest_utils.erl b/src/esipa_rest_utils.erl index c5ff285..d026dc0 100644 --- a/src/esipa_rest_utils.erl +++ b/src/esipa_rest_utils.erl @@ -156,6 +156,33 @@ error end. +psmo_to_asn_setFallbackAttribute(Psmo) -> + case Psmo of + {[{<<"iccid">>, Iccid}]} -> + {setFallbackAttribute, #{iccid => utils:hex_to_binary(Iccid)}}; + _ -> + logger:error("REST: order with bad setFallbackAttribute PSMO: ~p~n", [Psmo]), + error + end. + +psmo_to_asn_unsetFallbackAttribute(Psmo) -> + case Psmo of + {[]} -> + {unsetFallbackAttribute, #{}}; + _ -> + logger:error("REST: order with bad unsetFallbackAttribute PSMO: ~p~n", [Psmo]), + error + end. + +psmo_to_asn_setDefaultDpAddress(Psmo) -> + case Psmo of + {[{<<"defaultDpAddress">>, DefaultDpAddress}]} -> + {setDefaultDpAddress, #{defaultDpAddress => DefaultDpAddress}}; + _ -> + logger:error("REST: order with bad setDefaultDpAddress PSMO: ~p~n", [Psmo]), + error + end. + format_euicc_EuiccPackageSigned(EuiccPackage, EidValue, TransactionId) -> case EuiccPackage of error -> @@ -189,6 +216,12 @@ psmo_to_asn_getRAT(Psmo); {[{<<"configureImmediateEnable">>, Psmo}]} -> psmo_to_asn_configureImmediateEnable(Psmo); + {[{<<"setFallbackAttribute">>, Psmo}]} -> + psmo_to_asn_setFallbackAttribute(Psmo); + {[{<<"unsetFallbackAttribute">>, Psmo}]} -> + psmo_to_asn_unsetFallbackAttribute(Psmo); + {[{<<"setDefaultDpAddress">>, Psmo}]} -> + psmo_to_asn_setDefaultDpAddress(Psmo); _ -> logger:error("REST: order with unknown/unsupported PSMO: ~p~n", [PsmoOrder]), error @@ -416,6 +449,15 @@ result_to_json_getRATResult(GetRATResult); {configureImmediateEnableResult, ConfigureImmediateEnableResult} -> {[{configureImmediateEnableResult, ConfigureImmediateEnableResult}]}; + {setFallbackAttributeResult, SetFallbackAttributeResult} -> + {[{setFallbackAttributeResult, SetFallbackAttributeResult}]}; + {unsetFallbackAttributeResult, UnsetFallbackAttributeResult} -> + {[{unsetFallbackAttributeResult, UnsetFallbackAttributeResult}]}; + {setDefaultDpAddressResult, SetDefaultDpAddressResult} -> + {[ + {setDefaultDpAddressResult, + maps:get(setDefaultDpAddressResult, SetDefaultDpAddressResult)} + ]}; {addEimResult, AddEimResult} -> result_to_json_addEimResult(AddEimResult); {deleteEimResult, DeleteEimResult} -> -- To view, visit https://gerrit.osmocom.org/c/onomondo-eim/+/42881?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: onomondo-eim Gerrit-Branch: master Gerrit-Change-Id: I03cdd70065a83dfc611d614cf32d817c13fad347 Gerrit-Change-Number: 42881 Gerrit-PatchSet: 11 Gerrit-Owner: dexter <pmaier(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: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in onomondo-eim[master]: config: update sys.dev.config
by laforge 22 Aug '26

22 Aug '26

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/onomondo-eim/+/43209?usp=email ) Change subject: config: update sys.dev.config ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/onomondo-eim/+/43209?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: onomondo-eim Gerrit-Branch: master Gerrit-Change-Id: I4d8c91d787e6932fbcab7f0dcbdea620894a61c2 Gerrit-Change-Number: 43209 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 22 Aug 2026 08:01:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in onomondo-eim[master]: contrib: restructure REST API usage examples (tryme-scripts)
by laforge 22 Aug '26

22 Aug '26

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/onomondo-eim/+/43142?usp=email ) Change subject: contrib: restructure REST API usage examples (tryme-scripts) ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/onomondo-eim/+/43142?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: onomondo-eim Gerrit-Branch: master Gerrit-Change-Id: I4e42ce85c84b47d3561011083da4a1e54958fd8e Gerrit-Change-Number: 43142 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 22 Aug 2026 08:00:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in onomondo-eim[master]: esipa_rest_utils: use correct ASN.1 type for notificationsList
by laforge 22 Aug '26

22 Aug '26

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/onomondo-eim/+/43094?usp=email ) Change subject: esipa_rest_utils: use correct ASN.1 type for notificationsList ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/onomondo-eim/+/43094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: onomondo-eim Gerrit-Branch: master Gerrit-Change-Id: I997b566bf8175a508b30b2696f845a09ba78f266 Gerrit-Change-Number: 43094 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 22 Aug 2026 08:00:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log August 2026