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

Change in osmo-cbc[master]: cbsp: Fix heap-use-after-free closing cli conn in connecting state

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28885 ) Change subject: cbsp: Fix heap-use-after-free closing cli conn in connecting state ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ic13578e958345207892465644b5e1f28537c032d Gerrit-Change-Number: 28885 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Aug 2022 09:24:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in docker-playground[master]: ttcn3-cbc: Disable gsmtap_log debug for dasn1c category

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28881 ) Change subject: ttcn3-cbc: Disable gsmtap_log debug for dasn1c category ...................................................................... ttcn3-cbc: Disable gsmtap_log debug for dasn1c category This category prints incredibly large output of ASN1c encoder/decoder, which clogs the logging subsystem while debugging general issues. Since the encoder/decoder is somehow determenistic, let's disable logging all the debugging; it can be enabled by the user when specifically debugging any enc/dec related issue. Change-Id: I53cc2fe717fa70a8f187788fc4d31d28e0d4e98a --- M ttcn3-cbc-test/osmo-cbc.cfg 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ttcn3-cbc-test/osmo-cbc.cfg b/ttcn3-cbc-test/osmo-cbc.cfg index 9d7f4a1..c97c893 100644 --- a/ttcn3-cbc-test/osmo-cbc.cfg +++ b/ttcn3-cbc-test/osmo-cbc.cfg @@ -1,6 +1,7 @@ ! log gsmtap 172.18.27.100 logging level set-all debug + logging level asn1c info logging filter all 1 ! log stderr -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28881 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I53cc2fe717fa70a8f187788fc4d31d28e0d4e98a Gerrit-Change-Number: 28881 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in docker-playground[master]: ttcn3-cbc: Adapt ports in osmo-cbc.git to default ttcn3 ones

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28858 ) Change subject: ttcn3-cbc: Adapt ports in osmo-cbc.git to default ttcn3 ones ...................................................................... ttcn3-cbc: Adapt ports in osmo-cbc.git to default ttcn3 ones This is intended to ease adding new emulated MMEs and BSCs by using next available port strting from the one defined in the TTCN3 test module parameter. Requires: osmo-ttcn3-hacks.git Ib443aba9396aebe0a56b1a79719bbcf66302a1aa Change-Id: Ib1387284c8f361572057b6d036429366238382a6 --- M ttcn3-cbc-test/osmo-cbc.cfg 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/ttcn3-cbc-test/osmo-cbc.cfg b/ttcn3-cbc-test/osmo-cbc.cfg index c2c1b7b..9d7f4a1 100644 --- a/ttcn3-cbc-test/osmo-cbc.cfg +++ b/ttcn3-cbc-test/osmo-cbc.cfg @@ -33,9 +33,9 @@ local-port 29168 peer cbsp ttcn3-bsc mode server - remote-port 9999 + remote-port 15000 remote-ip 172.18.27.100 peer sbcap ttcn3-mme mode server - remote-port 9998 + remote-port 16000 remote-ip 172.18.27.100 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib1387284c8f361572057b6d036429366238382a6 Gerrit-Change-Number: 28858 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Add Tguard

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28888 ) Change subject: cbc: Add Tguard ...................................................................... cbc: Add Tguard Change-Id: I92b0a2ec931cefed34a33bd90cbc5c97d0aec540 --- M cbc/CBC_Tests.ttcn 1 file changed, 16 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 8e7e1c5..64cf5e2 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -46,6 +46,7 @@ const integer MAX_MME := 3; type component test_CT extends CBSP_Adapter_CT, http_CT { + timer g_Tguard := 60.0; var integer g_num_bsc; var integer g_num_mme; var BSC_ConnHdlr g_vc_conn_BSC[MAX_BSC]; @@ -68,6 +69,15 @@ mtc.stop; } +/* altstep for the global guard timer */ +private altstep as_Tguard() runs on test_CT { + [] g_Tguard.timeout { + setverdict(fail, "Tguard timeout"); + all component.stop; + mtc.stop; + } +} + /* * BSC Conn Handler: */ @@ -151,7 +161,11 @@ } } -function f_start() runs on test_CT { +function f_start(float t_guard := 60.0) runs on test_CT { + /* Start guard timer and activate it as default */ + g_Tguard.start(t_guard); + activate(as_Tguard()); + for (var integer i := 0; i < g_num_bsc; i := i + 1) { f_start_bsc(i, testcasename(), g_pars_BSC[i]); } @@ -195,7 +209,7 @@ testcase TC_rx_keepalive_timeout() runs on test_CT { f_init(num_bsc := 1); g_pars_BSC[0].start_fn := refers(f_bsc_TC_rx_keepalive_timeout); - f_start(); + f_start(t_guard := 100.0); f_shutdown_helper(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28888 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: I92b0a2ec931cefed34a33bd90cbc5c97d0aec540 Gerrit-Change-Number: 28888 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Enable MMEs and BSCs selectively

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28856 ) Change subject: cbc: Enable MMEs and BSCs selectively ...................................................................... cbc: Enable MMEs and BSCs selectively Let's only create BSC handlers (no MM handlers) in tests validating CBSP specific features. A new test is added to specifically validate scenarios with both an MME and BSC attached to the CBC. Change-Id: I79ee41f183ef49e9fd606d2a3efa2767628bf142 --- M cbc/CBC_Tests.ttcn 1 file changed, 29 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 5240d85..9c9c644 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -135,7 +135,7 @@ g_vc_conn_MME[idx].start(f_MME_ConnHdlr_main(id, pars)); } -private function f_init(integer num_bsc := 1, integer num_mme := 1) runs on test_CT { +private function f_init(integer num_bsc := 0, integer num_mme := 0) runs on test_CT { f_http_init(mp_cbc_host, mp_cbc_ecbe_port); g_num_bsc := num_bsc; @@ -168,7 +168,7 @@ } testcase TC_rx_keepalive() runs on test_CT { - f_init(); + f_init(num_bsc := 1); g_pars_BSC[0].start_fn := refers(f_bsc_TC_rx_keepalive); f_start(); f_shutdown_helper(); @@ -191,7 +191,7 @@ CBSP[0].receive(PortEvent:{connClosed:=?}) } testcase TC_rx_keepalive_timeout() runs on test_CT { - f_init(); + f_init(num_bsc := 1); g_pars_BSC[0].start_fn := refers(f_bsc_TC_rx_keepalive_timeout); f_start(); f_shutdown_helper(); @@ -220,7 +220,7 @@ } }; - f_init(); + f_init(num_bsc := 1); g_pars_BSC[0].exp_cbs_msg := msg; g_pars_BSC[0].start_fn := refers(f_bsc_TC_write_replace); f_start(); @@ -330,7 +330,7 @@ /* specify a variety of different Cell Identifier formats to extend test coverage */ testcase TC_ecbe_create_delete_cgi() runs on test_CT { - f_init(); + f_init(num_bsc := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; var template (value) CBS_Message msg := t_CBSmsg(43, 16752); @@ -342,14 +342,12 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); - g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); - g_pars_MME[0].exp_cbs_msg := valueof(msg); f_start(); f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_lac_ci() runs on test_CT { - f_init(); + f_init(num_bsc := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; var template (value) CBS_Message msg := t_CBSmsg(44, 16752); cell_list_success := ts_BSSMAP_CIL_LAC_CI({ @@ -360,14 +358,12 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); - g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); - g_pars_MME[0].exp_cbs_msg := valueof(msg); f_start(); f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_lac() runs on test_CT { - f_init(); + f_init(num_bsc := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; var template (value) CBS_Message msg := t_CBSmsg(45, 16752); cell_list_success := ts_BSSMAP_CIL_LAC({ @@ -378,14 +374,12 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); - g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); - g_pars_MME[0].exp_cbs_msg := valueof(msg); f_start(); f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_ci() runs on test_CT { - f_init(); + f_init(num_bsc := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; var template (value) CBS_Message msg := t_CBSmsg(46, 16752); cell_list_success := ts_BSSMAP_CIL_CI({ @@ -396,14 +390,12 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); - g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); - g_pars_MME[0].exp_cbs_msg := valueof(msg); f_start(); f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_lai() runs on test_CT { - f_init(); + f_init(num_bsc := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; var template (value) CBS_Message msg := t_CBSmsg(47, 16752); cell_list_success := ts_BSSMAP_CIL_LAI({ @@ -414,6 +406,25 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); + f_start(); + f_create_and_delete(valueof(msg)); + f_shutdown_helper(); +} + +/* Create and delete message with both BSC and MME available */ +testcase TC_ecbe_create_delete_bsc_and_mme() runs on test_CT { + f_init(num_bsc := 1, num_mme := 1); + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; + var template (value) CBS_Message msg := t_CBSmsg(43, 16752); + + cell_list_success := ts_BSSMAP_CIL_CGI({ + ts_BSSMAP_CI_CGI('901'H, '70'H, 23, 42), + ts_BSSMAP_CI_CGI('901'H, '70'H, 24, 42), + ts_BSSMAP_CI_CGI('901'H, '70'H, 24, 43) + }); + g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); + g_pars_BSC[0].exp_cbs_msg := valueof(msg); + g_pars_BSC[0].cell_list_success := valueof(cell_list_success); g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); g_pars_MME[0].exp_cbs_msg := valueof(msg); f_start(); @@ -429,6 +440,7 @@ execute( TC_ecbe_create_delete_lac() ); execute( TC_ecbe_create_delete_ci() ); execute( TC_ecbe_create_delete_lai() ); + execute( TC_ecbe_create_delete_bsc_and_mme() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28856 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: I79ee41f183ef49e9fd606d2a3efa2767628bf142 Gerrit-Change-Number: 28856 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Change default cbsp/sbcap ports to allow multiple bsc/mme

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28857 ) Change subject: cbc: Change default cbsp/sbcap ports to allow multiple bsc/mme ...................................................................... cbc: Change default cbsp/sbcap ports to allow multiple bsc/mme The BSC/MMEs ports are applied in osmo-cbc.cfg similarly in sequential order. Change-Id: Ib443aba9396aebe0a56b1a79719bbcf66302a1aa --- M cbc/CBC_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 9c9c644..76fc3be 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -38,8 +38,8 @@ integer mp_cbc_cbsp_port := 48049; integer mp_cbc_sbcap_port := c_SBC_AP_PORT; integer mp_cbc_ecbe_port := 12345; - integer mp_local_cbsp_port := 9999; - integer mp_local_sbcap_port := 9998; + integer mp_local_cbsp_port := 15000; + integer mp_local_sbcap_port := 16000; }; const integer MAX_BSC := 3; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28857 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: Ib443aba9396aebe0a56b1a79719bbcf66302a1aa Gerrit-Change-Number: 28857 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Send Write-Replace-Warn-Ind after ACKing the request

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28883 ) Change subject: cbc: Send Write-Replace-Warn-Ind after ACKing the request ...................................................................... cbc: Send Write-Replace-Warn-Ind after ACKing the request This way we can test how does osmo-cbc behave when receiving such message. Related: OS#4945 Change-Id: Ifcdcddc7dccb5439126a5fa29bb540669ed25908 --- M cbc/CBC_Tests.ttcn M cbc/MME_ConnectionHandler.ttcn M library/sbcap/SBC_AP_Templates.ttcn 3 files changed, 106 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 76fc3be..8e7e1c5 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -115,7 +115,9 @@ cbc_host := cbc_host, cbc_sbcap_port := cbc_sbcap_port, start_fn := refers(f_MME_ConnHdlr_start_fn_void), - exp_cbs_msg := omit + exp_cbs_msg := omit, + write_replace_warning_ind_cause := omit, + bcast_cell_id_list := omit }; return pars; } @@ -298,6 +300,12 @@ private function f_mme_create_and_delete() runs on MME_ConnHdlr { f_sbcap_handle_write_replace_warn_req(g_pars.exp_cbs_msg, 0); + if (ispresent(g_pars.write_replace_warning_ind_cause) and + ispresent(g_pars.bcast_cell_id_list)) { + f_sbcap_tx_write_replace_warn_ind(0, g_pars.exp_cbs_msg, + g_pars.write_replace_warning_ind_cause, + g_pars.bcast_cell_id_list) + } f_sbcap_handle_stop_warn_req(0, g_pars.exp_cbs_msg); } @@ -411,10 +419,33 @@ f_shutdown_helper(); } +/* Create and delete message with MME available. MME reports + * Write-Replace-Warning-Indication and Stop-Warning-Indication to CBC + */ +testcase TC_ecbe_create_delete_mme_indication() runs on test_CT { + var template (value) CellId_Broadcast_List bcast_cell_id_li; + var template (value) CBS_Message msg := t_CBSmsg(48, 16752); + + f_init(num_bsc := 0, num_mme := 1); + + bcast_cell_id_li := { + ts_SBCAP_CellId_Broadcast_List_Item(ts_SBCAP_ECGI(f_enc_mcc_mnc('901'H, '70'H), 1234)), + ts_SBCAP_CellId_Broadcast_List_Item(ts_SBCAP_ECGI(f_enc_mcc_mnc('901'H, '70'H), 5678)) + }; + g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); + g_pars_MME[0].exp_cbs_msg := valueof(msg); + g_pars_MME[0].write_replace_warning_ind_cause := SBC_AP_Cause_message_accepted; + g_pars_MME[0].bcast_cell_id_list := valueof(bcast_cell_id_li); + f_start(); + f_create_and_delete(valueof(msg)); + f_shutdown_helper(); +} + /* Create and delete message with both BSC and MME available */ testcase TC_ecbe_create_delete_bsc_and_mme() runs on test_CT { f_init(num_bsc := 1, num_mme := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; + var template (value) CellId_Broadcast_List bcast_cell_id_li; var template (value) CBS_Message msg := t_CBSmsg(43, 16752); cell_list_success := ts_BSSMAP_CIL_CGI({ @@ -425,8 +456,14 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); + + bcast_cell_id_li := { + ts_SBCAP_CellId_Broadcast_List_Item(ts_SBCAP_ECGI(f_enc_mcc_mnc('901'H, '70'H), 1234)) + }; g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); g_pars_MME[0].exp_cbs_msg := valueof(msg); + g_pars_MME[0].write_replace_warning_ind_cause := SBC_AP_Cause_message_accepted; + g_pars_MME[0].bcast_cell_id_list := valueof(bcast_cell_id_li); f_start(); f_create_and_delete(valueof(msg)); f_shutdown_helper(); @@ -440,6 +477,7 @@ execute( TC_ecbe_create_delete_lac() ); execute( TC_ecbe_create_delete_ci() ); execute( TC_ecbe_create_delete_lai() ); + execute( TC_ecbe_create_delete_mme_indication() ); execute( TC_ecbe_create_delete_bsc_and_mme() ); } diff --git a/cbc/MME_ConnectionHandler.ttcn b/cbc/MME_ConnectionHandler.ttcn index 055aaa3..fec358c 100644 --- a/cbc/MME_ConnectionHandler.ttcn +++ b/cbc/MME_ConnectionHandler.ttcn @@ -35,7 +35,9 @@ charstring cbc_host, integer cbc_sbcap_port, void_fn start_fn, - CBS_Message exp_cbs_msg optional + CBS_Message exp_cbs_msg optional, + SBC_AP_Cause write_replace_warning_ind_cause optional, + CellId_Broadcast_List bcast_cell_id_list optional }; function f_MME_ConnHdlr_main(charstring id, MME_ConnHdlrPars pars) runs on MME_ConnHdlr { @@ -53,6 +55,17 @@ f_SBC_AP_send(tx, idx); } +function f_sbcap_tx_write_replace_warn_ind(integer idx := 0, CBS_Message msg, + SBC_AP_Cause cause, + template (value) CellId_Broadcast_List bcast_cell_id_li) +runs on MME_ConnHdlr { + var template (value) SBC_AP_PDU tx; + tx := ts_SBCAP_WRITE_WARNING_IND(int2bit(msg.msg_id, 16), + int2bit(msg.ser_nr, 16), + cause, bcast_cell_id_li); + f_SBC_AP_send(tx, idx); +} + function f_sbcap_tx_stop_warn_resp(integer idx := 0, CBS_Message msg) runs on MME_ConnHdlr { var template (value) SBC_AP_PDU tx; diff --git a/library/sbcap/SBC_AP_Templates.ttcn b/library/sbcap/SBC_AP_Templates.ttcn index d5f2471..0a9519e 100644 --- a/library/sbcap/SBC_AP_Templates.ttcn +++ b/library/sbcap/SBC_AP_Templates.ttcn @@ -11,6 +11,28 @@ import from SBC_AP_Types all; +/* 3GPP TS 36.413 9.2.1.38 */ +template (value) EUTRAN_CGI ts_SBCAP_ECGI(PLMNidentity plmn_id := '09F107'O, integer cell_id := 1) := { + pLMNidentity := plmn_id, + cell_ID := int2bit(cell_id, 28), + iE_Extensions := omit +} + +/* 3GPP TS 36.413 9.2.1.54 */ +template (value) CellId_Broadcast_List_Item ts_SBCAP_CellId_Broadcast_List_Item( + template (value) EUTRAN_CGI ecgi := ts_SBCAP_ECGI()) := { + eCGI := ecgi, + iE_Extensions := omit +} +template (value) Broadcast_Scheduled_Area_List ts_SBCAP_Broadcast_Scheduled_Area_List( + template (value) CellId_Broadcast_List cell_id_li := {ts_SBCAP_CellId_Broadcast_List_Item()}) +:= { + cellId_Broadcast_List := cell_id_li, + tAI_Broadcast_List := omit, + emergencyAreaID_Broadcast_List := omit, + iE_Extensions := omit +} + template (value) SBC_AP_PDU ts_SBCAP_PWS_RESTART( template (value) Restarted_Cell_List restart_cl, @@ -190,6 +212,37 @@ } } +/* 4.3.4.2.5 WRITE REPLACE WARNING INDICATION */ +template (value) SBC_AP_PDU +ts_SBCAP_WRITE_WARNING_IND(template (value) BIT16 p_msg_id, template (value) BIT16 p_ser_nr, + template (value) SBC_AP_Cause cause := SBC_AP_Cause_message_accepted, + template (value) CellId_Broadcast_List bcast_cell_id_li := {ts_SBCAP_CellId_Broadcast_List_Item()}) := { + initiatingMessage := { + procedureCode := id_Write_Replace_Warning_Indication, + criticality := ignore, + value_ := { + write_Replace_Warning_Indication := { + protocolIEs := { + { + id := SBC_AP_Constants.id_Message_Identifier, + criticality := reject, + value_ := { Message_Identifier := p_msg_id } + }, { + id := SBC_AP_Constants.id_Serial_Number, + criticality := reject, + value_ := { Serial_Number := p_ser_nr } + }, { + id := SBC_AP_Constants.id_Broadcast_Scheduled_Area_List, + criticality := reject, + value_ := { broadcast_Scheduled_Area_List := ts_SBCAP_Broadcast_Scheduled_Area_List(bcast_cell_id_li) } + } + }, + protocolExtensions := omit + } + } + } +} + /* 4.3.4.2.3 STOP WARNING REQUEST */ template (value) SBC_AP_PDU ts_SBCAP_WRITE_WARNING_RESP(template (value) BIT16 p_msg_id, template (value) BIT16 p_ser_nr, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28883 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: Ifcdcddc7dccb5439126a5fa29bb540669ed25908 Gerrit-Change-Number: 28883 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: bsc_subscr_conn_fsm: fix use after free

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28884 ) Change subject: bsc_subscr_conn_fsm: fix use after free ...................................................................... bsc_subscr_conn_fsm: fix use after free In cases where the MGCP client endpoint FSM is terminating early the bsc sbscr conn FSM receives the signal GSCON_EV_FORGET_MGW_ENDPOINT, which then calls gscon_forget_mgw_endpoint(). However, this only nulls the conn->user_plane->mgw_endpoint_ci_msc struct pointer, not the others. This causes the assignment FSM to access conn->assignment.created_ci_for_msc whle trying to initiate a DLCX. We must make sure that when the MGCP client endpoint FSM dies, that all other CI pointers that reference the same CI are also set to NULL. Change-Id: Ia857e3af6c17282b7e8178b6d249eb0f99ed98e3 Related: OS#5572 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 9af28c7..7c0c7c3 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -940,6 +940,10 @@ mgcp_client = osmo_mgcpc_ep_client(conn->user_plane.mgw_endpoint); mgcp_client_pool_put(mgcp_client); + /* Be sure that the endpoint CI we are maintaining in user_plane + * is also removed from the other locations as well. */ + gscon_forget_mgw_endpoint_ci(conn, conn->user_plane.mgw_endpoint_ci_msc); + conn->user_plane.mgw_endpoint = NULL; conn->user_plane.mgw_endpoint_ci_msc = NULL; conn->ho.created_ci_for_msc = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28884 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia857e3af6c17282b7e8178b6d249eb0f99ed98e3 Gerrit-Change-Number: 28884 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: bsc_subscr_conn_fsm: fix use after free

