- gerrit-log - lists.osmocom.org

[M] Change in pysim[master]: pySim-shell: turn "ADF-escape-code" into an lchan method.
by laforge 27 Jul '24

27 Jul '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37613?usp=email ) Change subject: pySim-shell: turn "ADF-escape-code" into an lchan method. ...................................................................... pySim-shell: turn "ADF-escape-code" into an lchan method. When we traverse the file system using the command "export" we will also select all ADFs but not all ADFs may have UICC file system support. This makes it impossible to exit those ADFs again. To exit anyway we select an application with filesystem support first and then the parent EF we wanted to select originally. This method may not only be useful when traversing the filesystem, so let's put it into the RuntimeLchan class and change it a little so that it would also work if the ADF in question is an a sub DF. Related: OS#6092 Change-Id: I72de51bc7519fafbcc71d829719a8af35d774342 --- M pySim-shell.py M pySim/runtime.py 2 files changed, 50 insertions(+), 26 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim-shell.py b/pySim-shell.py index 4f5959b..2eb37ea 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -535,32 +535,7 @@ # below, so we must not move up. if skip_df == False: self.walk(indent + 1, action_ef, action_df, context, **kwargs) - - parent = self._cmd.lchan.selected_file.parent - df = self._cmd.lchan.selected_file - adf = self._cmd.lchan.selected_adf - if isinstance(parent, CardMF) and (adf and adf.has_fs == False): - # Not every application that may be present on a GlobalPlatform card will support the SELECT - # command as we know it from ETSI TS 102 221, section 11.1.1. In fact the only subset of - # SELECT we may rely on is the OPEN SELECT command as specified in GlobalPlatform Card - # Specification, section 11.9. Unfortunately the OPEN SELECT command only supports the - # "select by name" method, which means we can only select an application and not a file. - # The consequence of this is that we may get trapped in an application that does not have - # ISIM/USIM like file system support and the only way to leave that application is to select - # an ISIM/USIM application in order to get the file system access back. - # - # To automate this escape-route while traversing the file system we will check whether - # the parent file is the MF. When this is the case and the selected ADF has no file system - # support, we will select an arbitrary ADF that has file system support first and from there - # we will then select the MF. - for selectable in parent.get_selectables().items(): - if isinstance(selectable[1], CardADF) and selectable[1].has_fs == True: - self._cmd.lchan.select(selectable[1].name, self._cmd) - break - self._cmd.lchan.select(df.get_mf().name, self._cmd) - else: - # Normal DF/ADF selection - fcp_dec = self._cmd.lchan.select("..", self._cmd) + self._cmd.lchan.select_parent(self._cmd) elif action_ef: df_before_action = self._cmd.lchan.selected_file diff --git a/pySim/runtime.py b/pySim/runtime.py index a56d884..a56df4d 100644 --- a/pySim/runtime.py +++ b/pySim/runtime.py @@ -396,6 +396,36 @@ return self.selected_file_fcp + def select_parent(self, cmd_app=None): + """Select the parent file of the currently selected file. This method also works in case the currently selected + file is an ADF without UICC file system support and can be used to exit those ADFs. + """ + parent = self.selected_file.parent + df = self.selected_file + adf = self.selected_adf + if adf and adf.has_fs == False: + # Not every application that may be present on a GlobalPlatform card will support the SELECT + # command as we know it from ETSI TS 102 221, section 11.1.1. In fact the only subset of + # SELECT we may rely on is the OPEN SELECT command as specified in GlobalPlatform Card + # Specification, section 11.9. Unfortunately the OPEN SELECT command only supports the + # "select by name" method, which means we can only select an application and not a file. + # The consequence of this is that we may get trapped in an application that does not have + # ISIM/USIM like file system support and the only way to leave that application is to select + # an ISIM/USIM application in order to get the file system access back. + # + # To automate this escape-route while traversing the file system we will check whether + # the parent file is the MF. When this is the case and the selected ADF has no file system + # support, we will select an arbitrary ADF that has file system support first and from there + # we will then select the MF. + for selectable in parent.get_selectables().items(): + if isinstance(selectable[1], CardADF) and selectable[1].has_fs == True: + self.select(selectable[1].name, cmd_app) + break + self.select_file(parent, cmd_app) + + # Select the parent file normally + self.select_file(parent, cmd_app) + def status(self): """Request STATUS (current selected file FCP) from card.""" (data, _sw) = self.scc.status() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37613?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: I72de51bc7519fafbcc71d829719a8af35d774342 Gerrit-Change-Number: 37613 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

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

