- gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: sgsn: Validate Direct Tunnel Flags DTI=1 is set during UpdatePDPConte...
by pespin 25 Jul '24

25 Jul '24

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37598?usp=email to look at the new patch set (#4). 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: sgsn: Validate Direct Tunnel Flags DTI=1 is set during UpdatePDPContextReq ...................................................................... sgsn: Validate Direct Tunnel Flags DTI=1 is set during UpdatePDPContextReq Related: SYS#5435 Change-Id: Iadd30318d02fbc304f65840f2299e5ec8b5b08e9 --- M sgsn/BSSGP_ConnHdlr.ttcn 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/37598/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37598?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iadd30318d02fbc304f65840f2299e5ec8b5b08e9 Gerrit-Change-Number: 37598 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-ttcn3-hacks[master]: sgsn: Introduce test TC_attach_pdp_act_pmm_idle
by pespin 25 Jul '24

25 Jul '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37617?usp=email ) Change subject: sgsn: Introduce test TC_attach_pdp_act_pmm_idle ...................................................................... sgsn: Introduce test TC_attach_pdp_act_pmm_idle Change-Id: Id46ccd9db11c8b792e1c071de91ef092ed1544c7 --- M library/ranap/RANAP_Templates.ttcn M sgsn/BSSGP_ConnHdlr.ttcn M sgsn/SGSN_Tests_Iu.ttcn M sgsn/expected-results.xml 4 files changed, 149 insertions(+), 45 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/37617/1 diff --git a/library/ranap/RANAP_Templates.ttcn b/library/ranap/RANAP_Templates.ttcn index 7fb374d..a433d62 100644 --- a/library/ranap/RANAP_Templates.ttcn +++ b/library/ranap/RANAP_Templates.ttcn @@ -13,6 +13,7 @@ template (value) Cause ts_RanapCause_om_intervention := { misc := 113 }; template (value) Cause ts_RanapCause_nas_normal := { nAS := 83 }; +template (value) Cause ts_RanapCause_radio_conn_release := { radioNetwork := 40 }; template (value) Cause ts_RanapCause_radio_conn_lost := { radioNetwork := 46 }; /***************************************************************************************************** diff --git a/sgsn/BSSGP_ConnHdlr.ttcn b/sgsn/BSSGP_ConnHdlr.ttcn index 8a4f3a2..83036ba 100644 --- a/sgsn/BSSGP_ConnHdlr.ttcn +++ b/sgsn/BSSGP_ConnHdlr.ttcn @@ -494,9 +494,7 @@ /* IuPS case: Expect Iu Release */ if (is_iu(ran_index)) { - as_iu_release_compl_disc(); - /* Next message will be an InitialUE since conn was torn down */ - g_pars.rnc_send_initial_ue := true; + as_iu_release_compl_disc_ext(); } /* Race condition @@ -633,6 +631,7 @@ } function f_service_request(ServiceType service_type := SERVICE_TYPE_Signalling, + template (value) OCT2 pdp_status := '0000'O, integer ran_index := 0, float Tval := 2.0) runs on BSSGP_ConnHdlr { timer T := Tval; @@ -643,7 +642,10 @@ } - f_send_l3(ts_GMM_SERVICE_REQ(service_type, p_tmsi := g_pars.p_tmsi), ran_index); + f_send_l3(ts_GMM_SERVICE_REQ(service_type, + p_tmsi := g_pars.p_tmsi, + pdp_status := pdp_status), + ran_index); T.start; alt { @@ -656,6 +658,38 @@ } } +/* expect a IuReleaseCommand; Confirm that; expect SCCP-level N-DISCONNET.ind */ +altstep as_iu_release_compl_disc_ext() runs on BSSGP_ConnHdlr { + var RANAP_PDU ranap; + [] as_iu_release_compl_disc() { + /* Next message will be an InitialUE since conn was torn down */ + g_pars.rnc_send_initial_ue := true; + } +} + +function f_iu_release_req(template (value) Cause cause) runs on BSSGP_ConnHdlr { + timer T := 5.0; + BSSAP.send(ts_RANAP_IuReleaseRequest(cause)); + alt { + [] as_iu_release_compl_disc_ext() { T.stop; }; + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Timeout completing the Iu Release procedure"); + } + } +} + +altstep as_ranap_rab_ass_req(inout PdpActPars apars) runs on BSSGP_ConnHdlr { + var RANAP_PDU ranap; + [] BSSAP.receive(tr_RANAP_RabAssReq(?)) -> value ranap { + var RAB_ID rab_id := f_ranap_rab_ass_req_extract_rab_id(ranap); + /*TODO: validate received remote IP addr + TEID = apars.ggsn_ip_u + apars.ggsn_tei_u */ + var template (value) RAB_SetupOrModifiedList l; + l := ts_RAB_SMdL_ps(rab_id, oct2bit(apars.rnc_ip_u), apars.rnc_tei_u); + BSSAP.send(ts_RANAP_RabAssResp(l)); + } +} + type record PdpActPars { BIT3 tid, /* L3 Transaction ID */ BIT4 nsapi, /* SNDCP NSAPI */ @@ -693,25 +727,73 @@ f_gtp_register_teid(apars.ggsn_tei_c, GTP_GGSN_IDX); f_gtp_register_teid(apars.ggsn_tei_u, GTP_GGSN_IDX); } +private altstep as_ggsn_gtp_ctx_act_req(inout PdpActPars apars, boolean send_recovery := false) runs on BSSGP_ConnHdlr { + var Gtp1cUnitdata g_ud; + var template Recovery_gtpc recovery := omit; -function f_process_gtp_ctx_upd_req(inout PdpActPars apars, PDU_GTPC gtpc, integer ran_index := 0) runs on BSSGP_ConnHdlr { + [] GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) -> value g_ud { + f_process_gtp_ctx_act_req(apars, g_ud.gtpc); + if (send_recovery) { + recovery := ts_Recovery(apars.ggsn_restart_ctr); + } + var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); + GTP[GTP_GGSN_IDX].send(ts_GTPC_CreatePdpResp(g_ud.peer, seq_nr, + apars.sgsn_tei_c, apars.gtp_resp_cause, + apars.ggsn_tei_c, apars.ggsn_tei_u, + apars.nsapi, + apars.ggsn_ip_c, apars.ggsn_ip_u, apars.chg_id, + omit, recovery)); + } +} + +function f_process_gtp_ctx_upd_req(inout PdpActPars apars, + PDU_GTPC gtpc, + boolean exp_dir_tun := true, + integer ran_index := 0) runs on BSSGP_ConnHdlr { var UpdatePDPContextRequestSGSN upd := gtpc.gtpc_pdu.updatePDPContextRequest.updatePDPContextRequestSGSN; - - if (not ispresent(upd.directTunnelFlags) or upd.directTunnelFlags.dTI != '1'B) { + var boolean dti := ispresent(upd.directTunnelFlags) and upd.directTunnelFlags.dTI == '1'B; + if (dti != exp_dir_tun) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Rx UpdatePDPCtxReq with Direct Tunnel Flags ", - upd.directTunnelFlags, " vs exp DTI=1")); + upd.directTunnelFlags, " vs exp DTI=", dti)); } if (ispresent(upd.teidControlPlane.teidControlPlane)) { apars.sgsn_tei_c := upd.teidControlPlane.teidControlPlane; } - apars.sgsn_tei_u := upd.teidDataI.teidDataI; apars.sgsn_ip_c := upd.sgsn_addr_controlPlane.addressf; - apars.sgsn_ip_u := upd.sgsn_addr_traffic.addressf; - f_gtp_register_teid(apars.rnc_tei_u, ran2gtp_idx(ran_index)); - /* TODO: If "Direct Tunnel" flag, update apars.rnc_{tei,ip}_u instead, - * and store "direct_tunnel" in ggsn state */ + if (dti) { + if (apars.rnc_ip_u != upd.sgsn_addr_traffic.addressf or + apars.rnc_tei_u != upd.teidDataI.teidDataI) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx UpdatePDPCtxReq with DTI=1 and wrong RNC IP+TEID: ", + upd.sgsn_addr_traffic.addressf, ":", upd.teidDataI.teidDataI, + " vs exp ", apars.rnc_ip_u, ":", apars.rnc_tei_u)); + } + f_gtp_register_teid(apars.rnc_tei_u, ran2gtp_idx(ran_index)); + } else { + apars.sgsn_ip_u := upd.sgsn_addr_traffic.addressf; + apars.sgsn_tei_u := upd.teidDataI.teidDataI; + } +} +altstep as_ggsn_gtp_ctx_upd_req(inout PdpActPars apars, + boolean send_recovery := false, + boolean exp_dir_tun := true, + integer ran_index := 0) runs on BSSGP_ConnHdlr { + var Gtp1cUnitdata g_ud; + var template Recovery_gtpc recovery := omit; + + [] GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, updatePDPContextRequest, ?)) -> value g_ud { + f_process_gtp_ctx_upd_req(apars, g_ud.gtpc, + exp_dir_tun := exp_dir_tun, + ran_index := ran_index); + var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); + GTP[GTP_GGSN_IDX].send(ts_GTPC_UpdatePdpRespGGSN(g_ud.peer, seq_nr, + apars.sgsn_tei_c, apars.gtp_resp_cause, + apars.ggsn_tei_c, apars.ggsn_tei_u, + apars.ggsn_ip_c, apars.ggsn_ip_u, apars.chg_id, + omit, recovery)); + } } altstep as_pdp_ctx_act_gb(inout PdpActPars apars, integer ran_index := 0) runs on BSSGP_ConnHdlr { @@ -766,46 +848,20 @@ function f_pdp_ctx_act(inout PdpActPars apars, boolean send_recovery := false, integer ran_index := 0, float Tval := 5.0) runs on BSSGP_ConnHdlr { - var Gtp1cUnitdata g_ud; - var template Recovery_gtpc recovery := omit; timer T := Tval; f_send_l3(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, apars.apn, apars.pco), ran_index); - if (send_recovery) { - recovery := ts_Recovery(apars.ggsn_restart_ctr); - } - GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) -> value g_ud { - f_process_gtp_ctx_act_req(apars, g_ud.gtpc); - var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); - GTP[GTP_GGSN_IDX].send(ts_GTPC_CreatePdpResp(g_ud.peer, seq_nr, - apars.sgsn_tei_c, apars.gtp_resp_cause, - apars.ggsn_tei_c, apars.ggsn_tei_u, - apars.nsapi, - apars.ggsn_ip_c, apars.ggsn_ip_u, apars.chg_id, - omit, recovery)); - } + as_ggsn_gtp_ctx_act_req(apars, send_recovery := send_recovery); T.start; if (is_iu(ran_index)) { - var RANAP_PDU ranap; alt { - [] BSSAP.receive(tr_RANAP_RabAssReq(?)) -> value ranap { - var RAB_ID rab_id := f_ranap_rab_ass_req_extract_rab_id(ranap); - var template (value) RAB_SetupOrModifiedList l; - l := ts_RAB_SMdL_ps(rab_id, oct2bit(apars.rnc_ip_u), apars.rnc_tei_u); - BSSAP.send(ts_RANAP_RabAssResp(l)); - - GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, updatePDPContextRequest, ?)) -> value g_ud { - f_process_gtp_ctx_upd_req(apars, g_ud.gtpc, ran_index); - var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); - GTP[GTP_GGSN_IDX].send(ts_GTPC_UpdatePdpRespGGSN(g_ud.peer, seq_nr, - apars.sgsn_tei_c, apars.gtp_resp_cause, - apars.ggsn_tei_c, apars.ggsn_tei_u, - apars.ggsn_ip_c, apars.ggsn_ip_u, apars.chg_id, - omit, recovery)); - } + [] as_ranap_rab_ass_req(apars) { + as_ggsn_gtp_ctx_upd_req(apars, + send_recovery := send_recovery, + ran_index := ran_index); } [] T.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, @@ -815,7 +871,7 @@ } alt { - [] as_pdp_ctx_act(apars, ran_index) { setverdict(pass); } + [] as_pdp_ctx_act(apars, ran_index) { T.stop; setverdict(pass); } [is_gb(ran_index)] BSSGP[ran_index].receive { repeat; } [is_iu(ran_index)] BSSAP.receive { repeat; } [] T.timeout { diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn index 7ee4c51..40035ab 100644 --- a/sgsn/SGSN_Tests_Iu.ttcn +++ b/sgsn/SGSN_Tests_Iu.ttcn @@ -143,12 +143,49 @@ f_cleanup(); } +/* Test UE going to PMM IDLE state after having activated the PDP context. + * SGSN is expected to update the GGSN cancelling the Direct Tunnel feature. */ +private function f_TC_attach_pdp_act_pmm_idle(charstring id) runs on BSSGP_ConnHdlr { + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sctp_addr.local_ip_addr)); + + /* first perform regular attach */ + f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false, ran_index := 3); + + f_service_request(ran_index := 3); + + f_pdp_ctx_act(apars, ran_index := 3); + + f_iu_release_req(ts_RanapCause_radio_conn_release); + /* Now UE is in PMM IDLE state at the SGSN. + * Expect SGSN to point GTPU at GGSN back to itself: */ + as_ggsn_gtp_ctx_upd_req(apars, exp_dir_tun := false, ran_index := 3); + + /* Now UE tries to send new data after a while of being IDLE. + * SGSN recreates the Iu ctx and recovers the Direct Tunnel RNC<->GGSN: */ + f_service_request(pdp_status := '2000'O /*NSAPI=5*/, ran_index := 3); + as_ranap_rab_ass_req(apars); + as_ggsn_gtp_ctx_upd_req(apars, exp_dir_tun := true, ran_index := 3); + + /* Now UE is in PMM ENABLED state, tear it down to clean up: */ + f_pdp_ctx_deact_mo(apars, '00'O, ran_index := 3); + setverdict(pass); +} +testcase TC_attach_pdp_act_pmm_idle() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_pmm_idle), testcasename(), g_gb, 1001); + vc_conn.done; + f_cleanup(); +} + control { execute( TC_iu_attach() ); execute( TC_iu_attach_encr() ); execute( TC_iu_attach_geran_rau() ); execute( TC_geran_attach_iu_rau() ); execute( TC_attach_pdp_act_user() ); + execute( TC_attach_pdp_act_pmm_idle() ); } diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index 1e7367d..8b17802 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -93,6 +93,7 @@ <testcase classname='SGSN_Tests_Iu' name='TC_iu_attach_geran_rau' time='MASKED'/> <testcase classname='SGSN_Tests_Iu' name='TC_geran_attach_iu_rau' time='MASKED'/> <testcase classname='SGSN_Tests_Iu' name='TC_attach_pdp_act_user' time='MASKED'/> + <testcase classname='SGSN_Tests_Iu' name='TC_attach_pdp_act_pmm_idle' time='MASKED'/>  <testcase classname='SGSN_Tests_NS' name='TC_SNS_size' time='MASKED'/> <testcase classname='SGSN_Tests_NS' name='TC_SNS_size_too_big' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37617?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id46ccd9db11c8b792e1c071de91ef092ed1544c7 Gerrit-Change-Number: 37617 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ggsn[master]: gtp: Allow tx Direct Tunnel Flags in UpdatePDPCtx{Req,Resp}
by pespin 25 Jul '24

25 Jul '24

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/37594?usp=email ) Change subject: gtp: Allow tx Direct Tunnel Flags in UpdatePDPCtx{Req,Resp} ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/37594?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I36d93619e2fe9cafd3092515df18b82d29099d2d Gerrit-Change-Number: 37594 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 25 Jul 2024 17:18:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-sgsn[master]: gtp: Set Direct Tunnel Flags DTI during UpdatePDPCtx
by pespin 25 Jul '24

