- gerrit-log - lists.osmocom.org

Change in osmo-remsim[master]: server: Fix various error paths if startup fails
by laforge 03 May '22

03 May '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28028 ) Change subject: server: Fix various error paths if startup fails ...................................................................... server: Fix various error paths if startup fails Don't segfault or use heap after free if osmo-remsim-server cannot fully initialize, e.g. due to ports already in use. Change-Id: I558e6a0ea089a779f916aa5576341d1c55da1271 --- M src/server/remsim_server.c M src/server/rest_api.c M src/server/rspro_server.c 3 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/28/28028/1 diff --git a/src/server/remsim_server.c b/src/server/remsim_server.c index a2c1a8c..9c46aa1 100644 --- a/src/server/remsim_server.c +++ b/src/server/remsim_server.c @@ -139,7 +139,6 @@ close(g_event_ofd.fd); out_rps: talloc_free(g_rps->slotmaps); - talloc_free(g_rps); out_rspro: rspro_server_destroy(g_rps); diff --git a/src/server/rest_api.c b/src/server/rest_api.c index 540fbd4..d3279c4 100644 --- a/src/server/rest_api.c +++ b/src/server/rest_api.c @@ -512,6 +512,7 @@ if (ulfius_start_framework(&g_instance) != U_OK) { LOGP(DREST, LOGL_FATAL, "Cannot start REST API on port %u\n", port); + ulfius_clean_instance(&g_instance); return -1; } return 0; diff --git a/src/server/rspro_server.c b/src/server/rspro_server.c index b753993..4ff4714 100644 --- a/src/server/rspro_server.c +++ b/src/server/rspro_server.c @@ -854,6 +854,11 @@ pthread_rwlock_unlock(&srv->rwlock); srv->link = ipa_server_link_create(ctx, NULL, host, port, accept_cb, srv); + if (!srv->link) { + talloc_free(srv); + return NULL; + } + ipa_server_link_open(srv->link); return srv; @@ -865,5 +870,6 @@ ipa_server_link_destroy(srv->link); srv->link = NULL; + pthread_rwlock_destroy(&srv->rwlock); talloc_free(srv); } -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I558e6a0ea089a779f916aa5576341d1c55da1271 Gerrit-Change-Number: 28028 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: remsim: server: TC_connect_{client,bankd}_duplicate
by laforge 03 May '22

