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

[M] Change in osmo-bts[master]: pcu_sock: use PCUIF version 11 (direct TLLI)
by laforge 28 Jun '23

28 Jun '23

Attention is currently required from: fixeria, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33522 ) Change subject: pcu_sock: use PCUIF version 11 (direct TLLI) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I25816ac12e63cc6b641eb414e6bc7eaa9c85fc25 Gerrit-Change-Number: 33522 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Jun 2023 12:24:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmo-sccp[master]: vty: Improve output of show cs7 instance <0-15> asp
by laforge 28 Jun '23

28 Jun '23

Attention is currently required from: osmith, pespin, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/33518 ) Change subject: vty: Improve output of show cs7 instance <0-15> asp ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/osmo_ss7_vty.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/33518/comment/784ba552_53a89083 PS3, Line 829: --- > Ack FYI: The original layout/syntax was chosen to be 100% "ASCII output compatible" witht the Cisco ITP. I'm not sayign we ever had a strict requirement to be *that* much compatible. Just explaining why it is how it is. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33518 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id22bd4e74fb6f79950adba58862d379203d36760 Gerrit-Change-Number: 33518 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Jun 2023 12:23:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: stream: Rename static function to have correct prefix
by laforge 28 Jun '23

28 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33523 ) Change subject: stream: Rename static function to have correct prefix ...................................................................... stream: Rename static function to have correct prefix That function is used by the srv_link object, not the srv object. Rename it to avoid confusion. Change-Id: I1a3870b3a269b84ac2a9285ee6fe3389c5c96a94 --- M src/stream.c 1 file changed, 14 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/stream.c b/src/stream.c index fdc1cc1..f007cc4 100644 --- a/src/stream.c +++ b/src/stream.c @@ -1151,7 +1151,7 @@ int flags; }; -static int osmo_stream_srv_ofd_cb(struct osmo_fd *ofd, unsigned int what) +static int osmo_stream_srv_link_ofd_cb(struct osmo_fd *ofd, unsigned int what) { int ret; int sock_fd; @@ -1227,7 +1227,7 @@ link->sk_domain = AF_UNSPEC; link->sk_type = SOCK_STREAM; link->proto = IPPROTO_TCP; - osmo_fd_setup(&link->ofd, -1, OSMO_FD_READ | OSMO_FD_WRITE, osmo_stream_srv_ofd_cb, link, 0); + osmo_fd_setup(&link->ofd, -1, OSMO_FD_READ | OSMO_FD_WRITE, osmo_stream_srv_link_ofd_cb, link, 0); return link; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I1a3870b3a269b84ac2a9285ee6fe3389c5c96a94 Gerrit-Change-Number: 33523 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-mgw[master]: mgcp_client: check rc of map_str_to_codec
by laforge 28 Jun '23

28 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33527 ) Change subject: mgcp_client: check rc of map_str_to_codec ...................................................................... mgcp_client: check rc of map_str_to_codec Abort with error log when map_str_to_codec is -1, instead of writing it as unsigned integer into ptmap[i].codec. Related: OS#6074 Change-Id: I08b91c849d810fe3cdb72c0f6f2a558b7377deab --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 21 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index d901c4d..75c7b14 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -371,7 +371,7 @@ { unsigned int pt; char codec_resp[64]; - enum mgcp_codecs codec; + int rc; #define A_PTIME "a=ptime:" #define A_RTPMAP "a=rtpmap:" @@ -392,9 +392,14 @@ LOGP(DLMGCP, LOGL_ERROR, "No more space in ptmap array (len=%u)\n", r->ptmap_len); return -ENOSPC; } - codec = map_str_to_codec(codec_resp); + rc = map_str_to_codec(codec_resp); + if (rc < 0) { + LOGP(DLMGCP, LOGL_ERROR, + "Failed to parse SDP parameter, can't parse codec in rtpmap: %s\n", osmo_quote_str(line, -1)); + return -EINVAL; + } r->ptmap[r->ptmap_len].pt = pt; - r->ptmap[r->ptmap_len].codec = codec; + r->ptmap[r->ptmap_len].codec = rc; r->ptmap_len++; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I08b91c849d810fe3cdb72c0f6f2a558b7377deab Gerrit-Change-Number: 33527 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-mgw[master]: mgcp_client: check rc of map_str_to_codec
by laforge 28 Jun '23

28 Jun '23

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33527 ) Change subject: mgcp_client: check rc of map_str_to_codec ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I08b91c849d810fe3cdb72c0f6f2a558b7377deab Gerrit-Change-Number: 33527 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Jun 2023 12:21:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: SGSN_Tests: fix TC_attach_timeout_after_pdp_act
by laforge 28 Jun '23