by laforge

Attention is currently required from: neels, pespin, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28884 ) Change subject: bsc_subscr_conn_fsm: fix use after free ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28884 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia857e3af6c17282b7e8178b6d249eb0f99ed98e3 Gerrit-Change-Number: 28884 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Aug 2022 08:29:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-cbc[master]: *_smscb_peer_fsm: Immediately NACK if Tx of msg failed

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28854 ) Change subject: *_smscb_peer_fsm: Immediately NACK if Tx of msg failed ...................................................................... *_smscb_peer_fsm: Immediately NACK if Tx of msg failed This makes the smscb_message_fsm receive immediate notice that this peer failed to deliver the message, avoiding need to wait for 10 seconds timeout. Change-Id: I1f3911accb327f3378d65902d53d86fb298fd528 --- M src/cbsp_smscb_peer_fsm.c M src/sbcap_smscb_peer_fsm.c M src/smscb_message_fsm.c 3 files changed, 27 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/cbsp_smscb_peer_fsm.c b/src/cbsp_smscb_peer_fsm.c index 872008c..8a435f9 100644 --- a/src/cbsp_smscb_peer_fsm.c +++ b/src/cbsp_smscb_peer_fsm.c @@ -266,11 +266,9 @@ case SMSCB_PEER_E_CREATE: /* send it to peer */ rc = peer_new_cbc_message(mp->peer, mp->cbcmsg); - if (rc == 0) { - /* wait for peers' response */ - osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, - T_WAIT_WRITE_ACK); - } + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, T_WAIT_WRITE_ACK); + if (rc != 0) /* Immediately timeout the message */ + fi->fsm->timer_cb(fi); break; default: OSMO_ASSERT(0); @@ -309,6 +307,7 @@ { struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; struct osmo_cbsp_decoded *cbsp; + int rc; switch (event) { case SMSCB_PEER_E_REPLACE: /* send WRITE-REPLACE to BSC */ @@ -320,8 +319,10 @@ /* TODO: we assume that the replace will always affect all original cells */ cbsp_append_cell_list(&cbsp->u.write_replace.cell_list, cbsp, mp); // TODO: ALL OTHER DATA - cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); + rc = cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_REPLACE_ACK, 10, T_WAIT_REPLACE_ACK); + if (rc != 0) /* Immediately timeout the message */ + fi->fsm->timer_cb(fi); break; case SMSCB_PEER_E_STATUS: /* send MSG-STATUS-QUERY to BSC */ cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_MSG_STATUS_QUERY); @@ -330,8 +331,10 @@ cbsp->u.msg_status_query.old_serial_nr = mp->cbcmsg->msg.serial_nr; cbsp_append_cell_list(&cbsp->u.msg_status_query.cell_list, cbsp, mp); cbsp->u.msg_status_query.channel_ind = CBSP_CHAN_IND_BASIC; - cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); + rc = cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_STATUS_ACK, 10, T_WAIT_STATUS_ACK); + if (rc != 0) /* Immediately timeout the message */ + fi->fsm->timer_cb(fi); break; default: OSMO_ASSERT(0); @@ -423,8 +426,6 @@ } } - - static int smscb_p_fsm_timer_cb(struct osmo_fsm_inst *fi) { switch (fi->T) { @@ -454,6 +455,7 @@ { struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; struct osmo_cbsp_decoded *cbsp; + int rc; switch (event) { case SMSCB_PEER_E_DELETE: /* send KILL to BSC */ @@ -478,8 +480,10 @@ OSMO_ASSERT(cbsp->u.kill.channel_ind); *(cbsp->u.kill.channel_ind) = CBSP_CHAN_IND_BASIC; } - cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); + rc = cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 10, T_WAIT_DELETE_ACK); + if (rc != 0) /* Immediately timeout the message */ + fi->fsm->timer_cb(fi); break; default: OSMO_ASSERT(0); @@ -497,7 +501,8 @@ [SMSCB_S_INIT] = { .name = "INIT", .in_event_mask = S(SMSCB_PEER_E_CREATE), - .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK), + .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK) | + S(SMSCB_S_ACTIVE), .action = smscb_p_fsm_init, }, [SMSCB_S_WAIT_WRITE_ACK] = { diff --git a/src/sbcap_smscb_peer_fsm.c b/src/sbcap_smscb_peer_fsm.c index 706a98f..87d5e16 100644 --- a/src/sbcap_smscb_peer_fsm.c +++ b/src/sbcap_smscb_peer_fsm.c @@ -116,11 +116,9 @@ case SMSCB_PEER_E_CREATE: /* send it to peer */ rc = peer_new_cbc_message(mp->peer, mp->cbcmsg); - if (rc == 0) { - /* wait for peers' response */ - osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, - T_WAIT_WRITE_ACK); - } + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, T_WAIT_WRITE_ACK); + if (rc != 0) /* Immediately timeout the message */ + fi->fsm->timer_cb(fi); break; default: OSMO_ASSERT(0); @@ -256,6 +254,7 @@ SBcAP_SBC_AP_PDU_t *sbcap; A_SEQUENCE_OF(void) *as_pdu; SBcAP_Write_Replace_Warning_Indication_IEs_t *ie; + int rc; switch (event) { case SMSCB_PEER_E_DELETE: /* send Stop-Warning to MME */ @@ -269,13 +268,16 @@ break; } if ((sbcap = sbcap_gen_stop_warning_req(mp->peer, mp->cbcmsg))) { - cbc_sbcap_link_tx(mp->peer->link.sbcap, sbcap); + rc = cbc_sbcap_link_tx(mp->peer->link.sbcap, sbcap); } else { LOGP(DSBcAP, LOGL_ERROR, "[%s] Tx SBc-AP Stop-Warning-Request: msg gen failed\n", mp->peer->name); + rc = -1; } osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 10, T_WAIT_DELETE_ACK); + if (rc != 0) /* Immediately timeout the message */ + fi->fsm->timer_cb(fi); break; case SMSCB_PEER_E_SBCAP_WRITE_IND: sbcap = (SBcAP_SBC_AP_PDU_t *)data; @@ -305,7 +307,8 @@ [SMSCB_S_INIT] = { .name = "INIT", .in_event_mask = S(SMSCB_PEER_E_CREATE), - .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK), + .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK) | + S(SMSCB_S_ACTIVE), .action = smscb_p_fsm_init, }, [SMSCB_S_WAIT_WRITE_ACK] = { diff --git a/src/smscb_message_fsm.c b/src/smscb_message_fsm.c index 9281736..e7f96c0 100644 --- a/src/smscb_message_fsm.c +++ b/src/smscb_message_fsm.c @@ -84,7 +84,7 @@ /* check if any per-peer children have not yet received the ACK or * timed out */ llist_for_each_entry(peer_fi, &fi->proc.children, proc.child) { - if (peer_fi->state == SMSCB_S_WAIT_WRITE_ACK) + if (peer_fi->state != SMSCB_S_ACTIVE) return; } rest_it_op_set_http_result(cbcmsg->it_op, 201, "Created"); // FIXME: error cases -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I1f3911accb327f3378d65902d53d86fb298fd528 Gerrit-Change-Number: 28854 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022