03 May '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28025 ) Change subject: remsim: server: TC_connect_{client,bankd}_duplicate ...................................................................... remsim: server: TC_connect_{client,bankd}_duplicate Add two new tests for the remsim-server, which simulate what happens if a client or bankd with identical ID connects twice. We expect the second connection to get rejected at RSPRO level, and to be closed. Change-Id: I29023f6b5ba430338c77bf01508c81bd6d8c99fa Ralated: OS#5527 --- M remsim/RSPRO.asn M remsim/RemsimServer_Tests.ttcn 2 files changed, 85 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/28025/1 diff --git a/remsim/RSPRO.asn b/remsim/RSPRO.asn index faf9cec..5e2c05b 100644 --- a/remsim/RSPRO.asn +++ b/remsim/RSPRO.asn @@ -87,6 +87,7 @@ illegalSlotId (3), unsupportedProtocolVersion (4), unknownSlotmap (5), + identityInUse (6), -- no card is present in given slot cardNotPresent (100), diff --git a/remsim/RemsimServer_Tests.ttcn b/remsim/RemsimServer_Tests.ttcn index 135ce15..6d2b27d 100644 --- a/remsim/RemsimServer_Tests.ttcn +++ b/remsim/RemsimServer_Tests.ttcn @@ -133,6 +133,44 @@ setverdict(pass); } +/* duplicate connection from Same Client/Slot ID */ +testcase TC_connect_client_duplicate() runs on test_CT { + var ComponentIdentity rspro_id := valueof(ts_CompId(remsimClient, "foobar")); + var JsRoot js; + + f_init(); + f_rsres_init(); + f_rspro_init(rspro[0], mp_server_ip, mp_server_port, rspro_id, 0); + rspro[0].rspro_client_slot := valueof(ts_ClientSlot(13,1)); + + js := f_rsres_get("/api/backend/v1/clients"); + if (not match(js.clients, JsClients:{})) { + setverdict(fail, "Initial state not empty"); + mtc.stop; + } + f_rspro_connect_client(0); + js := f_rsres_get("/api/backend/v1/clients"); + if (not match(js.clients[0], tr_JsClient(CONNECTED_CLIENT, rspro[0].rspro_id))) { + setverdict(fail, "Non-matching JSON response"); + mtc.stop; + } + + /* connect a second time for same Client ID */ + f_rspro_init(rspro[1], mp_server_ip, mp_server_port, rspro_id, 1); + rspro[1].rspro_client_slot := valueof(ts_ClientSlot(13,1)); + f_rspro_connect_client(1, identityInUse); + f_rspro_exp_disconnect(1); + + /* expect the first connection still to be active */ + js := f_rsres_get("/api/backend/v1/clients"); + if (not match(js.clients[0], tr_JsClient(CONNECTED_CLIENT, rspro[0].rspro_id))) { + setverdict(fail, "Non-matching JSON response"); + mtc.stop; + } + + setverdict(pass); +} + testcase TC_connect_bank() runs on test_CT { var ComponentIdentity rspro_id := valueof(ts_CompId(remsimBankd, "foobar")); var JsRoot js; @@ -158,6 +196,50 @@ setverdict(pass); } +testcase TC_connect_bank_duplicate() runs on test_CT { + var ComponentIdentity rspro_id := valueof(ts_CompId(remsimBankd, "foobar")); + var JsRoot js; + + f_init(); + f_rsres_init(); + f_rspro_init(rspro[0], mp_server_ip, mp_server_port, rspro_id, 0); + rspro[0].rspro_bank_id := 1; + rspro[0].rspro_bank_nslots := 8; + + js := f_rsres_get("/api/backend/v1/banks"); + if (not match(js.banks, JsBanks:{})) { + setverdict(fail, "Initial state not empty"); + mtc.stop; + } + f_rspro_connect_client(0); + js := f_rsres_get("/api/backend/v1/banks"); + if (not match(js.banks[0], tr_JsBank(CONNECTED_BANKD, rspro[0].rspro_id, rspro[0].rspro_bank_id, + rspro[0].rspro_bank_nslots))) { + setverdict(fail, "Non-matching JSON response"); + mtc.stop; + } + + /* connect a second time for same Bank ID */ + f_rspro_init(rspro[1], mp_server_ip, mp_server_port, rspro_id, 1); + rspro[1].rspro_bank_id := 1; + rspro[1].rspro_bank_nslots := 23; + f_rspro_connect_client(1, identityInUse); + + /* expect only the first bank to survive */ + js := f_rsres_get("/api/backend/v1/banks"); + if (not match(js.banks[0], tr_JsBank(CONNECTED_BANKD, rspro[0].rspro_id, rspro[0].rspro_bank_id, + rspro[0].rspro_bank_nslots))) { + setverdict(fail, "Non-matching JSON response"); + mtc.stop; + } + + /* wait for T2/rejected timer to expire in server */ + f_sleep(2.0); + + setverdict(pass); +} + + function f_ensure_slotmaps(template JsSlotmaps maps) runs on http_CT { var JsRoot js; @@ -508,7 +590,9 @@ control { execute( TC_connect_and_nothing() ); execute( TC_connect_client() ); + execute( TC_connect_client_duplicate() ); execute( TC_connect_bank() ); + execute( TC_connect_bank_duplicate() ); execute( TC_slotmap_add() ); execute( TC_slotmap_add_conn_cl_b() ); execute( TC_slotmap_add_out_of_range() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28025 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: I29023f6b5ba430338c77bf01508c81bd6d8c99fa Gerrit-Change-Number: 28025 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in libosmo-abis[master]: stats: add site_id scope to ipa-rsl tcp stat names
by pespin 03 May '22

03 May '22