28 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33465 ) Change subject: SGSN_Tests: fix TC_attach_timeout_after_pdp_act ...................................................................... SGSN_Tests: fix TC_attach_timeout_after_pdp_act This patch fixes several problems: * missing "vc_conn.done": the actual testsuite logic, which can be found in f_TC_attach_timeout_after_pdp_act(), was never executed fully because we did not wait for the BSSGP_ConnHdlr to complete; * too short Tguard value: the testsuite logic takes slightly more time to complete than the default timeout of 30.0 seconds; * osmo-sgsn does not require authentication for the second ATTACH.req: the testsuite logic gets stuck in f_gmm_auth() after sending the second ATTACH.req because: ** osmo-sgsn is waiting for a response to GMM IDENTITY REQUEST, ** osmo-sgsn does not send GSUP SendAuthInfo.req again. As can be seen from the test execution artifacts on Jenkins, this testcase never passed: either failing due to an error, or declaring no verdict at all. The average execution time is 650 ms. Change-Id: Ibaf2134247153471bd45d7a7f91155294c6c6de5 Fixes: 3ede9e32b "sgsn: Add TC_attach_timeout_after_pdp_act" Closes: OS#4221 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 46 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 3946058..88cbbb1 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1030,17 +1030,28 @@ var template PDU_L3_MS_SGSN attach_req; timer t_receive_GMM_ATTACH_ACCEPT; var RoutingAreaIdentificationV rai := f_random_RAI(); + timer T; /* First establish PDP context */ f_TC_attach(id); f_pdp_ctx_act(apars); - /* Now, try another GPRS attach procedure. For further code comments up until receiving the attach - * accept from the SGSN, see definition of f_gmm_attach() */ + /* Now, try another GPRS attach procedure. Note that osmo-sgsn does not require + * authentication for the second GMM ATTACH REQUEST, so we expect GSUP UPDATE + * LOCATION REQUEST and optionally a GMM IDENTITY REQUEST (IMEI). */ attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), rai, false, false, omit, omit); f_send_l3(attach_req, ran_index); - f_gmm_auth(false, false, ran_index); - as_gmm_gsup_lu_isd(); + + T.start(1.0); + alt { + [] as_gmm_gsup_lu_isd(); + [] as_mm_identity(ran_index); + [] as_xid(apars, ran_index); + [] T.timeout { + setverdict(fail, "Timeout waiting for GSUP UPDATE LOCATION REQUEST"); + return; + } + } BSSGP[ran_index].clear; log("Trying to receive ", gmm_attach_repeats, " ATTACH ACCEPTs"); @@ -1071,7 +1082,9 @@ testcase TC_attach_timeout_after_pdp_act() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_timeout_after_pdp_act), testcasename(), g_gb, 21); + vc_conn := f_start_handler(refers(f_TC_attach_timeout_after_pdp_act), + testcasename(), g_gb, 21, t_guard := 45.0); + vc_conn.done; f_cleanup(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33465 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibaf2134247153471bd45d7a7f91155294c6c6de5 Gerrit-Change-Number: 33465 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein <arehbein(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> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ttcn3-hacks[master]: SGSN_Tests: fix compilation warnings (template restrictions)
by laforge 28 Jun '23

