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

Change in osmo-remsim[master]: cosmetic: various typo/spelling fixes

by lynxis lazus

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

3 years, 1 month

1
0
0 0

Change in libosmo-abis[master]: stats: add site_id scope to ipa-rsl tcp stat names

by iedemam

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

3 years, 1 month

1
0
0 0

Change in osmo-remsim[master]: bankd: Better error messages during start-up

by lynxis lazus

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

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: abis_nm: run gsm_bts_check_cfg during oml bring up

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28023 ) Change subject: abis_nm: run gsm_bts_check_cfg during oml bring up ...................................................................... abis_nm: run gsm_bts_check_cfg during oml bring up Don't wait until RSL link goes up to check the reported features against the config. Do it in the OML bring up right after the features are reported. Related: SYS#5922, OS#5538 Change-Id: I6b1b4ef3e163528ed186050d848ec089a4315a7c --- M src/osmo-bsc/abis_nm.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/23/28023/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index bb44c70..f467d16 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -730,6 +730,12 @@ else rc = parse_attr_resp_info_attr(bts, trx, foh, &tp); + if (gsm_bts_check_cfg(bts) != 0) { + LOGP(DLINP, LOGL_ERROR, "(bts=%u) BTS config invalid, dropping BTS!\n", bts->nr); + ipaccess_drop_oml_deferred(bts); + return -EINVAL; + } + osmo_signal_dispatch(SS_NM, S_NM_GET_ATTR_REP, mb); return rc; -- 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-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-remsim[master]: cosmetic: various typo/spelling fixes

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28022 ) Change subject: cosmetic: various typo/spelling fixes ...................................................................... cosmetic: various typo/spelling fixes Change-Id: Idc4db138d83be0c7c0b0ff6dfbb9f094b21d6fa9 --- M src/bankd/bankd_main.c M src/client/main_fsm.c M src/client/user_ifdhandler.c M src/rspro_client_fsm.c 4 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/22/28022/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 012b48c..a96869f 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -82,7 +82,7 @@ asn_debug = 0; - /* intialize members of 'bankd' */ + /* initialize members of 'bankd' */ bankd->slotmaps = slotmap_init(bankd); INIT_LLIST_HEAD(&bankd->workers); pthread_mutex_init(&bankd->workers_mutex, NULL); diff --git a/src/client/main_fsm.c b/src/client/main_fsm.c index f8b1406..0aa7429 100644 --- a/src/client/main_fsm.c +++ b/src/client/main_fsm.c @@ -70,7 +70,7 @@ env[i++] = talloc_asprintf(env, "REMSIM_CAUSE=%s", cause); - /* ask frontend to append any frontend-speccific additional environment vars */ + /* ask frontend to append any frontend-specific additional environment vars */ rc = frontend_append_script_env(bc, env, i, 256-i-1); if (rc > 0) i = rc; diff --git a/src/client/user_ifdhandler.c b/src/client/user_ifdhandler.c index f3e5489..60adfdb 100644 --- a/src/client/user_ifdhandler.c +++ b/src/client/user_ifdhandler.c @@ -111,7 +111,7 @@ void __thread *talloc_asn1_ctx; struct client_thread { - /* bankd client runningi inside this thread */ + /* bankd client running inside this thread */ struct bankd_client *bc; /* inter-thread osmo-fd; communication with IFD/PCSC thread */ @@ -132,7 +132,7 @@ int it_sock_fd; }; -/* enqueue a msgb (containg 'struct itmsg') towards the IFD-handler thread */ +/* enqueue a msgb (containing 'struct itmsg') towards the IFD-handler thread */ static void enqueue_to_ifd(struct client_thread *ct, struct msgb *msg) { if (!msg) diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index c0336b7..bd07330 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -94,11 +94,11 @@ } enum server_conn_fsm_state { - /* waiting for initial connectiong to remsim-server */ + /* waiting for initial connection to remsim-server */ SRVC_ST_INIT, /* server connection established, waiting for ClientConnectRes */ SRVC_ST_ESTABLISHED, - /* server connection etsablished, ClientConnect succeeded */ + /* server connection established, ClientConnect succeeded */ SRVC_ST_CONNECTED, /* connection lost, we're waiting for a re-establish */ SRVC_ST_REESTABLISH, -- 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-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in docker-playground[master]: debian-bullseye-build: add libmnl-dev

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/28021 ) Change subject: debian-bullseye-build: add libmnl-dev ...................................................................... debian-bullseye-build: add libmnl-dev As required by libosmocore, e.g. when building programs directly in this container with osmo-dev.git/ttcn3/ttcn3.sh. Change-Id: I4cd05ef2c164dfb765ee365ab38b8dfd4f955ac6 --- M debian-bullseye-build/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/21/28021/1 diff --git a/debian-bullseye-build/Dockerfile b/debian-bullseye-build/Dockerfile index 14f5625..baeba30 100644 --- a/debian-bullseye-build/Dockerfile +++ b/debian-bullseye-build/Dockerfile @@ -37,6 +37,7 @@ libgnutls28-dev \ libgps-dev \ libgsm1-dev \ + libmnl-dev \ libncurses5-dev \ libnewlib-arm-none-eabi \ libortp-dev \ -- 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-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in docker-playground[master]: ttcn3-bsc-test: set osmo-bts-omldummy features