27 Jul '24

Attention is currently required from: dexter. laforge 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 3: Code-Review+2 -- 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: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 27 Jul 2024 08:21:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

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

27 Jul '24

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37614?usp=email ) Change subject: pySim-shell: fix reset command ...................................................................... Patch Set 2: Code-Review+2 -- 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: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 27 Jul 2024 08:21:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in pysim[master]: pySim-shell: turn "ADF-escape-code" into an lchan method.
by laforge 27 Jul '24

27 Jul '24

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37613?usp=email ) Change subject: pySim-shell: turn "ADF-escape-code" into an lchan method. ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37613?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: I72de51bc7519fafbcc71d829719a8af35d774342 Gerrit-Change-Number: 37613 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 27 Jul 2024 08:21:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in pysim[master]: pySim-shell: move export code into filesystem class model
by laforge 27 Jul '24

27 Jul '24

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37612?usp=email ) Change subject: pySim-shell: move export code into filesystem class model ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37612?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: Icc2ee60cfc4379411744ca1033d79a1ee9cff5a6 Gerrit-Change-Number: 37612 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 27 Jul 2024 08:21:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

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

26 Jul '24

Attention is currently required from: laforge, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37646?usp=email ) Change subject: sgsn: Introduce test TC_pmm_idle_rx_mt_data ...................................................................... Patch Set 1: (1 comment) File sgsn/SGSN_Tests_Iu.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37646/comment/579870ee_a484… PS1, Line 249: f_service_request(apars, pdp_status := '2000'O /*NSAPI=5*/, ran_index := 3); @laforge@gnumonks.org @daniel@totalueberwachung.de @lynxis@fe80.eu I'm not sure if this is the expected type of answer to Paging for a UE in 3G. In any case, the test is now passing after applying fix https://gerrit.osmocom.org/c/osmo-sgsn/+/37644/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37646?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: I35d660b8e546f6ce0af8c05d7b5c56833a26fb76 Gerrit-Change-Number: 37646 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 26 Jul 2024 17:31:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

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

26 Jul '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37646?usp=email ) Change subject: sgsn: Introduce test TC_pmm_idle_rx_mt_data ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37646?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: I35d660b8e546f6ce0af8c05d7b5c56833a26fb76 Gerrit-Change-Number: 37646 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 26 Jul 2024 17:29:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: library/GTPv1U_Templates: Mark parameters as templates
by pespin 26 Jul '24