28 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33520 ) Change subject: SGSN_Tests: fix compilation warnings (template restrictions) ...................................................................... SGSN_Tests: fix compilation warnings (template restrictions) This patch fixes multiple compilation warnings like this one: Inadequate restriction on the referenced template variable `attach_req', this may cause a dynamic test case error at runtime Change-Id: Iee7760d3dcf2a35d7fe612ed80dc13c1d11e0897 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 27 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 88cbbb1..ac25caa 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -757,7 +757,7 @@ auth_ciph_req.msgs.gprs_mm.authenticationAndCipheringRequest.authenticationParameterAUTN := autn; l3_mt := f_receive_l3(auth_ciph_req, ran_index); var BIT4 ac_ref := l3_mt.msgs.gprs_mm.authenticationAndCipheringRequest.acReferenceNumber.valueField; - var template PDU_L3_MS_SGSN auth_ciph_resp := ts_GMM_AUTH_RESP_2G(ac_ref, g_pars.vec.sres); + var template (value) PDU_L3_MS_SGSN auth_ciph_resp := ts_GMM_AUTH_RESP_2G(ac_ref, g_pars.vec.sres); if (umts_aka_challenge and not force_gsm_sres) { /* set UMTS response instead */ @@ -885,7 +885,7 @@ friend function f_gmm_attach(boolean umts_aka_challenge, boolean force_gsm_sres, integer ran_index := 0, template (omit) RoutingAreaIdentificationV old_ra := omit) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra_val; - var template PDU_L3_MS_SGSN attach_req; + var template (value) PDU_L3_MS_SGSN attach_req; var PDU_L3_SGSN_MS l3_mt; if (istemplatekind(old_ra, "omit")) { @@ -1027,7 +1027,7 @@ const integer gmm_attach_repeats := 5; /* See TS 24.008 Rel. 16 Table 11.4 */ const float T3350 := 6.0; - var template PDU_L3_MS_SGSN attach_req; + var template (value) PDU_L3_MS_SGSN attach_req; timer t_receive_GMM_ATTACH_ACCEPT; var RoutingAreaIdentificationV rai := f_random_RAI(); timer T; @@ -2630,7 +2630,7 @@ friend function f_routing_area_update(RoutingAreaIdentificationV ra, integer ran_index := 0) runs on BSSGP_ConnHdlr { var PDU_L3_SGSN_MS l3_mt; var PDU_DTAP_PS_MT mt; - var template OCT4 p_tmsi := omit; + var template (omit) OCT4 p_tmsi := omit; if (is_iu(ran_index)) { p_tmsi := g_pars.p_tmsi; @@ -2807,7 +2807,7 @@ private function f_TC_attach_usim_resync(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - var template PDU_L3_MS_SGSN attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit); + var template (value) PDU_L3_MS_SGSN attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit); /* send Attach Request */ /* indicate R99 capability of the MS to enable UMTS AKA in presence of @@ -2879,7 +2879,7 @@ auth_ciph_req.msgs.gprs_mm.authenticationAndCipheringRequest.authenticationParameterAUTN := autn; BSSGP[0].receive(auth_ciph_req) -> value l3_mt; var BIT4 ac_ref := l3_mt.msgs.gprs_mm.authenticationAndCipheringRequest.acReferenceNumber.valueField; - var template PDU_L3_MS_SGSN auth_ciph_resp := ts_GMM_AUTH_RESP_2G(ac_ref, g_pars.vec.sres); + var template (value) PDU_L3_MS_SGSN auth_ciph_resp := ts_GMM_AUTH_RESP_2G(ac_ref, g_pars.vec.sres); auth_ciph_resp := ts_GMM_AUTH_RESP_2G(ac_ref, g_pars.vec.sres); auth_ciph_resp.msgs.gprs_mm.authenticationAndCipheringResponse.authenticationParResp := { valueField := substr(g_pars.vec.res, 0, 4) @@ -2936,7 +2936,7 @@ private function f_TC_attach_usim_crypt(OCT1 netcap_a2345, BIT3 auth_req_ciph) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - var template PDU_L3_MS_SGSN attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit); + var template (value) PDU_L3_MS_SGSN attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit); attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.spare_octets := netcap_a2345; /* GEA2345... */ /* send Attach Request */ @@ -3192,7 +3192,7 @@ var RoutingAreaIdentificationV old_ra := f_random_RAI(); var RoutingAreaIdentificationV new_ra := f_random_RAI(); while (old_ra == new_ra) { new_ra := f_random_RAI(); }; - var template PDU_L3_MS_SGSN attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit); + var template (value) PDU_L3_MS_SGSN attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit); var PDU_L3_SGSN_MS l3_mt; f_send_l3(attach_req, 0); @@ -3392,9 +3392,9 @@ var template RIM_Routing_Address dst_addr; var template RIM_Routing_Address src_addr; - var template RAN_Information_Request_RIM_Container req_cont; - var template RAN_Information_RIM_Container res_cont; - var template PDU_BSSGP bssgp_rim_pdu; + var template (value) RAN_Information_Request_RIM_Container req_cont; + var template (value) RAN_Information_RIM_Container res_cont; + var template (value) PDU_BSSGP bssgp_rim_pdu; var template PDU_BSSGP bssgp_rim_pdu_expect; dst_addr := t_RIM_Routing_Address_cid(g_gb[1].cfg.bvc[0].cell_id); @@ -3520,8 +3520,8 @@ /* Now also emulate also the response as well and send it back on GB interface #1. Expect the result on * GTPC */ - var template RAN_Information_RIM_Container res_cont; - var template PDU_BSSGP bssgp_rim_pdu; + var template (value) RAN_Information_RIM_Container res_cont; + var template (value) PDU_BSSGP bssgp_rim_pdu; res_cont := ts_RAN_Information_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), ts_RIM_Sequence_Number(2), ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iee7760d3dcf2a35d7fe612ed80dc13c1d11e0897 Gerrit-Change-Number: 33520 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ttcn3-hacks[master]: SGSN_Tests: turn f_gmm_gsup_lu_isd() into an altstep
by laforge 28 Jun '23

28 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33519 ) Change subject: SGSN_Tests: turn f_gmm_gsup_lu_isd() into an altstep ...................................................................... SGSN_Tests: turn f_gmm_gsup_lu_isd() into an altstep This way it can be used in the alt statements. Change-Id: I1baaf6ed66cfaa75237b0abdce82ffdc7e672b96 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 24 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 7cdf72c..3946058 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -872,15 +872,14 @@ } } -private function f_gmm_gsup_lu_isd() runs on BSSGP_ConnHdlr { - var GSUP_PDU gsup; - /* Expect MSC to perform LU with HLR */ - GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); - gsup := valueof(ts_GSUP_ISD_REQ(g_pars.imsi, g_pars.msisdn)); - gsup.ies := gsup.ies & { valueof(ts_GSUP_IE_PdpInfo(char2oct("*"), '0121'O, ''O)) }; - GSUP.send(gsup); - GSUP.receive(tr_GSUP_ISD_RES(g_pars.imsi)); - GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); +private altstep as_gmm_gsup_lu_isd() runs on BSSGP_ConnHdlr { + [] GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)) { + var GSUP_PDU gsup := valueof(ts_GSUP_ISD_REQ(g_pars.imsi, g_pars.msisdn)); + gsup.ies := gsup.ies & { valueof(ts_GSUP_IE_PdpInfo(char2oct("*"), '0121'O, ''O)) }; + GSUP.send(gsup); + GSUP.receive(tr_GSUP_ISD_RES(g_pars.imsi)); + GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); + } } friend function f_gmm_attach(boolean umts_aka_challenge, boolean force_gsm_sres, integer ran_index := 0, @@ -906,7 +905,7 @@ f_send_l3(attach_req, ran_index); f_gmm_auth(umts_aka_challenge, force_gsm_sres, ran_index); /* Expect SGSN to perform LU with HLR */ - f_gmm_gsup_lu_isd(); + as_gmm_gsup_lu_isd(); l3_mt := f_receive_l3(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?), ran_index); f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept, ran_index); @@ -1041,7 +1040,7 @@ attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), rai, false, false, omit, omit); f_send_l3(attach_req, ran_index); f_gmm_auth(false, false, ran_index); - f_gmm_gsup_lu_isd(); + as_gmm_gsup_lu_isd(); BSSGP[ran_index].clear; log("Trying to receive ", gmm_attach_repeats, " ATTACH ACCEPTs"); @@ -1216,7 +1215,7 @@ f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, true, false, omit, omit)); f_gmm_auth(); /* Expect MSC to perform LU with HLR */ - f_gmm_gsup_lu_isd(); + as_gmm_gsup_lu_isd(); BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)) -> value l3_mt { f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); @@ -2579,7 +2578,7 @@ f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); f_gmm_auth(); /* Expect SGSN to perform LU with HLR */ - f_gmm_gsup_lu_isd(); + as_gmm_gsup_lu_isd(); timer T := 10.0; T.start; @@ -2887,7 +2886,7 @@ deactivate(di); /* Expect SGSN to perform LU with HLR */ - f_gmm_gsup_lu_isd(); + as_gmm_gsup_lu_isd(); BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)) -> value l3_mt { f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1baaf6ed66cfaa75237b0abdce82ffdc7e672b96 Gerrit-Change-Number: 33519 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ttcn3-hacks[master]: SGSN_Tests: fix compilation warnings (template restrictions)
by laforge 28 Jun '23

28 Jun '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33520 ) Change subject: SGSN_Tests: fix compilation warnings (template restrictions) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iee7760d3dcf2a35d7fe612ed80dc13c1d11e0897 Gerrit-Change-Number: 33520 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Jun 2023 12:20:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: SGSN_Tests: turn f_gmm_gsup_lu_isd() into an altstep
by laforge 28 Jun '23

28 Jun '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33519 ) Change subject: SGSN_Tests: turn f_gmm_gsup_lu_isd() into an altstep ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1baaf6ed66cfaa75237b0abdce82ffdc7e672b96 Gerrit-Change-Number: 33519 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Jun 2023 12:19:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0