October 2024 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: sgsn: Validate TLI received in RAB Ass Req
by pespin 15 Oct '24

15 Oct '24

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38433?usp=email ) Change subject: sgsn: Validate TLI received in RAB Ass Req ...................................................................... Patch Set 2: (1 comment) File library/ITU_X213_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38433/comment/6f37289c_059d… : PS1, Line 41: TODO: limit this field to be max 13 bytes (20 - 3 - 4)*/ > Yay! thanks Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38433?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3a3699cea981caa89b30742c031d5f232418b0ee Gerrit-Change-Number: 38433 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 15 Oct 2024 17:30:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in upf-benchmark[master]: Rename osmo-pfcp-tool to osmo-upf-load-gen
by pespin 15 Oct '24

15 Oct '24

Attention is currently required from: laforge. Hello laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/upf-benchmark/+/38354?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge Change subject: Rename osmo-pfcp-tool to osmo-upf-load-gen ...................................................................... Rename osmo-pfcp-tool to osmo-upf-load-gen Change-Id: Ie36379b5dcf4ab86276dfda9e25410fe41db1d93 --- M configure.ac M debian/upf-benchmark.install M include/osmocom/Makefile.am R include/osmocom/upfloadgen/Makefile.am R include/osmocom/upfloadgen/checksum.h R include/osmocom/upfloadgen/gtp_flood.h R include/osmocom/upfloadgen/pfcp_tool.h R include/osmocom/upfloadgen/range.h M src/Makefile.am M src/osmo-udp-responder/udp_responder.c R src/osmo-upf-load-gen/Makefile.am R src/osmo-upf-load-gen/checksum.c R src/osmo-upf-load-gen/gtp_flood.c R src/osmo-upf-load-gen/main.c R src/osmo-upf-load-gen/pfcp_tool.c R src/osmo-upf-load-gen/pfcp_tool_vty.c R src/osmo-upf-load-gen/range.c M testsuites/gtplab-sysmo2017/overview_only_tunend.dot M testsuites/gtplab-sysmo2017/overview_only_tunmap.dot M testsuites/gtplab-sysmo2017/overview_tunmap_and_tunend.dot M testsuites/gtplab-sysmo2017/tunend/ran/0.gtp_flood.vty R testsuites/gtplab-sysmo2017/tunend/ran/osmo-upf-load-gen.cfg M testsuites/gtplab-sysmo2017/tunend/ran/run.sh M testsuites/gtplab-sysmo2017/tunmap/ran/0.gtp_flood.vty R testsuites/gtplab-sysmo2017/tunmap/ran/osmo-upf-load-gen.cfg M testsuites/gtplab-sysmo2017/tunmap/ran/run.sh 26 files changed, 44 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/54/38354/2 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/38354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Ie36379b5dcf4ab86276dfda9e25410fe41db1d93 Gerrit-Change-Number: 38354 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org>

1 0

[S] Change in osmo-sgsn[master]: ranap: Fix decoding of padded ITU X.213 IPv4 TLA in Rab Ass Resp
by pespin 15 Oct '24

15 Oct '24

Attention is currently required from: fixeria, lynxis lazus. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/38435?usp=email ) Change subject: ranap: Fix decoding of padded ITU X.213 IPv4 TLA in Rab Ass Resp ...................................................................... Patch Set 1: (1 comment) File src/sgsn/gprs_ranap.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/38435/comment/2471ed6a_8a161d7b?us… : PS1, Line 81: Unknown Transport Layer Address > "... unable/failed to decode Transport Layer Address ..."? […] There are tons of different kinds of ITU X.213 encodings so it can well be that it's one we don't really know about (we don't support it). So not sure what you mention is really and improvement. If this is really an issue I can change it though, I see no big problem here. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38435?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9c48b676068574338f60b6ed7ad8b61ba748b52e Gerrit-Change-Number: 38435 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 15 Oct 2024 16:59:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-sgsn[master]: ranap: Reject ActivatePDPCtx from UE if RABAssResp parsing fails
by fixeria 15 Oct '24

15 Oct '24

Attention is currently required from: lynxis lazus, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/38436?usp=email ) Change subject: ranap: Reject ActivatePDPCtx from UE if RABAssResp parsing fails ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I111cc4b17100d2e1ef756b654dc9e98415b3a8bb Gerrit-Change-Number: 38436 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 15 Oct 2024 16:57:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-sgsn[master]: ranap: Fix decoding of padded ITU X.213 IPv4 TLA in Rab Ass Resp
by fixeria 15 Oct '24