26 Jul '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37645?usp=email ) Change subject: library/GTPv1U_Templates: Mark parameters as templates ...................................................................... library/GTPv1U_Templates: Mark parameters as templates Change-Id: I278f7dbc64704c1ba2b8a75d6f540ac52b067598 --- M library/GTPv1U_Templates.ttcn 1 file changed, 32 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/37645/1 diff --git a/library/GTPv1U_Templates.ttcn b/library/GTPv1U_Templates.ttcn index a31e1d2..f53035a 100644 --- a/library/GTPv1U_Templates.ttcn +++ b/library/GTPv1U_Templates.ttcn @@ -55,7 +55,10 @@ } /* generalized GTP-U send template */ - template (value) PDU_GTPU ts_GTP1U_PDU(OCT1 msg_type, template (omit) uint16_t seq, OCT4 teid, GTPU_IEs ies) := { + template (value) PDU_GTPU ts_GTP1U_PDU(template (value) OCT1 msg_type, + template (omit) uint16_t seq, + template (value) OCT4 teid, + template (value) GTPU_IEs ies) := { /* N-PDU Number flag (PN): the GTP-U header contains a meaningful N-PDU Number field if the PN * flag is set to 1. */ pn_bit := '0'B, /* we assume the encoder overwrites this if an optional part is given */ @@ -113,12 +116,13 @@ } /* master template for sending a GTP-C echo request */ - template (value) Gtp1uUnitdata ts_GTPU_PING(Gtp1uPeer peer, uint16_t seq) := { + template (value) Gtp1uUnitdata ts_GTPU_PING(template (value) Gtp1uPeer peer, + template (value) uint16_t seq) := { peer := peer, gtpu := ts_GTP1U_PDU('01'O, seq, '00000000'O, valueof(ts_UEchoReqPDU)) } - template GTPU_IEs ts_UEchoRespPDU(OCT1 restart_counter) := { + template GTPU_IEs ts_UEchoRespPDU(template (value) OCT1 restart_counter) := { echoResponse_IEs := { recovery_gtpu := { type_gtpu := '00'O, /* we assume encoder fixes? */ @@ -129,23 +133,26 @@ } /* master template for sending a GTP-U echo response */ - template (present) Gtp1uUnitdata ts_GTPU_PONG(Gtp1uPeer peer, uint16_t seq, OCT1 rest_ctr) := { + template (present) Gtp1uUnitdata ts_GTPU_PONG(template (value) Gtp1uPeer peer, + template (value) uint16_t seq, + template (value) OCT1 rest_ctr) := { peer := peer, gtpu := ts_GTP1U_PDU('02'O, seq, '00000000'O, valueof(ts_UEchoRespPDU(rest_ctr))) } - template (value) GSNAddress_gtpu ts_UGsnAddr(octetstring ip_addr) := { + template (value) GSNAddress_gtpu ts_UGsnAddr(template (value) octetstring ip_addr) := { type_gtpu := '85'O, - lengthf := lengthof(ip_addr), + lengthf := lengthof(valueof(ip_addr)), gSNAddressValue := ip_addr } - template (value) TeidDataI_gtpu ts_UteidDataI(OCT4 teid) := { + template (value) TeidDataI_gtpu ts_UteidDataI(template (value) OCT4 teid) := { type_gtpu := '10'O, teidDataI := teid } - template (value) GTPU_IEs ts_UErrorIndication(OCT4 teid, octetstring gsn_addr) := { + template (value) GTPU_IEs ts_UErrorIndication(template (value) OCT4 teid, + template (value) octetstring gsn_addr) := { errorIndication_IEs := { teidDataI_gtpu := ts_UteidDataI(teid), gSNAddress_gtpu := ts_UGsnAddr(gsn_addr), @@ -154,13 +161,19 @@ } /* master template for sending a GTP-U Error indication */ - template (value) Gtp1uUnitdata ts_GTPU_ErrorIndication(Gtp1uPeer peer, uint16_t seq, OCT4 teid, octetstring gsn_addr) := { + template (value) Gtp1uUnitdata ts_GTPU_ErrorIndication(template (value) Gtp1uPeer peer, + template (value) uint16_t seq, + template (value) OCT4 teid, + template (value) octetstring gsn_addr) := { peer := peer, gtpu := ts_GTP1U_PDU('1A'O, seq, '00000000'O, valueof(ts_UErrorIndication(teid, gsn_addr))) } /* master template for sending a GTP-U user plane data */ - template (value) Gtp1uUnitdata ts_GTP1U_GPDU(Gtp1uPeer peer, template (omit) uint16_t seq, OCT4 teid, octetstring data) := { + template (value) Gtp1uUnitdata ts_GTP1U_GPDU(template (value) Gtp1uPeer peer, + template (omit) uint16_t seq, + template (value) OCT4 teid, + template (value) octetstring data) := { peer := peer, gtpu := ts_GTP1U_PDU('FF'O, seq, teid, { g_PDU_IEs := { data := data }}) } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37645?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: I278f7dbc64704c1ba2b8a75d6f540ac52b067598 Gerrit-Change-Number: 37645 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

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