by laforge

Attention is currently required from: osmith, pespin. laforge 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+1 -- 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-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 May 2022 13:27:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-remsim[master]: encode actual hostname in RSPRO

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28020 ) Change subject: encode actual hostname in RSPRO ...................................................................... encode actual hostname in RSPRO The RSPRO ComponentIdentity includes a 'name' for each remsim component. So far we always used "fixme-name" instead of something meaningful. Let's use the hostname of the system instead. Change-Id: I14925f16ae242dae89fa853a2fe31c5c1b32981d --- M src/bankd/bankd_main.c M src/client/user_ifdhandler.c M src/server/remsim_server.c 3 files changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/20/28020/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index d8dab03..012b48c 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -59,6 +59,7 @@ __thread void *talloc_asn1_ctx; struct bankd *g_bankd; static void *g_tall_ctx; +static char g_hostname[256]; static void *worker_main(void *arg); @@ -91,7 +92,7 @@ bankd->srvc.bankd.num_slots = 8; bankd->comp_id.type = ComponentType_remsimBankd; - OSMO_STRLCPY_ARRAY(bankd->comp_id.name, "fixme-name"); + OSMO_STRLCPY_ARRAY(bankd->comp_id.name, g_hostname); OSMO_STRLCPY_ARRAY(bankd->comp_id.software, "remsim-bankd"); OSMO_STRLCPY_ARRAY(bankd->comp_id.sw_version, PACKAGE_VERSION); /* FIXME: other members of app_comp_id */ @@ -363,6 +364,9 @@ g_bankd = talloc_zero(NULL, struct bankd); OSMO_ASSERT(g_bankd); + if (gethostname(g_hostname, sizeof(g_hostname)) < 0) + strncpy(g_hostname, "unknown", sizeof(g_hostname)); + bankd_init(g_bankd); srvc = &g_bankd->srvc; @@ -370,7 +374,7 @@ srvc->server_port = 9998; srvc->handle_rx = bankd_srvc_handle_rx; srvc->own_comp_id.type = ComponentType_remsimBankd; - OSMO_STRLCPY_ARRAY(srvc->own_comp_id.name, "fixme-name"); + OSMO_STRLCPY_ARRAY(srvc->own_comp_id.name, g_hostname); OSMO_STRLCPY_ARRAY(srvc->own_comp_id.software, "remsim-bankd"); OSMO_STRLCPY_ARRAY(srvc->own_comp_id.sw_version, PACKAGE_VERSION); diff --git a/src/client/user_ifdhandler.c b/src/client/user_ifdhandler.c index 551db00..f3e5489 100644 --- a/src/client/user_ifdhandler.c +++ b/src/client/user_ifdhandler.c @@ -125,7 +125,6 @@ /* configuration of client thread; passed in from IFD thread */ struct client_thread_cfg { - const char *name; const char *server_host; int server_port; int client_id; @@ -367,8 +366,12 @@ struct client_thread_cfg *cfg = arg; struct client_config *ccfg; struct client_thread *ct; + char hostname[256]; int rc; + if (gethostname(hostname, sizeof(hostname)) < 0) + strncpy(hostname, "unknown", sizeof(hostname)); + osmo_select_init(); rc = osmo_ctx_init("client"); OSMO_ASSERT(rc == 0); @@ -387,7 +390,7 @@ if (!talloc_asn1_ctx) talloc_asn1_ctx= talloc_named_const(ct, 0, "asn1"); - ct->bc = remsim_client_create(ct, cfg->name, "remsim_ifdhandler", ccfg); + ct->bc = remsim_client_create(ct, hostname, "remsim_ifdhandler", ccfg); OSMO_ASSERT(ct->bc); ct->bc->data = ct; @@ -560,7 +563,6 @@ { struct ifd_client *ic; struct client_thread_cfg cfg = { - .name = "fixme-name", .server_host = "127.0.0.1", .server_port = -1, .client_id = 0, diff --git a/src/server/remsim_server.c b/src/server/remsim_server.c index c2d54e5..a2c1a8c 100644 --- a/src/server/remsim_server.c +++ b/src/server/remsim_server.c @@ -80,9 +80,13 @@ int main(int argc, char **argv) { + char hostname[256]; void *talloc_rest_ctx; int rc; + if (gethostname(hostname, sizeof(hostname)) < 0) + strncpy(hostname, "unknown", sizeof(hostname)); + g_tall_ctx = talloc_named_const(NULL, 0, "global"); talloc_asn1_ctx = talloc_named_const(g_tall_ctx, 0, "asn1"); talloc_rest_ctx = talloc_named_const(g_tall_ctx, 0, "rest"); @@ -106,7 +110,7 @@ goto out_rspro; g_rps->comp_id.type = ComponentType_remsimServer; - OSMO_STRLCPY_ARRAY(g_rps->comp_id.name, "fixme-name"); + OSMO_STRLCPY_ARRAY(g_rps->comp_id.name, hostname); OSMO_STRLCPY_ARRAY(g_rps->comp_id.software, "remsim-server"); OSMO_STRLCPY_ARRAY(g_rps->comp_id.sw_version, PACKAGE_VERSION); /* FIXME: other members of app_comp_id */ -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I14925f16ae242dae89fa853a2fe31c5c1b32981d Gerrit-Change-Number: 28020 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in docker-playground[master]: ttcn3-bsc-test: set osmo-bts-omldummy features

