- gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: Rename functions generating OML SetAttr messages
by pespin 26 Apr '22

26 Apr '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27931 ) Change subject: Rename functions generating OML SetAttr messages ...................................................................... Rename functions generating OML SetAttr messages Its name is totally misleading, since they seem to be related to GetAttributes messages rather than SetAttributes. Change-Id: I306cb407dbd9b98e301b5d93046bdadcb466b82b --- M include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M src/osmo-bsc/nm_bts_fsm.c M src/osmo-bsc/nm_gprs_cell_fsm.c M src/osmo-bsc/nm_gprs_nse_fsm.c M src/osmo-bsc/nm_gprs_nsvc_fsm.c M src/osmo-bsc/nm_rcarrier_fsm.c M tests/nanobts_omlattr/nanobts_omlattr_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.ok 9 files changed, 47 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/31/27931/1 diff --git a/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h b/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h index 687f16a..d6933fc 100644 --- a/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h +++ b/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h @@ -28,9 +28,9 @@ struct gsm_bts; struct gsm_bts_trx; -struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts); -struct msgb *nanobts_attr_nse_get(struct gsm_bts_sm *bts_sm); -struct msgb *nanobts_attr_cell_get(struct gsm_bts *bts); -struct msgb *nanobts_attr_nsvc_get(struct gsm_bts *bts); -struct msgb *nanobts_attr_radio_get(struct gsm_bts *bts, +struct msgb *nanobts_gen_set_bts_attr(struct gsm_bts *bts); +struct msgb *nanobts_gen_set_nse_attr(struct gsm_bts_sm *bts_sm); +struct msgb *nanobts_gen_set_cell_attr(struct gsm_bts *bts); +struct msgb *nanobts_gen_set_nsvc_attr(struct gsm_bts *bts); +struct msgb *nanobts_gen_set_radio_attr(struct gsm_bts *bts, struct gsm_bts_trx *trx); diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index 517cfd3..4f7a487 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -27,7 +27,7 @@ #include <osmocom/gsm/bts_features.h> /* 3GPP TS 52.021 section 8.6.1 Set BTS Attributes */ -struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts) +struct msgb *nanobts_gen_set_bts_attr(struct gsm_bts *bts) { struct msgb *msgb; uint8_t buf[256]; @@ -108,7 +108,7 @@ return msgb; } -struct msgb *nanobts_attr_nse_get(struct gsm_bts_sm *bts_sm) +struct msgb *nanobts_gen_set_nse_attr(struct gsm_bts_sm *bts_sm) { struct msgb *msgb; uint8_t buf[256]; @@ -147,7 +147,7 @@ return msgb; } -struct msgb *nanobts_attr_cell_get(struct gsm_bts *bts) +struct msgb *nanobts_gen_set_cell_attr(struct gsm_bts *bts) { struct msgb *msgb; uint8_t buf[256]; @@ -206,7 +206,7 @@ return msgb; } -struct msgb *nanobts_attr_nsvc_get(struct gsm_bts *bts) +struct msgb *nanobts_gen_set_nsvc_attr(struct gsm_bts *bts) { struct msgb *msgb; uint8_t buf[256]; @@ -251,7 +251,7 @@ return msgb; } -struct msgb *nanobts_attr_radio_get(struct gsm_bts *bts, +struct msgb *nanobts_gen_set_radio_attr(struct gsm_bts *bts, struct gsm_bts_trx *trx) { struct msgb *msgb; diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c index b9ed5a0..bb4fe3e 100644 --- a/src/osmo-bsc/nm_bts_fsm.c +++ b/src/osmo-bsc/nm_bts_fsm.c @@ -105,7 +105,7 @@ if (bts->mo.get_attr_rep_received && !bts->mo.set_attr_sent && !bts->mo.set_attr_ack_received) { bts->mo.set_attr_sent = true; - msgb = nanobts_attr_bts_get(bts); + msgb = nanobts_gen_set_bts_attr(bts); abis_nm_set_bts_attr(bts, msgb->data, msgb->len); msgb_free(msgb); } diff --git a/src/osmo-bsc/nm_gprs_cell_fsm.c b/src/osmo-bsc/nm_gprs_cell_fsm.c index 4df3a3e..b3f960c 100644 --- a/src/osmo-bsc/nm_gprs_cell_fsm.c +++ b/src/osmo-bsc/nm_gprs_cell_fsm.c @@ -95,7 +95,7 @@ if (!cell->mo.set_attr_sent && !cell->mo.set_attr_ack_received) { cell->mo.set_attr_sent = true; - msgb = nanobts_attr_cell_get(bts); + msgb = nanobts_gen_set_cell_attr(bts); OSMO_ASSERT(msgb); abis_nm_ipaccess_set_attr(bts, NM_OC_GPRS_CELL, bts->bts_nr, 0, 0xff, msgb->data, msgb->len); diff --git a/src/osmo-bsc/nm_gprs_nse_fsm.c b/src/osmo-bsc/nm_gprs_nse_fsm.c index 8a63f56..5994f32 100644 --- a/src/osmo-bsc/nm_gprs_nse_fsm.c +++ b/src/osmo-bsc/nm_gprs_nse_fsm.c @@ -94,7 +94,7 @@ if (!nse->mo.set_attr_sent && !nse->mo.set_attr_ack_received) { nse->mo.set_attr_sent = true; - msgb = nanobts_attr_nse_get(bts_sm); + msgb = nanobts_gen_set_nse_attr(bts_sm); abis_nm_ipaccess_set_attr(bts, NM_OC_GPRS_NSE, bts->bts_nr, 0xff, 0xff, msgb->data, msgb->len); diff --git a/src/osmo-bsc/nm_gprs_nsvc_fsm.c b/src/osmo-bsc/nm_gprs_nsvc_fsm.c index 5f0c5de..b11c2a6 100644 --- a/src/osmo-bsc/nm_gprs_nsvc_fsm.c +++ b/src/osmo-bsc/nm_gprs_nsvc_fsm.c @@ -107,7 +107,7 @@ return; } nsvc->mo.set_attr_sent = true; - msgb = nanobts_attr_nsvc_get(nsvc->bts); + msgb = nanobts_gen_set_nsvc_attr(nsvc->bts); OSMO_ASSERT(msgb); abis_nm_ipaccess_set_attr(nsvc->bts, NM_OC_GPRS_NSVC, nsvc->bts->bts_nr, nsvc->id, 0xff, msgb->data, msgb->len); diff --git a/src/osmo-bsc/nm_rcarrier_fsm.c b/src/osmo-bsc/nm_rcarrier_fsm.c index b9e67c1..325ec56 100644 --- a/src/osmo-bsc/nm_rcarrier_fsm.c +++ b/src/osmo-bsc/nm_rcarrier_fsm.c @@ -92,7 +92,7 @@ if (!trx->mo.set_attr_sent && !trx->mo.set_attr_ack_received) { trx->mo.set_attr_sent = true; - msgb = nanobts_attr_radio_get(trx->bts, trx); + msgb = nanobts_gen_set_radio_attr(trx->bts, trx); abis_nm_set_radio_attr(trx, msgb->data, msgb->len); msgb_free(msgb); } diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index ecf5f82..32e2c53 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -34,13 +34,13 @@ extern struct gsm_bts_model bts_model_nanobts; -static void test_nanobts_attr_bts_get(struct gsm_bts *bts, uint8_t *expected) +static void test_nanobts_gen_set_bts_attr(struct gsm_bts *bts, uint8_t *expected) { struct msgb *msgb; - printf("Testing nanobts_attr_bts_get()...\n"); + printf("Testing nanobts_gen_set_bts_attr()...\n"); - msgb = nanobts_attr_bts_get(bts); + msgb = nanobts_gen_set_bts_attr(bts); printf("result= %s\n", osmo_hexdump_nospc(msgb->data, msgb->len)); printf("expected=%s\n", osmo_hexdump_nospc(expected, msgb->len)); OSMO_ASSERT(msgb_eq_data_print(msgb, expected, msgb->len)); @@ -50,13 +50,13 @@ printf("\n"); } -static void test_nanobts_attr_nse_get(struct gsm_bts *bts, uint8_t *expected) +static void test_nanobts_gen_set_nse_attr(struct gsm_bts *bts, uint8_t *expected) { struct msgb *msgb; - printf("Testing nanobts_attr_nse_get()...\n"); + printf("Testing nanobts_gen_set_nse_attr()...\n"); - msgb = nanobts_attr_nse_get(bts->site_mgr); + msgb = nanobts_gen_set_nse_attr(bts->site_mgr); printf("result= %s\n", osmo_hexdump_nospc(msgb->data, msgb->len)); printf("expected=%s\n", osmo_hexdump_nospc(expected, msgb->len)); OSMO_ASSERT(msgb_eq_data_print(msgb, expected, msgb->len)); @@ -66,13 +66,13 @@ printf("\n"); } -static void test_nanobts_attr_cell_get(struct gsm_bts *bts, uint8_t *expected) +static void test_nanobts_gen_set_cell_attr(struct gsm_bts *bts, uint8_t *expected) { struct msgb *msgb; - printf("Testing nanobts_attr_cell_get()...\n"); + printf("Testing nanobts_gen_set_cell_attr()...\n"); - msgb = nanobts_attr_cell_get(bts); + msgb = nanobts_gen_set_cell_attr(bts); printf("result= %s\n", osmo_hexdump_nospc(msgb->data, msgb->len)); printf("expected=%s\n", osmo_hexdump_nospc(expected, msgb->len)); OSMO_ASSERT(msgb_eq_data_print(msgb, expected, msgb->len)); @@ -82,13 +82,13 @@ printf("\n"); } -static void test_nanobts_attr_nsvc_get(struct gsm_bts *bts, uint8_t *expected) +static void test_nanobts_gen_set_nsvc_attr(struct gsm_bts *bts, uint8_t *expected) { struct msgb *msgb; - printf("Testing nanobts_attr_nsvc_get()...\n"); + printf("Testing nanobts_gen_set_nsvc_attr()...\n"); - msgb = nanobts_attr_nsvc_get(bts); + msgb = nanobts_gen_set_nsvc_attr(bts); printf("result= %s\n", osmo_hexdump_nospc(msgb->data, msgb->len)); printf("expected=%s\n", osmo_hexdump_nospc(expected, msgb->len)); OSMO_ASSERT(msgb_eq_data_print(msgb, expected, msgb->len)); @@ -98,15 +98,15 @@ printf("\n"); } -static void test_nanobts_attr_radio_get(struct gsm_bts *bts, +static void test_nanobts_gen_set_radio_attr(struct gsm_bts *bts, struct gsm_bts_trx *trx, uint8_t *expected) { struct msgb *msgb; - printf("Testing nanobts_attr_nsvc_get()...\n"); + printf("Testing nanobts_gen_set_nsvc_attr()...\n"); - msgb = nanobts_attr_radio_get(bts, trx); + msgb = nanobts_gen_set_radio_attr(bts, trx); printf("result= %s\n", osmo_hexdump_nospc(msgb->data, msgb->len)); printf("expected=%s\n", osmo_hexdump_nospc(expected, msgb->len)); OSMO_ASSERT(msgb_eq_data_print(msgb, expected, msgb->len)); @@ -154,7 +154,7 @@ bts->network = net; trx = talloc_zero(ctx, struct gsm_bts_trx); - /* Parameters needed by nanobts_attr_bts_get() */ + /* Parameters needed by nanobts_gen_set_bts_attr() */ bts->rach_b_thresh = -1; bts->rach_ldavg_slots = -1; bts->c0->arfcn = 866; @@ -173,7 +173,7 @@ 0x01, 0x05, 0x39 }; - /* Parameters needed to test nanobts_attr_nse_get() */ + /* Parameters needed to test nanobts_gen_set_nse_attr() */ bts->site_mgr->gprs.nse.nsei = 101; uint8_t attr_nse_expected[] = { 0x9d, 0x00, 0x02, 0x00, 0x65, 0xa0, 0x00, 0x07, 0x03, 0x03, 0x03, @@ -182,7 +182,7 @@ 0x0a, 0x03, 0x0a, 0x03 }; - /* Parameters needed to test nanobts_attr_cell_get() */ + /* Parameters needed to test nanobts_gen_set_cell_attr() */ bts->gprs.rac = 0x00; bts->gprs.cell.bvci = 2; bts->gprs.mode = BTS_GPRS_GPRS; @@ -194,7 +194,7 @@ 0xfa, 0x00, 0xfa, 0x02 }; - /* Parameters needed to test nanobts_attr_nsvc_get() */ + /* Parameters needed to test nanobts_gen_set_nsvc_attr() */ struct osmo_sockaddr_str addr; osmo_sockaddr_str_from_str(&addr, "10.9.1.101", 23000); osmo_sockaddr_str_to_sockaddr(&addr, &bts->site_mgr->gprs.nsvc[0].remote.u.sas); @@ -205,7 +205,7 @@ 0x09, 0x01, 0x65, 0x5a, 0x3c }; - /* Parameters needed to test nanobts_attr_radio_get() */ + /* Parameters needed to test nanobts_gen_set_radio_attr() */ trx->arfcn = 866; trx->max_power_red = 22; bts->c0->max_power_red = 22; @@ -213,11 +213,11 @@ { 0x2d, 0x0b, 0x05, 0x00, 0x02, 0x03, 0x62 }; /* Run tests */ - test_nanobts_attr_bts_get(bts, attr_bts_expected); - test_nanobts_attr_nse_get(bts, attr_nse_expected); - test_nanobts_attr_cell_get(bts, attr_cell_expected); - test_nanobts_attr_nsvc_get(bts, attr_nscv_expected); - test_nanobts_attr_radio_get(bts, trx, attr_radio_expected); + test_nanobts_gen_set_bts_attr(bts, attr_bts_expected); + test_nanobts_gen_set_nse_attr(bts, attr_nse_expected); + test_nanobts_gen_set_cell_attr(bts, attr_cell_expected); + test_nanobts_gen_set_nsvc_attr(bts, attr_nscv_expected); + test_nanobts_gen_set_radio_attr(bts, trx, attr_radio_expected); /* NSVC IPv6 test */ struct osmo_sockaddr_str addr6; @@ -234,7 +234,7 @@ 0xfd, 0x00, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, }; - test_nanobts_attr_nsvc_get(bts, attr_nscv6_expected); + test_nanobts_gen_set_nsvc_attr(bts, attr_nscv6_expected); printf("Done\n"); diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.ok b/tests/nanobts_omlattr/nanobts_omlattr_test.ok index faeac7b..b011ed4 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.ok +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.ok @@ -1,29 +1,29 @@ -Testing nanobts_attr_bts_get()... +Testing nanobts_gen_set_bts_attr()... result= 19736d67615b5518060e00020120331e2424a83421a81f3f2500010a0c0a0b012a5a2b03e80a01230a080362093f99000700f11000010539 expected=19736d67615b5518060e00020120331e2424a83421a81f3f2500010a0c0a0b012a5a2b03e80a01230a080362093f99000700f11000010539 ok. -Testing nanobts_attr_nse_get()... +Testing nanobts_gen_set_nse_attr()... result= 9d00020065a00007030303031e030aa1000b03030303030a030a030a03 expected=9d00020065a00007030303031e030aa1000b03030303030a030a030a03 ok. -Testing nanobts_attr_cell_get()... +Testing nanobts_gen_set_cell_attr()... result= 9a0001009c000205039e00020002a30009140505a0050a04080fa800020f00a9000500fa00fa02 expected=9a0001009c000205039e00020002a30009140505a0050a04080fa800020f00a9000500fa00fa02 ok. -Testing nanobts_attr_nsvc_get()... +Testing nanobts_gen_set_nsvc_attr()... result= 9f00020065a2000859d80a0901655a3c expected=9f00020065a2000859d80a0901655a3c ok. -Testing nanobts_attr_nsvc_get()... +Testing nanobts_gen_set_nsvc_attr()... result= 2d0b0500020362 expected=2d0b0500020362 ok. -Testing nanobts_attr_nsvc_get()... +Testing nanobts_gen_set_nsvc_attr()... result= 9f00020065fd001629005a3c59e2fd005678901234567890123456789012 expected=9f00020065fd001629005a3c59e2fd005678901234567890123456789012 ok. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I306cb407dbd9b98e301b5d93046bdadcb466b82b Gerrit-Change-Number: 27931 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-msc[master]: CM Serv Rej: do not crash on use count mismatch
by laforge 26 Apr '22