26 Jul '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37646?usp=email ) Change subject: sgsn: Introduce test TC_pmm_idle_rx_mt_data ...................................................................... sgsn: Introduce test TC_pmm_idle_rx_mt_data Change-Id: I35d660b8e546f6ce0af8c05d7b5c56833a26fb76 --- M sgsn/BSSGP_ConnHdlr.ttcn M sgsn/SGSN_Tests_Iu.ttcn M sgsn/expected-results.xml 3 files changed, 75 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/37646/1 diff --git a/sgsn/BSSGP_ConnHdlr.ttcn b/sgsn/BSSGP_ConnHdlr.ttcn index 7e44f4b..9019194 100644 --- a/sgsn/BSSGP_ConnHdlr.ttcn +++ b/sgsn/BSSGP_ConnHdlr.ttcn @@ -720,6 +720,7 @@ octetstring ggsn_ip_c, /* GGSN IP Control */ octetstring ggsn_ip_u, /* GGSN IP User */ OCT1 ggsn_restart_ctr, /* GGSN Restart Counter */ + boolean direct_tunnel_requested, /* Did SGSN request Direct Tunnel to the GGSN ?*/ OCT4 rnc_tei_u, /* SGSN TEI User */ octetstring rnc_ip_u, /* SGSN IP USer */ @@ -788,6 +789,7 @@ apars.sgsn_ip_u := upd.sgsn_addr_traffic.addressf; apars.sgsn_tei_u := upd.teidDataI.teidDataI; } + apars.direct_tunnel_requested := dti; } altstep as_ggsn_gtp_ctx_upd_req(inout PdpActPars apars, boolean send_recovery := false, @@ -1025,6 +1027,7 @@ ggsn_ip_c := f_inet_addr(ggsn_ip), ggsn_ip_u := f_inet_addr(ggsn_ip), ggsn_restart_ctr := int2oct(2, 1), + direct_tunnel_requested := false, rnc_tei_u := f_rnd_octstring(4), rnc_ip_u := f_inet_addr(rnc_ip), @@ -1047,9 +1050,18 @@ remPort := GTP1C_PORT } -function f_gtpu_send(inout PdpActPars apars, octetstring payload) runs on BSSGP_ConnHdlr { - var Gtp1uPeer peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); - GTP[GTP_GGSN_IDX].send(ts_GTP1U_GPDU(peer, 0 /*seq*/, apars.sgsn_tei_u, payload)); +/* Send data from GGSN to SGSN/RNC (depending on apars.f_ggsn_gtpu_send) */ +function f_ggsn_gtpu_send(inout PdpActPars apars, octetstring payload) runs on BSSGP_ConnHdlr { + var Gtp1uPeer peer; + var OCT4 rem_teid; + if (apars.direct_tunnel_requested) { + peer := valueof(ts_GtpPeerU(apars.rnc_ip_u)); + rem_teid := apars.rnc_tei_u; + } else { + peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); + rem_teid := apars.sgsn_tei_u; + } + GTP[GTP_GGSN_IDX].send(ts_GTP1U_GPDU(peer, 0 /*seq*/, rem_teid, payload)); } altstep as_xid(PdpActPars apars, integer ran_index := 0) runs on BSSGP_ConnHdlr { @@ -1096,7 +1108,7 @@ runs on BSSGP_ConnHdlr { timer T := 5.0; /* Send PDU via GTP from our simulated GGSN to the SGSN */ - f_gtpu_send(apars, payload); + f_ggsn_gtpu_send(apars, payload); T.start; alt { diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn index ff68e0e..f3ffa45 100644 --- a/sgsn/SGSN_Tests_Iu.ttcn +++ b/sgsn/SGSN_Tests_Iu.ttcn @@ -12,6 +12,9 @@ import from RANAP_PDU_Descriptions all; import from RANAP_IEs all; +import from GTPv1U_Templates all; +import from GTP_Emulation all; + import from BSSGP_ConnHdlr all; private function f_init() runs on test_CT { @@ -215,6 +218,51 @@ 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_pmm_idle_rx_mt_data(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(apars, 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 GGSN receives new MT data and forwards it to SGSN: */ + f_gtp_register_teid('00000000'O, GTP_GGSN_IDX); /* Ease debugging in case SGSN sends ErrorInd */ + f_ran_register_imsi(g_pars.imsi, g_pars.p_tmsi); /* Forward Paging below to this component */ + var octetstring payload := f_rnd_octstring(100); + f_ggsn_gtpu_send(apars, payload); + + f_sleep(1.0); + BSSAP.receive(tr_RANAP_Paging(ps_domain, imsi_hex2oct(g_pars.imsi))); + + /* Ue comes back, answering the paging: + * SGSN recreates the Iu ctx and recovers the Direct Tunnel RNC<->GGSN: */ + f_service_request(apars, 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_pmm_idle_rx_mt_data() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_pmm_idle_rx_mt_data), testcasename(), g_gb, 1001); + vc_conn.done; + f_cleanup(); +} + control { execute( TC_iu_attach() ); execute( TC_iu_attach_encr() ); @@ -222,6 +270,7 @@ execute( TC_geran_attach_iu_rau() ); execute( TC_attach_pdp_act_user() ); execute( TC_attach_pdp_act_pmm_idle() ); + execute( TC_pmm_idle_rx_mt_data() ); } diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index 7b38e99..3461721 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -95,6 +95,7 @@ <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_Iu' name='TC_attach_pdp_act_pmm_idle_lost_pdp_status' time='MASKED'/> + <testcase classname='SGSN_Tests_Iu' name='TC_pmm_idle_rx_mt_data' 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/+/37646?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: I35d660b8e546f6ce0af8c05d7b5c56833a26fb76 Gerrit-Change-Number: 37646 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-sgsn[master]: Announce SGSN own TEID during UpdatePDPCtxReq after UE goes PMM-IDLE
by pespin 26 Jul '24