25 Jul '24

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37596?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: gtp: Set Direct Tunnel Flags DTI during UpdatePDPCtx ...................................................................... gtp: Set Direct Tunnel Flags DTI during UpdatePDPCtx This is required as per TS 28.060 to tell the GGSN that the remote Address/TEID it is receiving it's the one of the RNC. Upon receiving a GTPU Error Indication, the GGSN knowing it's using DirectTunnel, can then update the SGSN with UpdatePDPContextReq with Direct Tunnel Flags DTI=1 EI=1 and then the SGSN can decide whether reconfigure the Direct Tunnel or switch to 2-leg tunnel until the connection with RNC/UE can be reestablished. Depends: osmo-ggsn.git Change-Id Ia3e360a35d30858eab1e438dc2508fd756c2e22e Related: SYS#5435 Change-Id: Iefe73eeea41df0c55db673194c9e9547504cbf0d --- M src/sgsn/gprs_mm_state_iu_fsm.c M src/sgsn/gprs_ranap.c 2 files changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/96/37596/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37596?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iefe73eeea41df0c55db673194c9e9547504cbf0d Gerrit-Change-Number: 37596 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-ttcn3-hacks[master]: ggsn: Fix function name
by pespin 25 Jul '24

25 Jul '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37616?usp=email ) Change subject: ggsn: Fix function name ...................................................................... ggsn: Fix function name The function is used to handle a UpdatePDPCtxResp, not a Req. While at it, mark the function as private. Change-Id: Ia455af1cd64ffce53b454e611c4fc85816e785bc --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/37616/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 23a9924..3f373aa 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -472,7 +472,7 @@ setverdict(pass); } - function f_handle_update_req(inout PdpContext ctx, in Gtp1cUnitdata ud, in OCT1 exp_cause := '80'O) runs on GT_CT { + private function f_handle_update_resp(inout PdpContext ctx, in Gtp1cUnitdata ud, in OCT1 exp_cause := '80'O) runs on GT_CT { var UpdatePDPContextResponseGGSN upr := ud.gtpc.gtpc_pdu.updatePDPContextResponse.updatePDPContextResponseGGSN; if (exp_cause == '80'O and exp_cause == upr.cause.causevalue) { ctx.teid_remote := upr.teidDataI.teidDataI; @@ -828,7 +828,7 @@ d := activate(pingpong()); alt { [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, updatePDPContextResponse, ctx.teic)) -> value ud { - f_handle_update_req(ctx, ud, exp_cause); + f_handle_update_resp(ctx, ud, exp_cause); } } deactivate(d); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37616?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia455af1cd64ffce53b454e611c4fc85816e785bc Gerrit-Change-Number: 37616 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: sgsn: Validate Direct Tunnel Flags DTI=1 is set during UpdatePDPConte...
by pespin 25 Jul '24