26 Apr '22

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/27916 ) Change subject: CM Serv Rej: do not crash on use count mismatch ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/27916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2009df42d1f27ec0d011e22bfc46dbc17afe7239 Gerrit-Change-Number: 27916 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Apr 2022 15:02:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmocom-bb[master]: firmware/apps/rssi: fix -Wmaybe-uninitialized in handle_pm()
by laforge 26 Apr '22

26 Apr '22

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/27871 ) Change subject: firmware/apps/rssi: fix -Wmaybe-uninitialized in handle_pm() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/27871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I86d241c41d4de135f4cd79f56f7fdd18696b7890 Gerrit-Change-Number: 27871 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Apr 2022 15:01:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmocom-bb[master]: firmware/layer1: fix unused variable 'l1h' [-Wunused-variable]
by laforge 26 Apr '22

26 Apr '22

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/27870 ) Change subject: firmware/layer1: fix unused variable 'l1h' [-Wunused-variable] ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/27870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If8c3da3908c1dab7a93e69daee13426f9bdbccad Gerrit-Change-Number: 27870 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Apr 2022 15:00:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: SimCard.reset(): fix SyntaxWarning: 'is' with a literal
by laforge 26 Apr '22

26 Apr '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27881 ) Change subject: SimCard.reset(): fix SyntaxWarning: 'is' with a literal ...................................................................... SimCard.reset(): fix SyntaxWarning: 'is' with a literal Change-Id: I5860179acd1cb330e91dbe5b57cd60cd520f2d9d --- M pySim/cards.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/cards.py b/pySim/cards.py index 1ed1634..b186044 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -63,7 +63,7 @@ def reset(self): rc = self._scc.reset_card() - if rc is 1: + if rc == 1: return self._scc.get_atr() else: return None -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27881 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5860179acd1cb330e91dbe5b57cd60cd520f2d9d Gerrit-Change-Number: 27881 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in pysim[master]: SimCard.reset(): fix SyntaxWarning: 'is' with a literal
by laforge 26 Apr '22