by osmith

Attention is currently required from: pespin. osmith 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: (1 comment) This change is ready for review. File ttcn3-bsc-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/28005/comment/fcd19f6e_325… PS1, Line 48: -f CCN > I had to add backslashes here to have it passed properly to osmo-bts-omldummy. syntax fixed -- 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-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 May 2022 13:12:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Fix dangling subscriber talloc ctx in f_TC_paging_Nreq

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28007 ) Change subject: bsc: Fix dangling subscriber talloc ctx in f_TC_paging_Nreq ...................................................................... bsc: Fix dangling subscriber talloc ctx in f_TC_paging_Nreq First, page only on BTS0, not all the BTS. This simplifies the test and also makes the subscriber be refcounted only on BTS0. Then, drop the OML connection after receiving all the expected paging requests; it will make the BSC flush the paging queue and hence avoid TTCN3 checks erroring due to dangling subscriber talloc contexts. Change-Id: Ibbd9168f3ac2c1cd4f4577644d75499d49c2823f --- M bsc/BSC_Tests.ttcn 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index f514c43..b35d316 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -3607,8 +3607,10 @@ } for (i := 0; i < num_subscribers; i := i + 1) { + /* Page on LAC-CI of BTS0: */ BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, - ts_BSSMAP_Paging(imsis[i], valueof(ts_BSSMAP_CIL_noCell), omit, omit))); + ts_BSSMAP_Paging(imsis[i], valueof(ts_BSSMAP_CIL_LAC_CI({ts_BSSMAP_CI_LAC_CI(1, 0)})), + omit, omit))); } T_rx.start; @@ -3645,6 +3647,9 @@ } } + /* Drop OML connection to have all paging requests flushed: */ + f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); + f_shutdown_helper(); } /* Verify BSC can schedule 500 paging requests under one minute if BTS buffer is good enough */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28007 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: Ibbd9168f3ac2c1cd4f4577644d75499d49c2823f Gerrit-Change-Number: 28007 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2022