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

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

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28006 ) Change subject: bankd: Better error messages during start-up ...................................................................... bankd: Better error messages during start-up If something goes wrong during startup (missing CSV file, ...) let's print a more human-readable error message than just asserting. Change-Id: I95222d44eefc60ad3857fa70ccebbacce60820df --- M src/bankd/bankd_main.c M src/bankd/bankd_pcsc.c 2 files changed, 16 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 36fd651..d8dab03 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -384,7 +384,9 @@ /* Np lock or mutex required for the pcsc_slot_names list, as this is only * read once during bankd initialization, when the worker threads haven't * started yet */ - OSMO_ASSERT(bankd_pcsc_read_slotnames(g_bankd, "bankd_pcsc_slots.csv") == 0); + rc = bankd_pcsc_read_slotnames(g_bankd, "bankd_pcsc_slots.csv"); + if (rc) + exit(1); /* Connection towards remsim-server */ rc = server_conn_fsm_alloc(g_bankd, srvc); @@ -396,16 +398,21 @@ /* create listening socket for inbound client connections */ rc = osmo_sock_init(AF_INET, SOCK_STREAM, IPPROTO_TCP, g_bind_ip, g_bind_port, OSMO_SOCK_F_BIND); - if (rc < 0) + if (rc < 0) { + fprintf(stderr, "Unable to create TCP socket at %s:%d: %s\n", + g_bind_ip ? g_bind_ip : "INADDR_ANY", g_bind_port, strerror(errno)); exit(1); + } g_bankd->accept_fd = rc; /* create worker threads: One per reader/slot! */ for (i = 0; i < g_bankd->srvc.bankd.num_slots; i++) { struct bankd_worker *w; w = bankd_create_worker(g_bankd, i); - if (!w) + if (!w) { + fprintf(stderr, "Error creating bankd worker thread\n"); exit(21); + } } while (1) { diff --git a/src/bankd/bankd_pcsc.c b/src/bankd/bankd_pcsc.c index e3b9ea6..d7bb39c 100644 --- a/src/bankd/bankd_pcsc.c +++ b/src/bankd/bankd_pcsc.c @@ -127,12 +127,16 @@ size_t bytes_read; struct parser_state ps; - if (csv_init(&p, CSV_APPEND_NULL) != 0) + if (csv_init(&p, CSV_APPEND_NULL) != 0) { + LOGP(DMAIN, LOGL_FATAL, "Error during csv_init\n"); return -1; + } fp = fopen(csv_file, "rb"); - if (!fp) + if (!fp) { + LOGP(DMAIN, LOGL_FATAL, "Error opening %s: %s\n", csv_file, strerror(errno)); return -1; + } parser_state_init(&ps); ps.bankd = bankd; 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- 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: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-remsim[master]: server: Fix segfault in error path (client component ID != client)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28026 ) Change subject: server: Fix segfault in error path (client component ID != client) ...................................................................... server: Fix segfault in error path (client component ID != client) When we terminate the FSM instance, we must immediately return. Change-Id: I8dff45daa6584ed111a8469e7b3bf90e7c939612 --- M src/server/rspro_server.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/server/rspro_server.c b/src/server/rspro_server.c index c003202..c4d4d79 100644 --- a/src/server/rspro_server.c +++ b/src/server/rspro_server.c @@ -138,6 +138,7 @@ if (conn->comp_id.type != ComponentType_remsimClient) { LOGPFSML(fi, LOGL_ERROR, "ConnectClientReq from identity != Client ?!?\n"); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); + return; } /* reparent us from srv->connections to srv->clients */ @@ -180,6 +181,7 @@ if (conn->comp_id.type != ComponentType_remsimBankd) { LOGPFSML(fi, LOGL_ERROR, "ConnectBankReq from identity != Bank ?!?\n"); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); + return; } /* FIXME: check for unique-ness */ conn->bank.bank_id = cbreq->bankId; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I8dff45daa6584ed111a8469e7b3bf90e7c939612 Gerrit-Change-Number: 28026 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-remsim[master]: server: Fix various error paths if startup fails