25 Jul '24

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37598?usp=email to look at the new patch set (#3). 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: sgsn: Validate Direct Tunnel Flags DTI=1 is set during UpdatePDPContextReq ...................................................................... sgsn: Validate Direct Tunnel Flags DTI=1 is set during UpdatePDPContextReq Related: SYS#5435 Change-Id: Iadd30318d02fbc304f65840f2299e5ec8b5b08e9 --- M sgsn/BSSGP_ConnHdlr.ttcn 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/37598/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37598?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iadd30318d02fbc304f65840f2299e5ec8b5b08e9 Gerrit-Change-Number: 37598 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: pySim-shell: clean up method calls in do_switch_channel
by Jenkins Builder 25 Jul '24

25 Jul '24

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37615?usp=email ) Change subject: pySim-shell: clean up method calls in do_switch_channel ...................................................................... Patch Set 1: (1 comment) File pySim/runtime.py: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-17309): https://gerrit.osmocom.org/c/pysim/+/37615/comment/198539ea_34e6a935 PS1, Line 582: """Unregister command set that is associated with the currently seleted file""" 'seleted' may be misspelled - perhaps 'selected'? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37615?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie5e5f45787abaaf032e1b49f51d447653cf2c996 Gerrit-Change-Number: 37615 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 25 Jul 2024 15:57:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: pySim-shell: fix reset command
by dexter 25 Jul '24