15 Oct '24

Attention is currently required from: lynxis lazus, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/38435?usp=email ) Change subject: ranap: Fix decoding of padded ITU X.213 IPv4 TLA in Rab Ass Resp ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/sgsn/gprs_ranap.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/38435/comment/abc72c5a_802a4aaa?us… : PS1, Line 81: Unknown Transport Layer Address "... unable/failed to decode Transport Layer Address ..."? "unknown" is misleading, IMO -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38435?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9c48b676068574338f60b6ed7ad8b61ba748b52e Gerrit-Change-Number: 38435 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 15 Oct 2024 16:56:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: sgsn: Introduce test TC_attach_pdp_act_user_addr_itu_x213_ipv4toolarge
by pespin 15 Oct '24

15 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38437?usp=email ) Change subject: sgsn: Introduce test TC_attach_pdp_act_user_addr_itu_x213_ipv4toolarge ...................................................................... sgsn: Introduce test TC_attach_pdp_act_user_addr_itu_x213_ipv4toolarge Related: OS#6508 Related: SYS#7119 Change-Id: Id2501e38565db491a6248552e754f03f7b973997 --- M sgsn/BSSGP_ConnHdlr.ttcn M sgsn/SGSN_Tests_Iu.ttcn M sgsn/expected-results.xml 3 files changed, 60 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/38437/1 diff --git a/sgsn/BSSGP_ConnHdlr.ttcn b/sgsn/BSSGP_ConnHdlr.ttcn index b66b727..4eff7f3 100644 --- a/sgsn/BSSGP_ConnHdlr.ttcn +++ b/sgsn/BSSGP_ConnHdlr.ttcn @@ -765,7 +765,7 @@ 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 { +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; @@ -895,13 +895,17 @@ [is_iu(ran_index)] as_pdp_ctx_act_iu(apars, ran_index); } +function f_pdp_tx_ctx_act(inout PdpActPars apars, integer ran_index := 0) +runs on BSSGP_ConnHdlr { + f_send_l3(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, + apars.apn, apars.pco), ran_index); +} + function f_pdp_ctx_act(inout PdpActPars apars, boolean send_recovery := false, integer ran_index := 0, float Tval := 5.0) runs on BSSGP_ConnHdlr { 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); - + f_pdp_tx_ctx_act(apars, ran_index); as_ggsn_gtp_ctx_act_req(apars, send_recovery := send_recovery); T.start; @@ -948,6 +952,15 @@ setverdict(pass); } +altstep as_pdp_ctx_deact_mt(inout PdpActPars apars, integer ran_index := 0) runs on BSSGP_ConnHdlr { + [is_gb(ran_index)] BSSGP[ran_index].receive(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true)) { + f_send_l3(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid), ran_index); + } + [is_iu(ran_index)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) { + f_send_l3(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid), ran_index); + } +} + function f_pdp_ctx_deact_mt(inout PdpActPars apars, boolean error_ind := false, integer ran_index := 0) runs on BSSGP_ConnHdlr { var Gtp1cUnitdata g_ud; @@ -966,12 +979,7 @@ T.start; alt { - [is_gb(ran_index)] BSSGP[ran_index].receive(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true)) { - f_send_l3(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid), ran_index); - } - [is_iu(ran_index)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) { - f_send_l3(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid), ran_index); - } + [] as_pdp_ctx_deact_mt(apars, ran_index := ran_index); [not error_ind] GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) { repeat; } diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn index cc9167a..c549352 100644 --- a/sgsn/SGSN_Tests_Iu.ttcn +++ b/sgsn/SGSN_Tests_Iu.ttcn @@ -2,6 +2,7 @@ import from Osmocom_Types all; import from Osmocom_VTY_Functions all; +import from Misc_Helpers all; import from SGSN_Tests all; import from BSSGP_Emulation all; @@ -166,6 +167,45 @@ testcase TC_attach_pdp_act_user_addr_itu_x213_ipv4len20() runs on test_CT { f_TC_attach_pdp_act_user_addr_itu_x213_ipv4len(1056, '00000000000000000000000000'O) } +/* Add one more byte than the expected, with total len of TLA reaching 21 bytes. + * Expect SGSN to fail and reject the ActivatePDPCtxReq in progress to UE, and + deactivate the already created against GGSN. */ +private function f_TC_attach_pdp_act_user_addr_itu_x213_ipv4lentoolarge(charstring id) runs on BSSGP_ConnHdlr { + var integer ran_index := 3; + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sctp_addr.local_ip_addr)); + timer T := 5.0; + apars.exp_rej_cause:= '26'O; /* Network failure */ + + /* first perform regular attach */ + f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false, ran_index := ran_index); + f_service_request(apars, ran_index := ran_index); + f_pdp_tx_ctx_act(apars, ran_index := ran_index); + as_ggsn_gtp_ctx_act_req(apars, send_recovery := false); + T.start; + alt { + [] as_ranap_rab_ass_req(apars) { + as_pdp_ctx_act_iu(apars, ran_index := ran_index); + as_ggsn_gtp_ctx_del_req(apars); + } + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Timeout waiting for RANAP RAB AssReq"); + } + } + setverdict(pass); +} +testcase TC_attach_pdp_act_user_addr_itu_x213_ipv4lentoolarge() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + var BSSGP_ConnHdlrPars pars; + f_init(); + f_sleep(1.0); + pars := f_new_BSSGP_ConnHdlrPars(1057, f_cell_ids_from_gb(g_gb)); + pars.ranap_use_itu_x213_addr_format := true; + pars.ranap_itu_x213_addr_format_padding := '0000000000000000000000000000'O; + vc_conn := f_start_handler_pars(refers(f_TC_attach_pdp_act_user_addr_itu_x213_ipv4lentoolarge), testcasename(), g_gb, pars); + vc_conn.done; + 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. */ @@ -352,6 +392,7 @@ execute( TC_attach_pdp_act_user() ); execute( TC_attach_pdp_act_user_addr_itu_x213_ipv4len7() ); execute( TC_attach_pdp_act_user_addr_itu_x213_ipv4len20() ); + execute( TC_attach_pdp_act_user_addr_itu_x213_ipv4lentoolarge() ); execute( TC_attach_pdp_act_pmm_idle() ); execute( TC_pmm_idle_rx_mt_data() ); execute( TC_update_ctx_err_ind_from_ggsn() ); diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index fbd31e6..bdd0f29 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -96,6 +96,7 @@ <testcase classname='SGSN_Tests_Iu' name='TC_attach_pdp_act_user' time='MASKED'/> <testcase classname='SGSN_Tests_Iu' name='TC_attach_pdp_act_user_addr_itu_x213_ipv4len7' time='MASKED'/> <testcase classname='SGSN_Tests_Iu' name='TC_attach_pdp_act_user_addr_itu_x213_ipv4len20' time='MASKED'/> + <testcase classname='SGSN_Tests_Iu' name='TC_attach_pdp_act_user_addr_itu_x213_ipv4toolarge' 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'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38437?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id2501e38565db491a6248552e754f03f7b973997 Gerrit-Change-Number: 38437 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: sgsn: Test tx Rab Ass Resp with ITU X.213 IPv4 address format
by pespin 15 Oct '24