by laforge

Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28028 ) Change subject: server: Fix various error paths if startup fails ...................................................................... Patch Set 3: Code-Review+2 -- 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: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 04 May 2022 10:06:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-remsim[master]: server: Detect duplicate client/bankd connection; drop new ones

by laforge

Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28027 ) Change subject: server: Detect duplicate client/bankd connection; drop new ones ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I00387dbc19d689415470e2f08df08a47a78b81c0 Gerrit-Change-Number: 28027 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 04 May 2022 10:06:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-remsim[master]: server: Fix segfault in error path (client component ID != client)

by laforge

Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28026 ) Change subject: server: Fix segfault in error path (client component ID != client) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I8dff45daa6584ed111a8469e7b3bf90e7c939612 Gerrit-Change-Number: 28026 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 04 May 2022 10:06:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: Drop duplicate function helper

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28032 ) Change subject: Drop duplicate function helper ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idac049d07bf105b85a71af2f15f56552c453a370 Gerrit-Change-Number: 28032 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 May 2022 09:58:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: paging: Remove TODO comment

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28031 ) Change subject: paging: Remove TODO comment ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I980c0961e86d9464235ea9c403adba6b0eded58e Gerrit-Change-Number: 28031 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 May 2022 09:58:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: Drop duplicate function helper

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28032 ) Change subject: Drop duplicate function helper ...................................................................... Drop duplicate function helper Change-Id: Idac049d07bf105b85a71af2f15f56552c453a370 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/32/28032/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 3c8f381..12ddbd2 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -367,16 +367,6 @@ abis_rsl_chan_rqd_queue_flush(trx->bts); } -static void all_ts_dispatch_event(struct gsm_bts_trx *trx, uint32_t event) -{ - int ts_i; - for (ts_i = 0; ts_i < ARRAY_SIZE(trx->ts); ts_i++) { - struct gsm_bts_trx_ts *ts = &trx->ts[ts_i]; - if (ts->fi) - osmo_fsm_inst_dispatch(ts->fi, event, 0); - } -} - struct osmo_timer_list update_connection_stats_timer; /* Periodically call bsc_update_connection_stats() to keep stat items updated. @@ -474,7 +464,7 @@ } else if (isd->link_type == E1INP_SIGN_RSL) { rate_ctr_inc(rate_ctr_group_get_ctr(trx->bts->bts_ctrs, BTS_CTR_BTS_RSL_FAIL)); acc_ramp_abort(&trx->bts->acc_ramp); - all_ts_dispatch_event(trx, TS_EV_RSL_DOWN); + gsm_trx_all_ts_dispatch(trx, TS_EV_RSL_DOWN, NULL); if (trx->nr == 0) osmo_timer_del(&trx->bts->cbch_timer); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idac049d07bf105b85a71af2f15f56552c453a370 Gerrit-Change-Number: 28032 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: paging: Remove TODO comment

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28031 ) Change subject: paging: Remove TODO comment ...................................................................... paging: Remove TODO comment That function is used to get the number of paging groups, so it doesn't apply here. Change-Id: I980c0961e86d9464235ea9c403adba6b0eded58e --- M src/osmo-bsc/paging.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/31/28031/1 diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 90a0d12..e7a0ee2 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -641,7 +641,6 @@ /*! Estimate available_slots credit over a time period, used when below CCCH Load Indication Threshold */ uint16_t paging_estimate_available_slots(struct gsm_bts *bts, unsigned int time_span_s) { - /* TODO: use gsm48_number_of_paging_subchannels() instead? */ unsigned int n_pag_blocks = gsm0502_get_n_pag_blocks(&bts->si_common.chan_desc); uint16_t available_slots = n_pag_blocks * time_span_s * 1000000 / GSM51_MFRAME_DURATION_us; LOG_BTS(bts, DPAG, LOGL_DEBUG, "Estimated %u paging available_slots over %u seconds\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I980c0961e86d9464235ea9c403adba6b0eded58e Gerrit-Change-Number: 28031 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> 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 submitted this change. ( 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(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified 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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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