25 Jul '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37614?usp=email ) Change subject: pySim-shell: fix reset command ...................................................................... pySim-shell: fix reset command The reset command resets the card using the card object. This unfortunately leaves the RuntimeState uninformed about the event. However, the RuntimeState class also has a reset method that resets the card and the RuntimeState. Let's use this reset method. Also fix this method so that it ensures that the SCP is also no longer present. Related: OS#6092 Change-Id: I1ad29c9e7ce7d80bebc92fa173ed7a44ee4c2998 --- M pySim-shell.py M pySim/runtime.py 2 files changed, 21 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/14/37614/1 diff --git a/pySim-shell.py b/pySim-shell.py index 2eb37ea..e99c365 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -265,10 +265,8 @@ @cmd2.with_category(CUSTOM_CATEGORY) def do_reset(self, opts): """Reset the Card.""" - atr = self.card.reset() - if self.lchan and self.lchan.scc.scp: - self.lchan.scc.scp = None - self.poutput('Card ATR: %s' % i2h(atr)) + atr = self.rs.reset(self) + self.poutput('Card ATR: %s' % atr) self.update_prompt() class InterceptStderr(list): diff --git a/pySim/runtime.py b/pySim/runtime.py index a56df4d..db1641f 100644 --- a/pySim/runtime.py +++ b/pySim/runtime.py @@ -134,10 +134,13 @@ """ # delete all lchan != 0 (basic lchan) for lchan_nr in list(self.lchan.keys()): + self.lchan[lchan_nr].scc.scp = None if lchan_nr == 0: continue del self.lchan[lchan_nr] atr = i2h(self.card.reset()) + if (cmd_app): + cmd_app.lchan = self.lchan[0] # select MF to reset internal state and to verify card really works self.lchan[0].select('MF', cmd_app) self.lchan[0].selected_adf = None -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37614?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1ad29c9e7ce7d80bebc92fa173ed7a44ee4c2998 Gerrit-Change-Number: 37614 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: pySim-shell: clean up method calls in do_switch_channel
by dexter 25 Jul '24