Attention is currently required from: iedemam. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/28024 ) Change subject: stats: add site_id scope to ipa-rsl tcp stat names ...................................................................... Patch Set 1: (1 comment) File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/28024/comment/f77aa1a0_8c62c981 PS1, Line 299: char tcp_stat_name[32]; 32 may be too small here, I'd better use 64 now. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/28024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I3b44319fb4bc6a812800001c58dfe1a664645b43 Gerrit-Change-Number: 28024 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Comment-Date: Tue, 03 May 2022 14:50:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in libosmo-abis[master]: stats: add site_id scope to ipa-rsl tcp stat names
by pespin 03 May '22

03 May '22

Attention is currently required from: iedemam. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/28024 ) Change subject: stats: add site_id scope to ipa-rsl tcp stat names ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/28024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I3b44319fb4bc6a812800001c58dfe1a664645b43 Gerrit-Change-Number: 28024 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Comment-Date: Tue, 03 May 2022 14:49:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: abis_nm: run gsm_bts_check_cfg during oml bring up
by pespin 03 May '22

03 May '22

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28023 ) Change subject: abis_nm: run gsm_bts_check_cfg during oml bring up ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6b1b4ef3e163528ed186050d848ec089a4315a7c Gerrit-Change-Number: 28023 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 May 2022 14:48:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: debian-bullseye-build: add libmnl-dev
by pespin 03 May '22

03 May '22

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28021 ) Change subject: debian-bullseye-build: add libmnl-dev ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4cd05ef2c164dfb765ee365ab38b8dfd4f955ac6 Gerrit-Change-Number: 28021 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 May 2022 14:45:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: ttcn3-bsc-test: set osmo-bts-omldummy features
by pespin 03 May '22

03 May '22

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28005 ) Change subject: ttcn3-bsc-test: set osmo-bts-omldummy features ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib22f25431330676d59900de7bfb3d89e7872baf1 Gerrit-Change-Number: 28005 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 May 2022 14:45:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-remsim[master]: cosmetic: various typo/spelling fixes
by lynxis lazus 03 May '22

03 May '22

Attention is currently required from: laforge. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28022 ) Change subject: cosmetic: various typo/spelling fixes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Idc4db138d83be0c7c0b0ff6dfbb9f094b21d6fa9 Gerrit-Change-Number: 28022 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 03 May 2022 14:39:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmo-abis[master]: stats: add site_id scope to ipa-rsl tcp stat names
by iedemam 03 May '22

03 May '22

iedemam has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/28024 ) Change subject: stats: add site_id scope to ipa-rsl tcp stat names ...................................................................... stats: add site_id scope to ipa-rsl tcp stat names Multiple IPA units can have the same bts_id but scoping by their site_ids will make them unique. This also clarifies the "bts" number being communicated. It is not the bts configuration index in osmo-bsc.cfg, it is the bts id specified in the vty line: bts X ipa unit-id SITE BTS Change-Id: I3b44319fb4bc6a812800001c58dfe1a664645b43 --- M src/input/ipaccess.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/24/28024/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 8dc1008..9bee3f9 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -343,8 +343,8 @@ "could not register FD\n"); goto err; } - snprintf(tcp_stat_name, sizeof(tcp_stat_name), "bts.%u.ipa-rsl.%u", - unit_data.bts_id, unit_data.trx_id); + snprintf(tcp_stat_name, sizeof(tcp_stat_name), "site.%u.bts.%u.ipa-rsl.%u", + unit_data.site_id, unit_data.bts_id, unit_data.trx_id); osmo_stats_tcp_osmo_fd_register(newbfd, tcp_stat_name); e1i_ts = ipaccess_line_ts(newbfd, new_line); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/28024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I3b44319fb4bc6a812800001c58dfe1a664645b43 Gerrit-Change-Number: 28024 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-MessageType: newchange

1 0

Change in osmo-remsim[master]: bankd: Better error messages during start-up
by lynxis lazus 03 May '22

03 May '22

Attention is currently required from: laforge. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28006 ) Change subject: bankd: Better error messages during start-up ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I95222d44eefc60ad3857fa70ccebbacce60820df Gerrit-Change-Number: 28006 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 03 May 2022 14:31:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2025

2024

2023

2022

gerrit-log