26 Jul '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37644?usp=email ) Change subject: Announce SGSN own TEID during UpdatePDPCtxReq after UE goes PMM-IDLE ...................................................................... Announce SGSN own TEID during UpdatePDPCtxReq after UE goes PMM-IDLE When the UE/RNC closes the Iu conn (while keeping the PDP Context activated), the SGSN updates the GGSN to point the GTPU tunnel to itself. Unfortunately, only the IP address was being updated while the TEID was kept the same (the one from the RNC). As a result, when new MT data arrived at the GGSN, it would forward it over GTPU to the SGSN using the incorrect RNC TEID, which the libgtp stack at osmo-sgsn would silently drop due to not being known (because it was >PDP_MAX=1024). The issue can be triggered in test SGSN_Tests_Iu.TC_pmm_idle_rx_mt_data. Related: OS#5773 Related: SYS#5435 Change-Id: I782aa43c71569922a945bd44544bb1388bf8c878 --- M include/osmocom/sgsn/pdpctx.h M src/sgsn/gprs_mm_state_iu_fsm.c M src/sgsn/sgsn_libgtp.c 3 files changed, 36 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/44/37644/1 diff --git a/include/osmocom/sgsn/pdpctx.h b/include/osmocom/sgsn/pdpctx.h index f3cf0ed..39d744a 100644 --- a/include/osmocom/sgsn/pdpctx.h +++ b/include/osmocom/sgsn/pdpctx.h @@ -69,6 +69,9 @@ uint8_t radio_prio; //uint32_t charging_id; bool ue_pdp_active; /* PDP Context is active for this NSAPI? */ + /* Keeps original SGSN local TEID when lib->teid_own is updated with + * RNC's TEID upon use of Direct Tunnel feature: */ + uint32_t sgsn_teid_own; struct osmo_timer_list timer; unsigned int T; /* Txxxx number */ diff --git a/src/sgsn/gprs_mm_state_iu_fsm.c b/src/sgsn/gprs_mm_state_iu_fsm.c index b883278..b376d98 100644 --- a/src/sgsn/gprs_mm_state_iu_fsm.c +++ b/src/sgsn/gprs_mm_state_iu_fsm.c @@ -49,9 +49,11 @@ char buf[INET_ADDRSTRLEN]; struct sgsn_pdp_ctx *pdp; llist_for_each_entry(pdp, &mm_ctx->pdp_list, list) { - LOGMMCTXP(LOGL_INFO, mm_ctx, "Changing GTP-U endpoints %s -> %s\n", - sgsn_gtp_ntoa(&pdp->lib->gsnlu), - inet_ntop(AF_INET, &sgsn->cfg.gtp_listenaddr.sin_addr, buf, sizeof(buf))); + LOGMMCTXP(LOGL_INFO, mm_ctx, "Changing GTP-U endpoints %s/0x%08x -> %s/0x%08x\n", + sgsn_gtp_ntoa(&pdp->lib->gsnlu), pdp->lib->teid_own, + inet_ntop(AF_INET, &sgsn->cfg.gtp_listenaddr.sin_addr, buf, sizeof(buf)), + pdp->sgsn_teid_own); + pdp->lib->teid_own = pdp->sgsn_teid_own; /* Disable Direct Tunnel Flags DTI: */ pdp->lib->dir_tun_flags.l = 1; pdp->lib->dir_tun_flags.v[0] &= 0xFE; diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index 4885ada..f497609 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -166,6 +166,9 @@ pdp->priv = pctx; pctx->lib = pdp; + /* Back up our own local TEID in case we update the library one with RNC TEID when setting up Direct Tunnel: */ + pctx->sgsn_teid_own = pdp->teid_own; + //pdp->peer = /* sockaddr_in of GGSN (receive) */ //pdp->ipif = /* not used by library */ pdp->version = ggsn->gtp_version; @@ -783,6 +786,8 @@ #ifdef BUILD_IU /* Ignore the packet for now and page the UE to get the RAB * reestablished */ + LOGMMCTXP(LOGL_INFO, mm, "Rx GTP for UE in PMM state %s, paging it\n", + osmo_fsm_inst_state_name(mm->iu.mm_state_fsm)); ranap_iu_page_ps(mm->imsi, &mm->p_tmsi, mm->ra.lac, mm->ra.rac); return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37644?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: I782aa43c71569922a945bd44544bb1388bf8c878 Gerrit-Change-Number: 37644 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log