15 Oct '24

Attention is currently required from: fixeria, osmith. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38434?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by osmith, Code-Review+2 by fixeria, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: sgsn: Test tx Rab Ass Resp with ITU X.213 IPv4 address format ...................................................................... sgsn: Test tx Rab Ass Resp with ITU X.213 IPv4 address format Related: OS#6508 Related: SYS#7119 Change-Id: I38dd85f617600a974cbe8fd17597282eaf950a78 --- M sgsn/BSSGP_ConnHdlr.ttcn M sgsn/SGSN_Tests.ttcn M sgsn/SGSN_Tests_Iu.ttcn M sgsn/expected-results.xml 4 files changed, 55 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/38434/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38434?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I38dd85f617600a974cbe8fd17597282eaf950a78 Gerrit-Change-Number: 38434 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: sgsn: Validate TLI received in RAB Ass Req
by pespin 15 Oct '24

15 Oct '24

Attention is currently required from: fixeria, osmith. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38433?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by osmith, Code-Review+2 by fixeria, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: sgsn: Validate TLI received in RAB Ass Req ...................................................................... sgsn: Validate TLI received in RAB Ass Req Related: OS#6508 Change-Id: I3a3699cea981caa89b30742c031d5f232418b0ee --- A library/ITU_X213_Types.ttcn M library/ranap/RANAP_Templates.ttcn M sgsn/BSSGP_ConnHdlr.ttcn M sgsn/gen_links.sh 4 files changed, 193 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/38433/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38433?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3a3699cea981caa89b30742c031d5f232418b0ee Gerrit-Change-Number: 38433 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-sgsn[master]: ranap: Fix decoding of padded ITU X.213 IPv4 TLA in Rab Ass Resp
by pespin 15 Oct '24