26 Apr '22

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27881 ) Change subject: SimCard.reset(): fix SyntaxWarning: 'is' with a literal ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27881 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5860179acd1cb330e91dbe5b57cd60cd520f2d9d Gerrit-Change-Number: 27881 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Apr 2022 14:59:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: transport/pcsc: throw ReaderError with a message
by laforge 26 Apr '22

26 Apr '22

Attention is currently required from: fixeria, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27882 ) Change subject: transport/pcsc: throw ReaderError with a message ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File pySim/transport/pcsc.py: https://gerrit.osmocom.org/c/pysim/+/27882/comment/2300b69f_ca3ec794 PS1, Line 37: with language-wise "No reader found for number X" would make more sense, IMHO. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id08c4990857f7083a8d1cefc90ff85fc20ab6fef Gerrit-Change-Number: 27882 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Apr 2022 14:59:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-remsim[master]: Check RSPRO component type; print error if type doesn't match
by laforge 26 Apr '22

26 Apr '22

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/27929 to look at the new patch set (#2). Change subject: Check RSPRO component type; print error if type doesn't match ...................................................................... Check RSPRO component type; print error if type doesn't match If one component connects to another component, verify that the remote component type (bank/server/client) matches our expectation. This is important in order to detect a misconfiguration of port numbers, for example. Closes: OS#5548 Change-Id: I89a4fc4331e8a0622f8f146c7fc235d34d990497 --- M src/bankd/bankd_main.c M src/client/remsim_client.c 2 files changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/29/27929/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/27929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I89a4fc4331e8a0622f8f146c7fc235d34d990497 Gerrit-Change-Number: 27929 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

Change in osmo-bsc[master]: paging: Submit up to 20 paging requests in a single work iteration
by pespin 26 Apr '22

26 Apr '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27885 ) Change subject: paging: Submit up to 20 paging requests in a single work iteration ...................................................................... paging: Submit up to 20 paging requests in a single work iteration Having one paging request being sent every PAGING_TIMER (500msec) is too slow in case BSC is serving lots of subscribers on a BTS. Hence, we want to send many paging requests at once while still trying not to fill the BTS buffer. Morever, we don't want to send tons of paging requests at once, hence we limit the amount of paging requests sent in one timer iteration (MAX_PAGE_REQ_PER_ITER) in order to avoid the BSC doing lots of work there at once, keeping it busy from processing other tasks. Related: SYS#5922 Change-Id: I609fa67834b426456f48f6fb2acb601c5905f178 --- M src/osmo-bsc/paging.c 1 file changed, 48 insertions(+), 34 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 898fa95..f81713e 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -60,6 +60,9 @@ #define PAGING_TIMER 0, 500000 +/* How many paging requests to Tx on RSL at max before going back to main loop */ +#define MAX_PAGE_REQ_PER_ITER 20 + /* * Kill one paging request update the internal list... */ @@ -182,7 +185,8 @@ */ static void paging_handle_pending_requests(struct gsm_bts_paging_state *paging_bts) { - struct gsm_paging_request *request = NULL; + struct gsm_paging_request *request, *initial_request; + unsigned int num_paged = 0; /* * Determine if the pending_requests list is empty and @@ -193,43 +197,53 @@ return; } - /* - * In case the BTS does not provide us with load indication and we - * ran out of slots, call an autofill routine. It might be that the - * BTS did not like our paging messages and then we have counted down - * to zero and we do not get any messages. - */ - if (paging_bts->available_slots == 0) { - osmo_timer_schedule(&paging_bts->credit_timer, 5, 0); - return; - } - - request = llist_first_entry(&paging_bts->pending_requests, - struct gsm_paging_request, entry); - - /* we need to determine the number of free channels */ - if (paging_bts->free_chans_need != -1 && - can_send_pag_req(request->bts, request->chan_type) != 0) { - LOG_PAGING_BTS(request, request->bts, DPAG, LOGL_INFO, - "Paging delayed: not enough free channels (<%d)\n", - paging_bts->free_chans_need); - goto skip_paging; - } - /* Skip paging if the bts is down. */ - if (!request->bts->oml_link) - goto skip_paging; + if (!paging_bts->bts->oml_link) + goto sched_next_iter; - /* handle the paging request now */ - page_ms(request); - paging_bts->available_slots--; - request->attempts++; + /* do while loop: Try send at most first MAX_PAGE_REQ_PER_ITER paging + * requests (or before if there are no more available slots). Since + * transmitted requests are re-appended at the end of the list, we check + * until we find the first req again, in order to avoid retransmitting + * repeated requests until next time paging is scheduled. */ + initial_request = llist_first_entry(&paging_bts->pending_requests, + struct gsm_paging_request, entry); + request = initial_request; + do { + /* + * In case the BTS does not provide us with load indication and we + * ran out of slots, call an autofill routine. It might be that the + * BTS did not like our paging messages and then we have counted down + * to zero and we do not get any messages. + */ + if (paging_bts->available_slots == 0) { + osmo_timer_schedule(&paging_bts->credit_timer, 5, 0); + return; + } - /* take the current and add it to the back */ - llist_del(&request->entry); - llist_add_tail(&request->entry, &paging_bts->pending_requests); + /* we need to determine the number of free channels */ + if (paging_bts->free_chans_need != -1 && + can_send_pag_req(request->bts, request->chan_type) != 0) { + LOG_PAGING_BTS(request, request->bts, DPAG, LOGL_INFO, + "Paging delayed: not enough free channels (<%d)\n", + paging_bts->free_chans_need); + goto sched_next_iter; + } -skip_paging: + /* handle the paging request now */ + page_ms(request); + paging_bts->available_slots--; + request->attempts++; + num_paged++; + + llist_del(&request->entry); + llist_add_tail(&request->entry, &paging_bts->pending_requests); + request = llist_first_entry(&paging_bts->pending_requests, + struct gsm_paging_request, entry); + } while (request != initial_request && num_paged < MAX_PAGE_REQ_PER_ITER); + + /* Once done iterating, prepare next scheduling: */ +sched_next_iter: osmo_timer_schedule(&paging_bts->work_timer, PAGING_TIMER); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I609fa67834b426456f48f6fb2acb601c5905f178 Gerrit-Change-Number: 27885 Gerrit-PatchSet: 7 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

1 0

Change in osmo-bsc[master]: paging: Prioritize requests for new subscribers over retransmitions
by pespin 26 Apr '22

26 Apr '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27897 ) Change subject: paging: Prioritize requests for new subscribers over retransmitions ...................................................................... paging: Prioritize requests for new subscribers over retransmitions Currently, the Tx paging_req queue at the BSC always has new paging requests adding at the end (as long as the subscriber is not already in the queue). That means, if the queue is full of retransmitions, it will take a long time until the first paging_req is sent towards that subscriber. The rationale here is that it makes sense to attempt the first paging ASAP, and give lower prio to paging_req retransmitions, since it may well be that those other subsribers are not available/reachable and won't answer. Related: SYS#5922 Change-Id: I1ae6d97152c458247bc538233b97c2d245196359 --- M src/osmo-bsc/paging.c 1 file changed, 24 insertions(+), 20 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index f81713e..3275473 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -266,20 +266,6 @@ osmo_timer_setup(&bts->paging.credit_timer, paging_give_credit, &bts->paging); } -/*! do we have any pending paging requests for given subscriber? */ -static int paging_pending_request(struct gsm_bts_paging_state *bts, - struct bsc_subscr *bsub) -{ - struct gsm_paging_request *req; - - llist_for_each_entry(req, &bts->pending_requests, entry) { - if (bsub == req->bsub) - return 1; - } - - return 0; -} - /*! Call-back once T3113 (paging timeout) expires for given paging_request */ static void paging_T3113_expired(void *data) { @@ -342,15 +328,27 @@ static int _paging_request(const struct bsc_paging_params *params, struct gsm_bts *bts) { struct gsm_bts_paging_state *bts_entry = &bts->paging; - struct gsm_paging_request *req; + struct gsm_paging_request *req, *last_initial_req = NULL; unsigned int t3113_timeout_s; rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_PAGING_ATTEMPTED)); - if (paging_pending_request(bts_entry, params->bsub)) { - LOG_PAGING_BTS(params, bts, DPAG, LOGL_INFO, "Paging request already pending for this subscriber\n"); - rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_PAGING_ALREADY)); - return -EEXIST; + /* Iterate list of pending requests to find if we already have one for + * the given subscriber. While on it, find the last + * not-yet-ever-once-transmitted request; the new request will be added + * immediately after it, giving higher prio to initial transmissions + * (no retrans). This avoids new subscribers being paged to be delayed + * if the paging queue is full due to a lot of retranmissions. + * Retranmissions usually mean MS are not reachable/available, so the + * rationale here is to prioritize new subs which may be available. */ + llist_for_each_entry(req, &bts_entry->pending_requests, entry) { + if (params->bsub == req->bsub) { + LOG_PAGING_BTS(params, bts, DPAG, LOGL_INFO, "Paging request already pending for this subscriber\n"); + rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_PAGING_ALREADY)); + return -EEXIST; + } + if (req->attempts == 0) + last_initial_req = req; } LOG_PAGING_BTS(params, bts, DPAG, LOGL_DEBUG, "Start paging\n"); @@ -364,9 +362,15 @@ req->chan_type = params->chan_needed; req->msc = params->msc; osmo_timer_setup(&req->T3113, paging_T3113_expired, req); + + /* there's no initial req (attempts==0), add to the start of the list */ + if (last_initial_req == NULL) + llist_add(&req->entry, &bts_entry->pending_requests); + else/* Add in the middle of the list after last_initial_req */ + __llist_add(&req->entry, &last_initial_req->entry, last_initial_req->entry.next); + t3113_timeout_s = calculate_timer_3113(bts); osmo_timer_schedule(&req->T3113, t3113_timeout_s, 0); - llist_add_tail(&req->entry, &bts_entry->pending_requests); paging_schedule_if_needed(bts_entry); return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1ae6d97152c458247bc538233b97c2d245196359 Gerrit-Change-Number: 27897 Gerrit-PatchSet: 6 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-CC: dexter <pmaier(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log