25 Jul '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37615?usp=email ) Change subject: pySim-shell: clean up method calls in do_switch_channel ...................................................................... pySim-shell: clean up method calls in do_switch_channel The function do_switch_channel method calls methods in RuntimeLchan that should be private. There is also a code duplication in RuntimeLchan that should be cleaned up. Related: OS#6092 Change-Id: Ie5e5f45787abaaf032e1b49f51d447653cf2c996 --- M pySim-shell.py M pySim/runtime.py 2 files changed, 29 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/15/37615/1 diff --git a/pySim-shell.py b/pySim-shell.py index e99c365..8f654bd 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -859,9 +859,9 @@ @cmd2.with_argparser(switch_chan_parser) def do_switch_channel(self, opts): """Switch currently active logical channel.""" - self._cmd.lchan._select_pre(self._cmd) + self._cmd.lchan.unregister_cmds(self._cmd) self._cmd.lchan = self._cmd.rs.lchan[opts.chan_nr] - self._cmd.lchan._select_post(self._cmd) + self._cmd.lchan.register_cmds(self._cmd) self._cmd.update_prompt() def do_status(self, opts): diff --git a/pySim/runtime.py b/pySim/runtime.py index db1641f..71bf8d9 100644 --- a/pySim/runtime.py +++ b/pySim/runtime.py @@ -262,7 +262,8 @@ raise ValueError( "Cannot select unknown file by name %s, only hexadecimal 4 digit FID is allowed" % fid) - self._select_pre(cmd_app) + # unregister commands of old file + self.unregister_cmds(cmd_app) try: # We access the card through the select_file method of the scc object. @@ -295,12 +296,6 @@ self._select_post(cmd_app, f, data) - def _select_pre(self, cmd_app): - # unregister commands of old file - if cmd_app and self.selected_file.shell_commands: - for c in self.selected_file.shell_commands: - cmd_app.unregister_command_set(c) - def _select_post(self, cmd_app, file:Optional[CardFile] = None, select_resp_data = None): # we store some reference data (see above) about the currently selected file. # This data must be updated after every select. @@ -316,9 +311,7 @@ self.selected_file_fcp = None # register commands of new file - if cmd_app and self.selected_file.shell_commands: - for c in self.selected_file.shell_commands: - cmd_app.register_command_set(c) + self.register_cmds(cmd_app) def select_file(self, file: CardFile, cmd_app=None): """Select a file (EF, DF, ADF, MF, ...). @@ -331,7 +324,9 @@ inter_path = self.selected_file.build_select_path_to(file) if not inter_path: raise RuntimeError('Cannot determine path from %s to %s' % (self.selected_file, file)) - self._select_pre(cmd_app) + + # unregister commands of old file + self.unregister_cmds(cmd_app) # be sure the variables that we pass to _select_post contain valid values. selected_file = self.selected_file @@ -577,8 +572,14 @@ raise TypeError("Only works with BER-TLV EF") return self.scc.set_data(self.selected_file.fid, tag, data_hex, conserve=self.rs.conserve_write) + def register_cmds(self, cmd_app=None): + """Register command set that is associated with the currently selected file""" + if cmd_app and self.selected_file.shell_commands: + for c in self.selected_file.shell_commands: + cmd_app.register_command_set(c) + def unregister_cmds(self, cmd_app=None): - """Unregister all file specific commands.""" + """Unregister command set that is associated with the currently seleted file""" if cmd_app and self.selected_file.shell_commands: for c in self.selected_file.shell_commands: cmd_app.unregister_command_set(c) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37615?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie5e5f45787abaaf032e1b49f51d447653cf2c996 Gerrit-Change-Number: 37615 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: runtime: add missing docstring
by dexter 25 Jul '24

25 Jul '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37608?usp=email ) Change subject: runtime: add missing docstring ...................................................................... runtime: add missing docstring Change-Id: Iee2702c5326f1ec2a32c40b675ba1647387c40c8 Related: OS#6092 --- M pySim/runtime.py 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/08/37608/1 diff --git a/pySim/runtime.py b/pySim/runtime.py index 3ef9b2d..5a93645 100644 --- a/pySim/runtime.py +++ b/pySim/runtime.py @@ -402,6 +402,7 @@ return self.selected_file.decode_select_response(data) def get_file_for_selectable(self, name: str): + """Get the related CardFile object for a specified filename.""" sels = self.selected_file.get_selectables() return sels[name] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37608?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iee2702c5326f1ec2a32c40b675ba1647387c40c8 Gerrit-Change-Number: 37608 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log