15 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/38435?usp=email ) Change subject: ranap: Fix decoding of padded ITU X.213 IPv4 TLA in Rab Ass Resp ...................................................................... ranap: Fix decoding of padded ITU X.213 IPv4 TLA in Rab Ass Resp Simply use the existing omos-iuh library helper to decode the IP address, which is more robust than existing adhoc code in osmo-sgsn. The library version already supports decoding ITU X.213 IANA binary IPv4 addresses padded to 20 bytes. Related: OS#6508 Related: SYS#7119 Change-Id: I9c48b676068574338f60b6ed7ad8b61ba748b52e --- M src/sgsn/gprs_ranap.c 1 file changed, 17 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/35/38435/1 diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c index 51954ce..eabf7af 100644 --- a/src/sgsn/gprs_ranap.c +++ b/src/sgsn/gprs_ranap.c @@ -29,6 +29,7 @@ #include <osmocom/gprs/gprs_msgb.h> #include <osmocom/ranap/ranap_common.h> +#include <osmocom/ranap/iu_helpers.h> #include <osmocom/sgsn/gprs_gmm.h> #include <osmocom/sgsn/gprs_sm.h> @@ -60,6 +61,7 @@ bool require_pdp_update = false; struct sgsn_pdp_ctx *pdp = NULL; RANAP_RAB_SetupOrModifiedItem_t *item = &setup_ies->raB_SetupOrModifiedItem; + int rc; rab_id = item->rAB_ID.buf[0]; @@ -70,21 +72,24 @@ } if (item->transportLayerAddress) { + struct osmo_sockaddr addr; LOGPC(DRANAP, LOGL_INFO, " Setup: (%u/%s)", rab_id, osmo_hexdump(item->transportLayerAddress->buf, item->transportLayerAddress->size)); - switch (item->transportLayerAddress->size) { - case 7: - /* It must be IPv4 inside a X213 NSAP */ - memcpy(pdp->lib->gsnlu.v, &item->transportLayerAddress->buf[3], 4); + rc = ranap_transp_layer_addr_decode2(&addr, NULL, item->transportLayerAddress); + if (rc < 0) { + LOGP(DRANAP, LOGL_ERROR, + "RAB Assignment Resp: Unknown Transport Layer Address (size %u): %s\n", + item->transportLayerAddress->size, + osmo_hexdump(item->transportLayerAddress->buf, item->transportLayerAddress->size)); + return -1; + } + + switch (addr.u.sa.sa_family) { + case AF_INET: + memcpy(pdp->lib->gsnlu.v, (uint8_t *)&addr.u.sin.sin_addr.s_addr, 4); break; - case 4: - /* It must be a raw IPv4 address */ - memcpy(pdp->lib->gsnlu.v, item->transportLayerAddress->buf, 4); - break; - case 16: - /* TODO: It must be a raw IPv6 address */ - case 19: - /* TODO: It must be IPv6 inside a X213 NSAP */ + case AF_INET6: + /* TODO: Support IPv6 address */ default: LOGP(DRANAP, LOGL_ERROR, "RAB Assignment Resp: Unknown " "transport layer address size %u\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38435?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9c48b676068574338f60b6ed7ad8b61ba748b52e Gerrit-Change-Number: 38435 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-sgsn[master]: ranap: Reject ActivatePDPCtx from UE if RABAssResp parsing fails
by pespin 15 Oct '24

15 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/38436?usp=email ) Change subject: ranap: Reject ActivatePDPCtx from UE if RABAssResp parsing fails ...................................................................... ranap: Reject ActivatePDPCtx from UE if RABAssResp parsing fails Before this patch, if Rx path at RAB Ass Req failed, the PDP ctx in the middle of being activated was left untouched. Explicitly communicate the failure to both sides (UE and GGSN). Related: OS#6508 Related: SYS#7119 Change-Id: I111cc4b17100d2e1ef756b654dc9e98415b3a8bb --- M src/sgsn/gprs_ranap.c 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/36/38436/1 diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c index eabf7af..613485f 100644 --- a/src/sgsn/gprs_ranap.c +++ b/src/sgsn/gprs_ranap.c @@ -68,6 +68,7 @@ pdp = sgsn_pdp_ctx_by_nsapi(ctx, rab_id); if (!pdp) { LOGP(DRANAP, LOGL_ERROR, "RAB Assignment Response for unknown RAB/NSAPI=%u\n", rab_id); + sgsn_ranap_iu_release_free(ctx, NULL); return -1; } @@ -81,7 +82,7 @@ "RAB Assignment Resp: Unknown Transport Layer Address (size %u): %s\n", item->transportLayerAddress->size, osmo_hexdump(item->transportLayerAddress->buf, item->transportLayerAddress->size)); - return -1; + goto ret_error; } switch (addr.u.sa.sa_family) { @@ -94,7 +95,7 @@ LOGP(DRANAP, LOGL_ERROR, "RAB Assignment Resp: Unknown " "transport layer address size %u\n", item->transportLayerAddress->size); - return -1; + goto ret_error; } require_pdp_update = true; } @@ -122,6 +123,15 @@ } return 0; +ret_error: + if (pdp->state != PDP_STATE_CR_CONF) { + gsm48_tx_gsm_act_pdp_rej(ctx, pdp->ti, GSM_CAUSE_NET_FAIL, + 0, NULL); + sgsn_delete_pdp_ctx(pdp); + } else { + gsm48_tx_gsm_deact_pdp_req(pdp, GSM_CAUSE_NET_FAIL, true); + } + return -1; } int sgsn_ranap_iu_event(struct ranap_ue_conn_ctx *ctx, enum ranap_iu_event_type type, void *data) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I111cc4b17100d2e1ef756b654dc9e98415b3a8bb Gerrit-Change-Number: 38436 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0