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

Change in osmo-bsc[2021q1]: tests/gsm0408: add testing coverage for generate_cell_chan_list()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27380 ) Change subject: tests/gsm0408: add testing coverage for generate_cell_chan_list() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q1 Gerrit-Change-Id: Ied0519c70501f105673a9b36657101063d275058 Gerrit-Change-Number: 27380 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 10:34:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in libosmocore[master]: gsm: lapd_core: Change log line NOTICE->INFO

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27368 ) Change subject: gsm: lapd_core: Change log line NOTICE->INFO ...................................................................... gsm: lapd_core: Change log line NOTICE->INFO Change-Id: I71f014645b4b487bf91499a1da9ed2d3032d7e40 --- M src/gsm/lapd_core.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved pespin: Looks good to me, approved diff --git a/src/gsm/lapd_core.c b/src/gsm/lapd_core.c index 0e89874..ced8bc0 100644 --- a/src/gsm/lapd_core.c +++ b/src/gsm/lapd_core.c @@ -942,7 +942,7 @@ dl->cont_res = lapd_msgb_alloc(length, "CONT RES"); memcpy(msgb_put(dl->cont_res, length), msg->l3h, length); - LOGDL(dl, LOGL_NOTICE, "Store content res.\n"); + LOGDL(dl, LOGL_INFO, "Store content res.\n"); } /* send notification to L3 */ if (length == 0) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I71f014645b4b487bf91499a1da9ed2d3032d7e40 Gerrit-Change-Number: 27368 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, 2 months

1
0
0 0

Change in libosmocore[master]: gsm: lapd_core: Change log line NOTICE->INFO

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27368 ) Change subject: gsm: lapd_core: Change log line NOTICE->INFO ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: I'll keep it this way (INFO) for now as I see it matches better other related log level information around same file. If someones needs it can further improve in a more fine-grained way in the future. This is mostly to avoid having logs clogged with this stuff. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I71f014645b4b487bf91499a1da9ed2d3032d7e40 Gerrit-Change-Number: 27368 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-Comment-Date: Thu, 03 Mar 2022 10:27:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: MGCP_Test: ensure PT translation works when converting AMR bwe/oa

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27384 ) Change subject: MGCP_Test: ensure PT translation works when converting AMR bwe/oa ...................................................................... MGCP_Test: ensure PT translation works when converting AMR bwe/oa The tests that test the conversion from AMR octet-aligned to AMR bandwith-efficient use the same payload type number on both ends. This does match the reality. Typically the BSS uses 96 as payload type internally, while 3gpp specifies a payload type of 112 on the link between BSS and CN. To reflect those conditions in the test as well, lets use 96 on one RTP end and 112 on the other. This also increses the test coverage as we now test if PT translation and bwe/oa conversion work together. Change-Id: Id734b6954098130bba02f8cdf1b06e0080c3e915 Related: OS#5461 --- M mgw/MGCP_Test.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/27384/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 9defea7..935ee97 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -2200,7 +2200,7 @@ f_init(ep); /* Connection #0 (Bidirectional) */ - flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000")); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 96, "AMR/8000")); /* bind local RTP emulation sockets */ flow[0].em.portnr := 10000; flow[0].rtp_cfg := c_RtpemDefaultCfg; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27384 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: Id734b6954098130bba02f8cdf1b06e0080c3e915 Gerrit-Change-Number: 27384 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-bsc[2021q4]: bitvec2freq_list(): fix handling of E-GSM ARFCNs

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27383 ) Change subject: bitvec2freq_list(): fix handling of E-GSM ARFCNs ...................................................................... bitvec2freq_list(): fix handling of E-GSM ARFCNs According to 3GPP TS 44.018, section 10.5.2.1b.2, only ARFCN values in range 1..124 can be encoded using the 'bit map 0' format. Before this patch, ARFCN values belonging to E-GSM band (0, 975..1023) were ignored in bitvec2freq_list(), and thus not present in the resulting Cell Channel Description IE. Change-Id: I17739e6845cd84e2a81bc406dd532541f7c52cb6 Related: SYS#5854 --- M src/osmo-bsc/system_information.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 19 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/83/27383/1 diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 974af3a..e1b369d 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -504,20 +504,29 @@ bool pgsm = false; memset(chan_list, 0, 16); - if (bts->band == GSM_BAND_900 - && bts->c0->arfcn >= 1 && bts->c0->arfcn <= 124) + /* According to 3GPP TS 44.018, section 10.5.2.1b.2, only ARFCN values + * in range 1..124 can be encoded using the 'bit map 0' format. */ + if (bts->band == GSM_BAND_900) pgsm = true; + /* Check presence of E-GSM ARFCN 0 */ + if (pgsm && bitvec_get_bit_pos(bv, 0) == ONE) + pgsm = false; + /* Check presence of E-GSM ARFCNs 975..1023 */ + for (i = 975; pgsm && i <= 1023; i++) { + if (bitvec_get_bit_pos(bv, i) == ONE) + pgsm = false; + } + /* P-GSM-only handsets only support 'bit map 0 format' */ if (!bis && !ter && pgsm) { chan_list[0] = 0; - for (i = 0; i < bv->data_len*8; i++) { - if (i >= 1 && i <= 124 - && bitvec_get_bit_pos(bv, i)) { - rc = freq_list_bm0_set_arfcn(chan_list, i); - if (rc < 0) - return rc; - } + for (i = 1; i <= 124; i++) { + if (!bitvec_get_bit_pos(bv, i)) + continue; + rc = freq_list_bm0_set_arfcn(chan_list, i); + if (rc < 0) + return rc; } return 0; } diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 26ec931..1a8389d 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -191,6 +191,6 @@ Testing generation of the Cell Channel Description IE: Case a) only the BCCH carrier: 10 Case b) more carriers from P-GSM band: 1 3 10 64 99 124 -Case c) more carriers from E-GSM band: 1 3 10 64 99 124 +Case c) more carriers from E-GSM band: 0 3 10 64 99 124 975 1001 1023 BTS deallocated OK in test_cell_chan_desc() Done. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: I17739e6845cd84e2a81bc406dd532541f7c52cb6 Gerrit-Change-Number: 27383 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-bsc[2021q4]: tests/gsm0408: add testing coverage for generate_cell_chan_list()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27382 ) Change subject: tests/gsm0408: add testing coverage for generate_cell_chan_list() ...................................................................... tests/gsm0408: add testing coverage for generate_cell_chan_list() This commit demonstrates what happens when a cell has channels in both P-GSM and E-GSM bands (case 'c'). As can be seen from: Case a) only the BCCH carrier: 10 Case b) more carriers from P-GSM band: 1 3 10 64 99 124 Case c) more carriers from E-GSM band: 1 3 10 64 99 124 in both cases 'b' and 'c' we have the same set of ARFCNs. Carriers from the E-GSM band are not present at all. This is wrong and will be fixed in the follow up change(s). Change-Id: Ied0519c70501f105673a9b36657101063d275058 Related: SYS#5854 --- M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 74 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/27382/1 diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 90b294e..a7270a4 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -29,6 +29,7 @@ #include <osmocom/bsc/system_information.h> #include <osmocom/bsc/abis_rsl.h> #include <osmocom/bsc/bts.h> +#include <osmocom/bsc/bss.h> #include <osmocom/core/application.h> #include <osmocom/core/byteswap.h> @@ -555,6 +556,71 @@ msgb_free(msg); } +/* Similar to list_arfcn() from system_information.c, but uses printf(). + * Another difference is that the text is printed even if n is 0. */ +static void print_cell_chan_desc(uint8_t *cd, const char *text) +{ + struct gsm_sysinfo_freq freq[1024]; + unsigned int n = 0, i; + + memset(freq, 0, sizeof(freq)); + gsm48_decode_freq_list(freq, cd, 16, 0xce, 1); + + printf("%s:", text); + for (i = 0; i < 1024; i++) { + if (!freq[i].mask) + continue; + printf(" %u", i); + n++; + } + if (!n) + printf(" (empty set)"); + printf("\n"); +} + +static void test_cell_chan_desc(struct gsm_network *net) +{ + struct gsm_bts *bts = bts_init(net); + uint8_t cell_chan_desc[16]; + + printf("Testing generation of the Cell Channel Description IE:\n"); + + bts_model_unknown_init(); + bts->type = GSM_BTS_TYPE_UNKNOWN; + bts->model = bts_model_find(bts->type); + OSMO_ASSERT(bts->model != NULL); + + bts->band = GSM_BAND_900; + bts->c0->arfcn = 10; /* BCCH carrier */ + + /* Case a) only the BCCH carrier */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, bts->c0->arfcn, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case a) only the BCCH carrier"); + + /* Case b) more carriers from P-GSM band */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 3, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 64, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 99, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 124, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case b) more carriers from P-GSM band"); + + /* Case c) more carriers from E-GSM band */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 0, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 975, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1001, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1023, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case c) more carriers from E-GSM band"); + + bts_del(bts); +} + static const struct log_info_cat log_categories[] = { }; @@ -591,6 +657,8 @@ test_gsm48_multirate_config(); + test_cell_chan_desc(net); + printf("Done.\n"); return EXIT_SUCCESS; diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 0bb7ee0..26ec931 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -187,4 +187,10 @@ gsm48_multirate_config(): rc=0, lv=0520340bf330 gsm48_multirate_config(): rc=0, lv=0420140bf0 gsm48_multirate_config(): rc=0, lv=022004 +BTS allocation OK in test_cell_chan_desc() +Testing generation of the Cell Channel Description IE: +Case a) only the BCCH carrier: 10 +Case b) more carriers from P-GSM band: 1 3 10 64 99 124 +Case c) more carriers from E-GSM band: 1 3 10 64 99 124 +BTS deallocated OK in test_cell_chan_desc() Done. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: Ied0519c70501f105673a9b36657101063d275058 Gerrit-Change-Number: 27382 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-bsc[2021q1]: tests/gsm0408: add testing coverage for generate_cell_chan_list()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27380 ) Change subject: tests/gsm0408: add testing coverage for generate_cell_chan_list() ...................................................................... tests/gsm0408: add testing coverage for generate_cell_chan_list() This commit demonstrates what happens when a cell has channels in both P-GSM and E-GSM bands (case 'c'). As can be seen from: Case a) only the BCCH carrier: 10 Case b) more carriers from P-GSM band: 1 3 10 64 99 124 Case c) more carriers from E-GSM band: 1 3 10 64 99 124 in both cases 'b' and 'c' we have the same set of ARFCNs. Carriers from the E-GSM band are not present at all. This is wrong and will be fixed in the follow up change(s). Change-Id: Ied0519c70501f105673a9b36657101063d275058 Related: SYS#5854 --- M tests/gsm0408/Makefile.am M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 3 files changed, 75 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/80/27380/1 diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index 571e7e6..b5a1ae5 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -29,6 +29,7 @@ $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_unknown.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ $(top_builddir)/src/osmo-bsc/bts_sm.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 9a1d3cf..2018e53 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -30,6 +30,7 @@ #include <osmocom/bsc/system_information.h> #include <osmocom/bsc/abis_rsl.h> #include <osmocom/bsc/bts.h> +#include <osmocom/bsc/bss.h> #include <osmocom/core/application.h> #include <osmocom/core/byteswap.h> @@ -878,6 +879,71 @@ OSMO_ASSERT(rc == -EINVAL); } +/* Similar to list_arfcn() from system_information.c, but uses printf(). + * Another difference is that the text is printed even if n is 0. */ +static void print_cell_chan_desc(uint8_t *cd, const char *text) +{ + struct gsm_sysinfo_freq freq[1024]; + unsigned int n = 0, i; + + memset(freq, 0, sizeof(freq)); + gsm48_decode_freq_list(freq, cd, 16, 0xce, 1); + + printf("%s:", text); + for (i = 0; i < 1024; i++) { + if (!freq[i].mask) + continue; + printf(" %u", i); + n++; + } + if (!n) + printf(" (empty set)"); + printf("\n"); +} + +static void test_cell_chan_desc(struct gsm_network *net) +{ + struct gsm_bts *bts = bts_init(net); + uint8_t cell_chan_desc[16]; + + printf("Testing generation of the Cell Channel Description IE:\n"); + + bts_model_unknown_init(); + bts->type = GSM_BTS_TYPE_UNKNOWN; + bts->model = bts_model_find(bts->type); + OSMO_ASSERT(bts->model != NULL); + + bts->band = GSM_BAND_900; + bts->c0->arfcn = 10; /* BCCH carrier */ + + /* Case a) only the BCCH carrier */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, bts->c0->arfcn, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case a) only the BCCH carrier"); + + /* Case b) more carriers from P-GSM band */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 3, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 64, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 99, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 124, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case b) more carriers from P-GSM band"); + + /* Case c) more carriers from E-GSM band */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 0, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 975, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1001, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1023, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case c) more carriers from E-GSM band"); + + bts_del(bts); +} + static const struct log_info_cat log_categories[] = { }; @@ -919,6 +985,8 @@ test_gsm48_multirate_config(); + test_cell_chan_desc(net); + printf("Done.\n"); return EXIT_SUCCESS; diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index f1aa463..38b5b4b 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -243,4 +243,10 @@ gsm48_multirate_config(): rc=0, lv=0520340bf330 gsm48_multirate_config(): rc=0, lv=0420140bf0 gsm48_multirate_config(): rc=0, lv=022004 +BTS allocation OK in test_cell_chan_desc() +Testing generation of the Cell Channel Description IE: +Case a) only the BCCH carrier: 10 +Case b) more carriers from P-GSM band: 1 3 10 64 99 124 +Case c) more carriers from E-GSM band: 1 3 10 64 99 124 +BTS deallocated OK in test_cell_chan_desc() Done. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q1 Gerrit-Change-Id: Ied0519c70501f105673a9b36657101063d275058 Gerrit-Change-Number: 27380 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-bsc[2021q1]: bitvec2freq_list(): fix handling of E-GSM ARFCNs

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27381 ) Change subject: bitvec2freq_list(): fix handling of E-GSM ARFCNs ...................................................................... bitvec2freq_list(): fix handling of E-GSM ARFCNs According to 3GPP TS 44.018, section 10.5.2.1b.2, only ARFCN values in range 1..124 can be encoded using the 'bit map 0' format. Before this patch, ARFCN values belonging to E-GSM band (0, 975..1023) were ignored in bitvec2freq_list(), and thus not present in the resulting Cell Channel Description IE. Change-Id: I17739e6845cd84e2a81bc406dd532541f7c52cb6 Related: SYS#5854 --- M src/osmo-bsc/system_information.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 19 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/27381/1 diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 7ec613c..20685a9 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -504,20 +504,29 @@ bool pgsm = false; memset(chan_list, 0, 16); - if (bts->band == GSM_BAND_900 - && bts->c0->arfcn >= 1 && bts->c0->arfcn <= 124) + /* According to 3GPP TS 44.018, section 10.5.2.1b.2, only ARFCN values + * in range 1..124 can be encoded using the 'bit map 0' format. */ + if (bts->band == GSM_BAND_900) pgsm = true; + /* Check presence of E-GSM ARFCN 0 */ + if (pgsm && bitvec_get_bit_pos(bv, 0) == ONE) + pgsm = false; + /* Check presence of E-GSM ARFCNs 975..1023 */ + for (i = 975; pgsm && i <= 1023; i++) { + if (bitvec_get_bit_pos(bv, i) == ONE) + pgsm = false; + } + /* P-GSM-only handsets only support 'bit map 0 format' */ if (!bis && !ter && pgsm) { chan_list[0] = 0; - for (i = 0; i < bv->data_len*8; i++) { - if (i >= 1 && i <= 124 - && bitvec_get_bit_pos(bv, i)) { - rc = freq_list_bm0_set_arfcn(chan_list, i); - if (rc < 0) - return rc; - } + for (i = 1; i <= 124; i++) { + if (!bitvec_get_bit_pos(bv, i)) + continue; + rc = freq_list_bm0_set_arfcn(chan_list, i); + if (rc < 0) + return rc; } return 0; } diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 38b5b4b..264a9c7 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -247,6 +247,6 @@ Testing generation of the Cell Channel Description IE: Case a) only the BCCH carrier: 10 Case b) more carriers from P-GSM band: 1 3 10 64 99 124 -Case c) more carriers from E-GSM band: 1 3 10 64 99 124 +Case c) more carriers from E-GSM band: 0 3 10 64 99 124 975 1001 1023 BTS deallocated OK in test_cell_chan_desc() Done. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q1 Gerrit-Change-Id: I17739e6845cd84e2a81bc406dd532541f7c52cb6 Gerrit-Change-Number: 27381 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-bts[master]: Change some log levels NOTICE->INFO

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27367 ) Change subject: Change some log levels NOTICE->INFO ...................................................................... Change some log levels NOTICE->INFO Change-Id: I65cccf2b48288353c2db2044ad1f3651ca9f68ec --- M src/common/rsl.c M src/common/scheduler.c 2 files changed, 4 insertions(+), 4 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/common/rsl.c b/src/common/rsl.c index 9b73869..4c5fb9f 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1297,7 +1297,7 @@ return 0; } - LOGP(DRSL, LOGL_NOTICE, "%s (ss=%d) %s Tx CHAN REL ACK\n", + LOGP(DRSL, LOGL_INFO, "%s (ss=%d) %s Tx CHAN REL ACK\n", gsm_ts_and_pchan_name(lchan->ts), lchan->nr, gsm_lchant_name(lchan->type)); @@ -1312,7 +1312,7 @@ uint8_t chan_nr = gsm_lchan2chan_nr_rsl(lchan); uint8_t ie[2]; - LOGP(DRSL, LOGL_NOTICE, "%s (ss=%d) %s Tx CHAN ACT ACK\n", + LOGP(DRSL, LOGL_INFO, "%s (ss=%d) %s Tx CHAN ACT ACK\n", gsm_ts_and_pchan_name(lchan->ts), lchan->nr, gsm_lchant_name(lchan->type)); diff --git a/src/common/scheduler.c b/src/common/scheduler.c index e854ce1..b27d7ea 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -1163,7 +1163,7 @@ && trx_chan_desc[i].link_id == 0x00) { struct l1sched_chan_state *chan_state = &l1ts->chan_state[i]; - LOGP(DL1C, LOGL_NOTICE, + LOGP(DL1C, LOGL_INFO, "%s Set mode for %s (rsl_cmode=%u, tch_mode=%u, handover=%u)\n", gsm_ts_name(ts), trx_chan_desc[i].name, rsl_cmode, tch_mode, handover); @@ -1230,7 +1230,7 @@ struct l1sched_ts *l1ts = lchan->ts->priv; struct l1sched_chan_state *l1cs = &l1ts->chan_state[i]; - LOGPLCHAN(lchan, DL1C, LOGL_NOTICE, "Set A5/%d %s for %s\n", + LOGPLCHAN(lchan, DL1C, LOGL_INFO, "Set A5/%d %s for %s\n", algo, (downlink) ? "downlink" : "uplink", trx_chan_desc[i].name); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I65cccf2b48288353c2db2044ad1f3651ca9f68ec Gerrit-Change-Number: 27367 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-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-bts[master]: rsl: Conditionally decrease log level if cause is normal event

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27369 ) Change subject: rsl: Conditionally decrease log level if cause is normal event ...................................................................... rsl: Conditionally decrease log level if cause is normal event This avoid a NOTICE log line like the following when gsm_lchan_release() is called. """ rsl.c:2484 (bts=0,trx=0,ts=2,ss=0) Sending RTP delete indication: cause = Normal event, unspecified """ Change-Id: I0ce78c52644983220f5810bc5c661b07afd9e543 --- M src/common/rsl.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index 4c5fb9f..7d6621a 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2480,7 +2480,9 @@ { struct msgb *nmsg; - LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "Sending RTP delete indication: cause = %s\n", + LOGPLCHAN(lchan, DRSL, + (cause == RSL_ERR_NORMAL_UNSPEC) ? LOGL_INFO : LOGL_NOTICE, + "Sending RTP delete indication: cause = %s\n", rsl_err_name(cause)); nmsg = rsl_msgb_alloc(sizeof(struct abis_rsl_dchan_hdr)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0ce78c52644983220f5810bc5c661b07afd9e543 Gerrit-Change-Number: 27369 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-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: support "empty" SCCP N-Connect from MSC

by osmith

Attention is currently required from: neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27373 ) Change subject: support "empty" SCCP N-Connect from MSC ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I535c791fa01e99a2226392eb05f676ba6c3cc16e Gerrit-Change-Number: 27373 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:59:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bts[master]: rsl: Conditionally decrease log level if cause is normal event

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27369 ) Change subject: rsl: Conditionally decrease log level if cause is normal event ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0ce78c52644983220f5810bc5c661b07afd9e543 Gerrit-Change-Number: 27369 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:59:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bts[master]: Change some log levels NOTICE->INFO

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27367 ) Change subject: Change some log levels NOTICE->INFO ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I65cccf2b48288353c2db2044ad1f3651ca9f68ec Gerrit-Change-Number: 27367 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:58:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in libosmocore[master]: gsm: lapd_core: Change log line NOTICE->INFO

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27368 ) Change subject: gsm: lapd_core: Change log line NOTICE->INFO ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: this is happening in normal operation during almost every radio channel esetablishment, so I would argue it could even go to DEBUG. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I71f014645b4b487bf91499a1da9ed2d3032d7e40 Gerrit-Change-Number: 27368 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:58:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ci[master]: lint: checkpatch: don't require space in T=-1234

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27379 ) Change subject: lint: checkpatch: don't require space in T=-1234 ...................................................................... lint: checkpatch: don't require space in T=-1234 Inside struct osmo_tdef we write non-spec timers as T=-1234. Do not complain about having no space before the minus character. Example: { .T=-25, .default_val=5, .desc="Timeout for ..." }, Note that the Linux kernel coding style also requires spaces around the equals signs. We follow that everywhere except for struct osmo_tdef, and the linter has already been adjusted for that in I1f0b9ed5bd49ef9b5ab0e347b9260e71df34ff9c. Change-Id: I0885e84ad99c7d333a5930c411fd1273badb0fcb --- M lint/checkpatch/checkpatch.pl 1 file changed, 10 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/lint/checkpatch/checkpatch.pl b/lint/checkpatch/checkpatch.pl index d98d79c..eada2a9 100755 --- a/lint/checkpatch/checkpatch.pl +++ b/lint/checkpatch/checkpatch.pl @@ -5077,11 +5077,16 @@ $opv eq '*U' || $opv eq '-U' || $opv eq '&U') { # Osmocom specific: &&U removed if ($ctx !~ /[WEBC]x./ && $ca !~ /(?:\)|!|~|\*|-|\&|\||\+\+|\-\-|\{)$/) { - if (ERROR("SPACING", - "space required before that '$op' $at\n" . $hereptr)) { - if ($n != $last_after + 2) { - $good = $fix_elements[$n] . " " . ltrim($fix_elements[$n + 1]); - $line_fixed = 1; + # Osmocom specific: inside struct osmo_tdef we write non-spec timers as + # T=-1234. Do not complain about having no space before the minus + # character. + if ($opline !~ /\.T=/) { + if (ERROR("SPACING", + "space required before that '$op' $at\n" . $hereptr)) { + if ($n != $last_after + 2) { + $good = $fix_elements[$n] . " " . ltrim($fix_elements[$n + 1]); + $line_fixed = 1; + } } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0885e84ad99c7d333a5930c411fd1273badb0fcb Gerrit-Change-Number: 27379 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ci[master]: lint: checkpatch: don't require space in T=-1234

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27379 ) Change subject: lint: checkpatch: don't require space in T=-1234 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0885e84ad99c7d333a5930c411fd1273badb0fcb Gerrit-Change-Number: 27379 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:57:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: silence bogus error: event not permitted: READY_TO_SWITCH_RTP

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27375 ) Change subject: silence bogus error: event not permitted: READY_TO_SWITCH_RTP ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I96fd53b8c8da621a40bd65f85070eabd030cc875 Gerrit-Change-Number: 27375 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:56:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: tweak error msg: s/inter-BSC MT/inter-BSC incoming

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27374 ) Change subject: tweak error msg: s/inter-BSC MT/inter-BSC incoming ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1ca810542e89980ffda11876fd30626467e452d1 Gerrit-Change-Number: 27374 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:56:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: support "empty" SCCP N-Connect from MSC

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27373 ) Change subject: support "empty" SCCP N-Connect from MSC ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I535c791fa01e99a2226392eb05f676ba6c3cc16e Gerrit-Change-Number: 27373 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:56:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: add counter for inter-BSC incoming Handover Request

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27371 ) Change subject: add counter for inter-BSC incoming Handover Request ...................................................................... Patch Set 2: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icdde2bb339a5e367a4d297802214a1ef3f36eefa Gerrit-Change-Number: 27371 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:52:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: add counter for inter-BSC incoming Handover Request

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27371 ) Change subject: add counter for inter-BSC incoming Handover Request ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: in general I find it completely strange that the type of SCCP transport layer message is part of the name of a BSSAP statistics item. Not sure what rationale this is following. I mean, if you count the number of HTTP GET requests in a web server, yo uwould also not put the TCP flags of the TCP header into the packet... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icdde2bb339a5e367a4d297802214a1ef3f36eefa Gerrit-Change-Number: 27371 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:49:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: support "empty" SCCP N-Connect from MSC

by osmith

Attention is currently required from: neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27373 ) Change subject: support "empty" SCCP N-Connect from MSC ...................................................................... Patch Set 3: (1 comment) Patchset: PS1: > @osmith […] => https://gerrit.osmocom.org/c/osmo-ci/+/27379 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I535c791fa01e99a2226392eb05f676ba6c3cc16e Gerrit-Change-Number: 27373 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:49:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ci[master]: lint: checkpatch: don't require space in T=-1234

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27379 ) Change subject: lint: checkpatch: don't require space in T=-1234 ...................................................................... lint: checkpatch: don't require space in T=-1234 Inside struct osmo_tdef we write non-spec timers as T=-1234. Do not complain about having no space before the minus character. Example: { .T=-25, .default_val=5, .desc="Timeout for ..." }, Note that the Linux kernel coding style also requires spaces around the equals signs. We follow that everywhere except for struct osmo_tdef, and the linter has already been adjusted for that in I1f0b9ed5bd49ef9b5ab0e347b9260e71df34ff9c. Change-Id: I0885e84ad99c7d333a5930c411fd1273badb0fcb --- M lint/checkpatch/checkpatch.pl 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/79/27379/1 diff --git a/lint/checkpatch/checkpatch.pl b/lint/checkpatch/checkpatch.pl index d98d79c..eada2a9 100755 --- a/lint/checkpatch/checkpatch.pl +++ b/lint/checkpatch/checkpatch.pl @@ -5077,11 +5077,16 @@ $opv eq '*U' || $opv eq '-U' || $opv eq '&U') { # Osmocom specific: &&U removed if ($ctx !~ /[WEBC]x./ && $ca !~ /(?:\)|!|~|\*|-|\&|\||\+\+|\-\-|\{)$/) { - if (ERROR("SPACING", - "space required before that '$op' $at\n" . $hereptr)) { - if ($n != $last_after + 2) { - $good = $fix_elements[$n] . " " . ltrim($fix_elements[$n + 1]); - $line_fixed = 1; + # Osmocom specific: inside struct osmo_tdef we write non-spec timers as + # T=-1234. Do not complain about having no space before the minus + # character. + if ($opline !~ /\.T=/) { + if (ERROR("SPACING", + "space required before that '$op' $at\n" . $hereptr)) { + if ($n != $last_after + 2) { + $good = $fix_elements[$n] . " " . ltrim($fix_elements[$n + 1]); + $line_fixed = 1; + } } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0885e84ad99c7d333a5930c411fd1273badb0fcb Gerrit-Change-Number: 27379 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: add counter for inter-BSC incoming Handover Request

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27371 ) Change subject: add counter for inter-BSC incoming Handover Request ...................................................................... Patch Set 2: Code-Review-1 (2 comments) Patchset: PS2: -1 to avoid fixeria's +2 to get this merged before addressing the naming issue File src/osmo-bsc/osmo_bsc_msc.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27371/comment/24a02c30_3becbe5f PS2, Line 58: [MSC_CTR_BSSMAP_RX_DT1_HANDOVER_RQST] = {"bssmap:rx:dt1:handover:rqst", "Number of received BSSMAP DT1 HANDOVER RQST messages"}, is the description and naming correct here? Are we really only counting those handover requests which we receive in DT1 vs. those that we receive directly in CR? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icdde2bb339a5e367a4d297802214a1ef3f36eefa Gerrit-Change-Number: 27371 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:46:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: add missing counter increment for Perform Location Request

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27372 ) Change subject: add missing counter increment for Perform Location Request ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3f78ce73eb16fdff1f19359963405b2235000fc4 Gerrit-Change-Number: 27372 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:45:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: tweak logl to ERROR for invalid initial BSSMAP

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27370 ) Change subject: tweak logl to ERROR for invalid initial BSSMAP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idd7d763129a5acdf19cd0ae86e82b77ee0073f2f Gerrit-Change-Number: 27370 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:44:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: inter-BSC incoming HO in with empty SCCP CR

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27376 ) Change subject: bsc: inter-BSC incoming HO in with empty SCCP CR ...................................................................... bsc: inter-BSC incoming HO in with empty SCCP CR Test inter-BSC incoming HO where the Handover Request message is not included in the initial SCCP N-Connect, but follows in a separate DT1. Related: SYS#5864 Depends: I535c791fa01e99a2226392eb05f676ba6c3cc16e (osmo-bsc) Change-Id: I6732153cdd0d529bfaf0925387e765f3403a756b --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn M library/RAN_Emulation.ttcnpp 3 files changed, 29 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 907b436..f203d95 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6009,12 +6009,18 @@ f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); activate(as_Media()); - BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, - f_gen_handover_req(aoip_tla := g_pars.host_aoip_tla, - cell_id_source := g_pars.cell_id_source, - oldToNewBSSIEs := oldToNewBSSIEs, - enc := g_pars.encr))); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + var PDU_BSSAP ho_req := f_gen_handover_req(aoip_tla := g_pars.host_aoip_tla, + cell_id_source := g_pars.cell_id_source, + oldToNewBSSIEs := oldToNewBSSIEs, + enc := g_pars.encr); + if (g_pars.inter_bsc_ho_in__ho_req_in_initial_sccp_cr) { + BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, ho_req)); + BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + } else { + BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, omit)); + BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.send(ho_req); + } alt { [] BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap { @@ -6686,6 +6692,16 @@ f_shutdown_helper(); } +/* An incoming inter-BSC HO can either issue the Handover Request message attached to the initial SCCP N-Connect (as in + * the other tests we have so far), or the first CR can be "empty" with the BSSAP request following later. Test the + * empty N-Connect case. */ +testcase TC_ho_into_this_bsc_sccp_cr_without_bssap() runs on test_CT { + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + pars.inter_bsc_ho_in__ho_req_in_initial_sccp_cr := false; + f_tc_ho_into_this_bsc_main(pars); + f_shutdown_helper(); +} + type record of charstring Commands; private function f_bts_0_cfg(TELNETasp_PT pt, Commands cmds := {}) @@ -11347,6 +11363,7 @@ execute( TC_ho_in_fail_msc_clears_after_ho_detect() ); execute( TC_ho_in_fail_no_detect() ); execute( TC_ho_in_fail_no_detect2() ); + execute( TC_ho_into_this_bsc_sccp_cr_without_bssap() ); execute( TC_ho_neighbor_config_1() ); execute( TC_ho_neighbor_config_2() ); diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 29b7783..95cdb7c 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -671,7 +671,8 @@ boolean expect_channel_mode_modify, uint3_t expect_tsc optional, BSSMAP_IE_CellIdentifier cell_id_source, - boolean expect_ho_fail + boolean expect_ho_fail, + boolean inter_bsc_ho_in__ho_req_in_initial_sccp_cr }; /* Note: Do not use valueof() to get a value of this template, use @@ -712,7 +713,8 @@ expect_channel_mode_modify := false, expect_tsc := omit, cell_id_source := valueof(ts_CellID_LAC_CI(1, 1)), - expect_ho_fail := false + expect_ho_fail := false, + inter_bsc_ho_in__ho_req_in_initial_sccp_cr := true } function f_create_chan_and_exp(template (present) PDU_BSSAP exp_l3_compl := ?) diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 295876e..d87ee9c 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -439,9 +439,9 @@ type record BSSAP_Conn_Req { SCCP_PAR_Address addr_peer, SCCP_PAR_Address addr_own, - PDU_BSSAP bssap + PDU_BSSAP bssap optional } -template BSSAP_Conn_Req ts_BSSAP_Conn_Req(SCCP_PAR_Address peer, SCCP_PAR_Address own, PDU_BSSAP bssap) := { +template BSSAP_Conn_Req ts_BSSAP_Conn_Req(SCCP_PAR_Address peer, SCCP_PAR_Address own, template (omit) PDU_BSSAP bssap) := { addr_peer := peer, addr_own := own, bssap := bssap -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27376 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: I6732153cdd0d529bfaf0925387e765f3403a756b Gerrit-Change-Number: 27376 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: inter-BSC HO in: expect codecs in HO Request ACK

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27311 ) Change subject: bsc: inter-BSC HO in: expect codecs in HO Request ACK ...................................................................... bsc: inter-BSC HO in: expect codecs in HO Request ACK Expect IEs Speech Codec (Chosen) and Codec List (BSS Supported), they are missing in current osmo-bsc. Related: SYS#5839 Depends: I3c0576505a3ceb3cd5cc31dc69c5bc4a86a4ea08 (osmo-bsc) Change-Id: Ib2b4e27be241e2a92c0c3bffdf906bf22c09352b --- M bsc/BSC_Tests.ttcn 1 file changed, 26 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/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 45c3239..6aefde5 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6027,6 +6027,32 @@ f_verify_encr_info(chan_act); f_chan_act_verify_tsc(chan_act, expect_target_tsc); + if (ispresent(rx_bssap.pdu.bssmap.handoverRequestAck.codecList)) { + if (not g_pars.aoip) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "handoverRequestAck: Expected no Speech Codec List (BSS Supported), because this is not AoIP"); + } + /* TODO: check actual codecs? */ + } else { + if (g_pars.aoip) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "handoverRequestAck: Expected Speech Codec List (BSS Supported), but none found"); + } + } + + if (ispresent(rx_bssap.pdu.bssmap.handoverRequestAck.speechCodec)) { + if (not g_pars.aoip) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "handoverRequestAck: Expected no Speech Codec (Chosen), because this is not AoIP"); + } + /* TODO: check actual codec? */ + } else { + if (g_pars.aoip) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "handoverRequestAck: Expected Speech Codec (Chosen), but none found"); + } + } + ho_command_str := rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info; log("Received L3 Info in HO Request Ack: ", ho_command_str); var PDU_ML3_NW_MS ho_command := dec_PDU_ML3_NW_MS(ho_command_str); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27311 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: Ib2b4e27be241e2a92c0c3bffdf906bf22c09352b Gerrit-Change-Number: 27311 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(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, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: add TC_ho_into_this_bsc_a5_mismatch

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27247 ) Change subject: bsc: add TC_ho_into_this_bsc_a5_mismatch ...................................................................... bsc: add TC_ho_into_this_bsc_a5_mismatch Since I just fixed the encryption behavior, I also want to know whether the case of no A5 intersection is handled properly. The tiny test comes with a lot of changes to allow a handover failure code path. The 'expect_ho_fail' flag goes via function arguments to g_pars and the general ho test code uses it to branch for exp-failure. Related: SYS#5839 Change-Id: I44b464a0bedbff09c467c4bccd7c985480fb883a --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 58 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 6aefde5..907b436 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -5993,6 +5993,7 @@ } private function f_ho_into_this_bsc(charstring id, template (omit) BSSMAP_oldToNewBSSIEs oldToNewBSSIEs := omit) runs on MSC_ConnHdlr { + var PDU_BSSAP rx_bssap; /* Hack: the proper way would be to wait for the BSSMAP Handover Request ACK and extract the * actual assigned chan_nr from its L3 (RR Handover Command) message. But osmo-bsc starts acting * on the lchan even before we get a chance to evaluate the BSSMAP Handover Request ACK. So we @@ -6015,13 +6016,28 @@ enc := g_pars.encr))); BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + alt { + [] BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap { + if (g_pars.expect_ho_fail) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Expected Handover Request to fail, but got Handover Request Ack") + } + } + [] BSSAP.receive(tr_BSSMAP_HandoverFailure) -> value rx_bssap { + if (not g_pars.expect_ho_fail) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Expected Handover Request to succeed, but got Handover Failure") + } + // TODO: evaluate correct cause value. But osmo-bsc doesn't seem to send meaningful causes yet! + // For now just accept any cause. + BSSAP.receive(tr_BSSMAP_ClearRequest); + setverdict(pass); + return; + } + } + /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ - var PDU_BSSAP rx_bssap; - var octetstring ho_command_str; - - BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap; - /* we're sure that the channel activation is done now, verify the parameters in it */ var RSL_Message chan_act := f_rslem_get_last_act(RSL_PROC, 0, g_chan_nr); f_verify_encr_info(chan_act); @@ -6053,6 +6069,7 @@ } } + var octetstring ho_command_str; ho_command_str := rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info; log("Received L3 Info in HO Request Ack: ", ho_command_str); var PDU_ML3_NW_MS ho_command := dec_PDU_ML3_NW_MS(ho_command_str); @@ -6112,7 +6129,11 @@ exp_rr_rel_tmpl := tr_RRM_RR_RELEASE; } f_ho_into_this_bsc(id, oldToNewBSSIEs); - f_perform_clear(exp_rr_rel_tmpl := exp_rr_rel_tmpl); + if (g_pars.expect_ho_fail) { + f_perform_clear_no_lchan(); + } else { + f_perform_clear(exp_rr_rel_tmpl := exp_rr_rel_tmpl); + } setverdict(pass); } function f_tc_ho_into_this_bsc_main(TestHdlrParams pars, charstring vty_a5_cfg := VTY_A5_DEFAULT) runs on test_CT { @@ -6131,9 +6152,14 @@ vc_conn.done; f_ctrs_bsc_and_bts_add(0, "handover:attempted"); - f_ctrs_bsc_and_bts_add(0, "handover:completed"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:attempted"); - f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:completed"); + if (pars.expect_ho_fail) { + f_ctrs_bsc_and_bts_add(0, "handover:failed"); + f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:failed"); + } else { + f_ctrs_bsc_and_bts_add(0, "handover:completed"); + f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:completed"); + } f_ctrs_bsc_and_bts_verify(); f_vty_encryption_a5_reset(); @@ -6145,9 +6171,11 @@ f_shutdown_helper(); } -function f_tc_ho_into_this_bsc_a5(TestHdlrEncrParams encr, charstring vty_a5_cfg := VTY_A5_DEFAULT) runs on test_CT { +function f_tc_ho_into_this_bsc_a5(TestHdlrEncrParams encr, charstring vty_a5_cfg := VTY_A5_DEFAULT, + boolean expect_fail := false) runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.encr := encr; + pars.expect_ho_fail := expect_fail; f_tc_ho_into_this_bsc_main(pars, vty_a5_cfg); f_shutdown_helper(); } @@ -6184,6 +6212,12 @@ f_tc_ho_into_this_bsc_a5(f_encr_params(alg_permitted := '0a'O, alg_expect := '08'O)); } +/* Send a permitted algo mask that does not intersect with osmo-bsc.cfg */ +testcase TC_ho_into_this_bsc_a5_mismatch() runs on test_CT { + f_tc_ho_into_this_bsc_a5(f_encr_params(alg_permitted := '18'O, alg_expect := '10'O), "0 1", + expect_fail := true); // 0x18 = A5/3 and A5/4 +} + testcase TC_ho_into_this_bsc_tla_v6() runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.host_aoip_tla := "::6"; @@ -8026,6 +8060,16 @@ deactivate(ack_rel_req); } +friend function f_perform_clear_no_lchan() +runs on MSC_ConnHdlr { + f_logp(BSCVTY, "MSC instructs BSC to clear channel"); + BSSAP.send(ts_BSSMAP_ClearCommand(0)); + BSSAP.receive(tr_BSSMAP_ClearComplete); + f_logp(BSCVTY, "Got BSSMAP Clear Complete"); + /* Also drop the SCCP connection */ + BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); +} + private function f_perform_clear_test_ct(DchanTuple dt) runs on test_CT { @@ -11290,6 +11334,7 @@ execute( TC_ho_into_this_bsc_a5_4() ); execute( TC_ho_into_this_bsc_a5_1_3_no_chosen_enc_alg() ); execute( TC_ho_into_this_bsc_a5_1_3() ); + execute( TC_ho_into_this_bsc_a5_mismatch() ); if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { execute( TC_ho_into_this_bsc_tla_v6() ); } diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index e492ee0..29b7783 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -670,7 +670,8 @@ boolean exp_fast_return, /* RR Release expected to contain CellSelectInd ? */ boolean expect_channel_mode_modify, uint3_t expect_tsc optional, - BSSMAP_IE_CellIdentifier cell_id_source + BSSMAP_IE_CellIdentifier cell_id_source, + boolean expect_ho_fail }; /* Note: Do not use valueof() to get a value of this template, use @@ -710,7 +711,8 @@ exp_fast_return := false, expect_channel_mode_modify := false, expect_tsc := omit, - cell_id_source := valueof(ts_CellID_LAC_CI(1, 1)) + cell_id_source := valueof(ts_CellID_LAC_CI(1, 1)), + expect_ho_fail := false } function f_create_chan_and_exp(template (present) PDU_BSSAP exp_l3_compl := ?) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27247 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: I44b464a0bedbff09c467c4bccd7c985480fb883a Gerrit-Change-Number: 27247 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: inter-BSC incoming HO in with empty SCCP CR

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27376 ) Change subject: bsc: inter-BSC incoming HO in with empty SCCP CR ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27376 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: I6732153cdd0d529bfaf0925387e765f3403a756b Gerrit-Change-Number: 27376 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:44:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: add TC_ho_into_this_bsc_a5_mismatch

by laforge

Attention is currently required from: neels, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27247 ) Change subject: bsc: add TC_ho_into_this_bsc_a5_mismatch ...................................................................... Patch Set 4: Code-Review+2 (1 comment) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27247/comment/36eef0e5_db51… PS2, Line 6032: BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap; > to me it looks more noisy... I'm with vadim, the proper way of receiving multiple alternates [possibly with a guard expression] is an alt statement. A separate guard time or other options can be added easily this way at a later point, if neded. Not sure what our overall guard timer is, and whether it makes sense to have a shorter one here. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27247 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: I44b464a0bedbff09c467c4bccd7c985480fb883a Gerrit-Change-Number: 27247 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:44:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: inter-BSC HO in: expect codecs in HO Request ACK

by laforge

Attention is currently required from: neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27311 ) Change subject: bsc: inter-BSC HO in: expect codecs in HO Request ACK ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27311 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: Ib2b4e27be241e2a92c0c3bffdf906bf22c09352b Gerrit-Change-Number: 27311 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:43:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bitvec2freq_list(): fix handling of E-GSM ARFCNs

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27356 ) Change subject: bitvec2freq_list(): fix handling of E-GSM ARFCNs ...................................................................... bitvec2freq_list(): fix handling of E-GSM ARFCNs According to 3GPP TS 44.018, section 10.5.2.1b.2, only ARFCN values in range 1..124 can be encoded using the 'bit map 0' format. Before this patch, ARFCN values belonging to E-GSM band (0, 975..1023) were ignored in bitvec2freq_list(), and thus not present in the resulting Cell Channel Description IE. Change-Id: I17739e6845cd84e2a81bc406dd532541f7c52cb6 Related: SYS#5854 --- M src/osmo-bsc/system_information.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 19 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 93bce77..dfde5a2 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -504,20 +504,29 @@ bool pgsm = false; memset(chan_list, 0, 16); - if (bts->band == GSM_BAND_900 - && bts->c0->arfcn >= 1 && bts->c0->arfcn <= 124) + /* According to 3GPP TS 44.018, section 10.5.2.1b.2, only ARFCN values + * in range 1..124 can be encoded using the 'bit map 0' format. */ + if (bts->band == GSM_BAND_900) pgsm = true; + /* Check presence of E-GSM ARFCN 0 */ + if (pgsm && bitvec_get_bit_pos(bv, 0) == ONE) + pgsm = false; + /* Check presence of E-GSM ARFCNs 975..1023 */ + for (i = 975; pgsm && i <= 1023; i++) { + if (bitvec_get_bit_pos(bv, i) == ONE) + pgsm = false; + } + /* P-GSM-only handsets only support 'bit map 0 format' */ if (!bis && !ter && pgsm) { chan_list[0] = 0; - for (i = 0; i < bv->data_len*8; i++) { - if (i >= 1 && i <= 124 - && bitvec_get_bit_pos(bv, i)) { - rc = freq_list_bm0_set_arfcn(chan_list, i); - if (rc < 0) - return rc; - } + for (i = 1; i <= 124; i++) { + if (!bitvec_get_bit_pos(bv, i)) + continue; + rc = freq_list_bm0_set_arfcn(chan_list, i); + if (rc < 0) + return rc; } return 0; } diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 26ec931..1a8389d 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -191,6 +191,6 @@ Testing generation of the Cell Channel Description IE: Case a) only the BCCH carrier: 10 Case b) more carriers from P-GSM band: 1 3 10 64 99 124 -Case c) more carriers from E-GSM band: 1 3 10 64 99 124 +Case c) more carriers from E-GSM band: 0 3 10 64 99 124 975 1001 1023 BTS deallocated OK in test_cell_chan_desc() Done. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I17739e6845cd84e2a81bc406dd532541f7c52cb6 Gerrit-Change-Number: 27356 Gerrit-PatchSet: 5 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-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bitvec2freq_list(): determine empty set by checking the ARFCN count

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27357 ) Change subject: bitvec2freq_list(): determine empty set by checking the ARFCN count ...................................................................... bitvec2freq_list(): determine empty set by checking the ARFCN count I find it cleaner to relay on the counter ('arfcns' in this case) to check if the set is empty, rather than checking one of the resulting values ('max'). There is just a cosmetic change. Change-Id: I29ca51461beec053bcb8b8210f0ad24bb8c7765f Related: SYS#5854 --- M src/osmo-bsc/system_information.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 1ebfe5c..93bce77 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -553,7 +553,7 @@ max = i; } - if (max == -1) { + if (arfcns == 0) { /* Empty set, use 'bit map 0 format' */ chan_list[0] = 0; return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I29ca51461beec053bcb8b8210f0ad24bb8c7765f Gerrit-Change-Number: 27357 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: tests/gsm0408: add testing coverage for generate_cell_chan_list()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27378 ) Change subject: tests/gsm0408: add testing coverage for generate_cell_chan_list() ...................................................................... tests/gsm0408: add testing coverage for generate_cell_chan_list() This commit demonstrates what happens when a cell has channels in both P-GSM and E-GSM bands (case 'c'). As can be seen from: Case a) only the BCCH carrier: 10 Case b) more carriers from P-GSM band: 1 3 10 64 99 124 Case c) more carriers from E-GSM band: 1 3 10 64 99 124 in both cases 'b' and 'c' we have the same set of ARFCNs. Carriers from the E-GSM band are not present at all. This is wrong and will be fixed in the follow up change(s). Change-Id: Ied0519c70501f105673a9b36657101063d275058 Related: SYS#5854 --- M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 74 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 90b294e..a7270a4 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -29,6 +29,7 @@ #include <osmocom/bsc/system_information.h> #include <osmocom/bsc/abis_rsl.h> #include <osmocom/bsc/bts.h> +#include <osmocom/bsc/bss.h> #include <osmocom/core/application.h> #include <osmocom/core/byteswap.h> @@ -555,6 +556,71 @@ msgb_free(msg); } +/* Similar to list_arfcn() from system_information.c, but uses printf(). + * Another difference is that the text is printed even if n is 0. */ +static void print_cell_chan_desc(uint8_t *cd, const char *text) +{ + struct gsm_sysinfo_freq freq[1024]; + unsigned int n = 0, i; + + memset(freq, 0, sizeof(freq)); + gsm48_decode_freq_list(freq, cd, 16, 0xce, 1); + + printf("%s:", text); + for (i = 0; i < 1024; i++) { + if (!freq[i].mask) + continue; + printf(" %u", i); + n++; + } + if (!n) + printf(" (empty set)"); + printf("\n"); +} + +static void test_cell_chan_desc(struct gsm_network *net) +{ + struct gsm_bts *bts = bts_init(net); + uint8_t cell_chan_desc[16]; + + printf("Testing generation of the Cell Channel Description IE:\n"); + + bts_model_unknown_init(); + bts->type = GSM_BTS_TYPE_UNKNOWN; + bts->model = bts_model_find(bts->type); + OSMO_ASSERT(bts->model != NULL); + + bts->band = GSM_BAND_900; + bts->c0->arfcn = 10; /* BCCH carrier */ + + /* Case a) only the BCCH carrier */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, bts->c0->arfcn, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case a) only the BCCH carrier"); + + /* Case b) more carriers from P-GSM band */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 3, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 64, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 99, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 124, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case b) more carriers from P-GSM band"); + + /* Case c) more carriers from E-GSM band */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 0, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 975, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1001, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1023, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case c) more carriers from E-GSM band"); + + bts_del(bts); +} + static const struct log_info_cat log_categories[] = { }; @@ -591,6 +657,8 @@ test_gsm48_multirate_config(); + test_cell_chan_desc(net); + printf("Done.\n"); return EXIT_SUCCESS; diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 0bb7ee0..26ec931 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -187,4 +187,10 @@ gsm48_multirate_config(): rc=0, lv=0520340bf330 gsm48_multirate_config(): rc=0, lv=0420140bf0 gsm48_multirate_config(): rc=0, lv=022004 +BTS allocation OK in test_cell_chan_desc() +Testing generation of the Cell Channel Description IE: +Case a) only the BCCH carrier: 10 +Case b) more carriers from P-GSM band: 1 3 10 64 99 124 +Case c) more carriers from E-GSM band: 1 3 10 64 99 124 +BTS deallocated OK in test_cell_chan_desc() Done. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ied0519c70501f105673a9b36657101063d275058 Gerrit-Change-Number: 27378 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: system_information: fix unused 'mask' parameter in list_arfcn()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27377 ) Change subject: system_information: fix unused 'mask' parameter in list_arfcn() ...................................................................... system_information: fix unused 'mask' parameter in list_arfcn() The callers of this function do pass different mask values, which should be passed to gsm48_decode_freq_list(). Instead, 0xce was passed regardless of the given mask value. Change-Id: I47f2eab54ef8487b14992fd7a69d5c9ccbb3f5cf --- M src/osmo-bsc/system_information.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 974af3a..1ebfe5c 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -709,7 +709,7 @@ struct gsm_sysinfo_freq freq[1024]; memset(freq, 0, sizeof(freq)); - gsm48_decode_freq_list(freq, chan_list, 16, 0xce, 1); + gsm48_decode_freq_list(freq, chan_list, 16, mask, 1); for (i = 0; i < 1024; i++) { if (freq[i].mask) { if (!n) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I47f2eab54ef8487b14992fd7a69d5c9ccbb3f5cf Gerrit-Change-Number: 27377 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: system_information: fix unused 'mask' parameter in list_arfcn()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27377 ) Change subject: system_information: fix unused 'mask' parameter in list_arfcn() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I47f2eab54ef8487b14992fd7a69d5c9ccbb3f5cf Gerrit-Change-Number: 27377 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: Thu, 03 Mar 2022 09:43:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bitvec2freq_list(): fix handling of E-GSM ARFCNs

by laforge

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27356 ) Change subject: bitvec2freq_list(): fix handling of E-GSM ARFCNs ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I17739e6845cd84e2a81bc406dd532541f7c52cb6 Gerrit-Change-Number: 27356 Gerrit-PatchSet: 4 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:43:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bitvec2freq_list(): determine empty set by checking the ARFCN count

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27357 ) Change subject: bitvec2freq_list(): determine empty set by checking the ARFCN count ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > both methods work. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I29ca51461beec053bcb8b8210f0ad24bb8c7765f Gerrit-Change-Number: 27357 Gerrit-PatchSet: 2 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: Thu, 03 Mar 2022 09:42:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bitvec2freq_list(): determine empty set by checking the ARFCN count

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27357 ) Change subject: bitvec2freq_list(): determine empty set by checking the ARFCN count ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS1: > I find it cleaner to relay on the counter ('arfcns' in this case) to check if the set is empty, rath […] both methods work. but I think for something like this you need to put this explanation in the commit log. Or maybe mark it as cosmetic if it's no logical change. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I29ca51461beec053bcb8b8210f0ad24bb8c7765f Gerrit-Change-Number: 27357 Gerrit-PatchSet: 2 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: Thu, 03 Mar 2022 09:42:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: tests/gsm0408: add testing coverage for generate_cell_chan_list()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27378 ) Change subject: tests/gsm0408: add testing coverage for generate_cell_chan_list() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ied0519c70501f105673a9b36657101063d275058 Gerrit-Change-Number: 27378 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: Thu, 03 Mar 2022 09:42:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: system_information: fix unused 'mask' parameter in list_arfcn()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27377 ) Change subject: system_information: fix unused 'mask' parameter in list_arfcn() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I47f2eab54ef8487b14992fd7a69d5c9ccbb3f5cf Gerrit-Change-Number: 27377 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: Thu, 03 Mar 2022 09:41:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bitvec2freq_list(): fix handling of E-GSM ARFCNs

by fixeria

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27356 to look at the new patch set (#4). Change subject: bitvec2freq_list(): fix handling of E-GSM ARFCNs ...................................................................... bitvec2freq_list(): fix handling of E-GSM ARFCNs According to 3GPP TS 44.018, section 10.5.2.1b.2, only ARFCN values in range 1..124 can be encoded using the 'bit map 0' format. Before this patch, ARFCN values belonging to E-GSM band (0, 975..1023) were ignored in bitvec2freq_list(), and thus not present in the resulting Cell Channel Description IE. Change-Id: I17739e6845cd84e2a81bc406dd532541f7c52cb6 Related: SYS#5854 --- M src/osmo-bsc/system_information.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 19 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/56/27356/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I17739e6845cd84e2a81bc406dd532541f7c52cb6 Gerrit-Change-Number: 27356 Gerrit-PatchSet: 4 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bitvec2freq_list(): fix handling of E-GSM ARFCNs

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27356 ) Change subject: bitvec2freq_list(): fix handling of E-GSM ARFCNs ...................................................................... Patch Set 3: (1 comment) File src/osmo-bsc/system_information.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27356/comment/9ec8f98f_0ca571a7 PS1, Line 508: && bts->c0->arfcn >= 1 && bts->c0->arfcn <= 124) : pgsm = true; > Ok, I agree. Will rework the patch to do what you suggest. The patch was reworked, so that pgsm flag is never be set in a situation where E-GSM channels are used. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I17739e6845cd84e2a81bc406dd532541f7c52cb6 Gerrit-Change-Number: 27356 Gerrit-PatchSet: 3 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:03:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bitvec2freq_list(): fix handling of E-GSM ARFCNs

by fixeria

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27356 to look at the new patch set (#3). Change subject: bitvec2freq_list(): fix handling of E-GSM ARFCNs ...................................................................... bitvec2freq_list(): fix handling of E-GSM ARFCNs According to 3GPP TS 44.018, section 10.5.2.1b.2, only ARFCN values in range 1..124 can be encoded using the 'bit map 0' format. Before this patch, ARFCN values belonging to E-GSM band (0, 975..1023) were ignored in bitvec2freq_list(), and thus not present in the resulting Cell Channel Description IE. Change-Id: I17739e6845cd84e2a81bc406dd532541f7c52cb6 Related: SYS#5854 --- M src/osmo-bsc/system_information.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 18 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/56/27356/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I17739e6845cd84e2a81bc406dd532541f7c52cb6 Gerrit-Change-Number: 27356 Gerrit-PatchSet: 3 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bitvec2freq_list(): fix handling of E-GSM ARFCNs

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27356 ) Change subject: bitvec2freq_list(): fix handling of E-GSM ARFCNs ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > I will add testing coverage in the next patchset version. We have a basic unit test coverage now. This patch was intentionally kept unchanged to prove that it fixes the problem. I am reworking it now... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I17739e6845cd84e2a81bc406dd532541f7c52cb6 Gerrit-Change-Number: 27356 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 08:33:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bitvec2freq_list(): determine empty set by checking the ARFCN count

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27357 ) Change subject: bitvec2freq_list(): determine empty set by checking the ARFCN count ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > I find it cleaner to relay on the counter ('arfcns' in this case) to check if the set is empty, rath […] Commit message updated. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I29ca51461beec053bcb8b8210f0ad24bb8c7765f Gerrit-Change-Number: 27357 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 03 Mar 2022 08:20:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: tests/gsm0408: add testing coverage for generate_cell_chan_list()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27378 ) Change subject: tests/gsm0408: add testing coverage for generate_cell_chan_list() ...................................................................... tests/gsm0408: add testing coverage for generate_cell_chan_list() This commit demonstrates what happens when a cell has channels in both P-GSM and E-GSM bands (case 'c'). As can be seen from: Case a) only the BCCH carrier: 10 Case b) more carriers from P-GSM band: 1 3 10 64 99 124 Case c) more carriers from E-GSM band: 1 3 10 64 99 124 in both cases 'b' and 'c' we have the same set of ARFCNs. Carriers from the E-GSM band are not present at all. This is wrong and will be fixed in the follow up change(s). Change-Id: Ied0519c70501f105673a9b36657101063d275058 Related: SYS#5854 --- M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 74 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/27378/1 diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 90b294e..a7270a4 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -29,6 +29,7 @@ #include <osmocom/bsc/system_information.h> #include <osmocom/bsc/abis_rsl.h> #include <osmocom/bsc/bts.h> +#include <osmocom/bsc/bss.h> #include <osmocom/core/application.h> #include <osmocom/core/byteswap.h> @@ -555,6 +556,71 @@ msgb_free(msg); } +/* Similar to list_arfcn() from system_information.c, but uses printf(). + * Another difference is that the text is printed even if n is 0. */ +static void print_cell_chan_desc(uint8_t *cd, const char *text) +{ + struct gsm_sysinfo_freq freq[1024]; + unsigned int n = 0, i; + + memset(freq, 0, sizeof(freq)); + gsm48_decode_freq_list(freq, cd, 16, 0xce, 1); + + printf("%s:", text); + for (i = 0; i < 1024; i++) { + if (!freq[i].mask) + continue; + printf(" %u", i); + n++; + } + if (!n) + printf(" (empty set)"); + printf("\n"); +} + +static void test_cell_chan_desc(struct gsm_network *net) +{ + struct gsm_bts *bts = bts_init(net); + uint8_t cell_chan_desc[16]; + + printf("Testing generation of the Cell Channel Description IE:\n"); + + bts_model_unknown_init(); + bts->type = GSM_BTS_TYPE_UNKNOWN; + bts->model = bts_model_find(bts->type); + OSMO_ASSERT(bts->model != NULL); + + bts->band = GSM_BAND_900; + bts->c0->arfcn = 10; /* BCCH carrier */ + + /* Case a) only the BCCH carrier */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, bts->c0->arfcn, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case a) only the BCCH carrier"); + + /* Case b) more carriers from P-GSM band */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 3, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 64, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 99, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 124, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case b) more carriers from P-GSM band"); + + /* Case c) more carriers from E-GSM band */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 0, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 975, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1001, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1023, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case c) more carriers from E-GSM band"); + + bts_del(bts); +} + static const struct log_info_cat log_categories[] = { }; @@ -591,6 +657,8 @@ test_gsm48_multirate_config(); + test_cell_chan_desc(net); + printf("Done.\n"); return EXIT_SUCCESS; diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 0bb7ee0..26ec931 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -187,4 +187,10 @@ gsm48_multirate_config(): rc=0, lv=0520340bf330 gsm48_multirate_config(): rc=0, lv=0420140bf0 gsm48_multirate_config(): rc=0, lv=022004 +BTS allocation OK in test_cell_chan_desc() +Testing generation of the Cell Channel Description IE: +Case a) only the BCCH carrier: 10 +Case b) more carriers from P-GSM band: 1 3 10 64 99 124 +Case c) more carriers from E-GSM band: 1 3 10 64 99 124 +BTS deallocated OK in test_cell_chan_desc() Done. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ied0519c70501f105673a9b36657101063d275058 Gerrit-Change-Number: 27378 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: system_information: fix unused 'mask' parameter in list_arfcn()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27377 ) Change subject: system_information: fix unused 'mask' parameter in list_arfcn() ...................................................................... system_information: fix unused 'mask' parameter in list_arfcn() The callers of this function do pass different mask values, which should be passed to gsm48_decode_freq_list(). Instead, 0xce was passed regardless of the given mask value. Change-Id: I47f2eab54ef8487b14992fd7a69d5c9ccbb3f5cf --- M src/osmo-bsc/system_information.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/77/27377/1 diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 974af3a..1ebfe5c 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -709,7 +709,7 @@ struct gsm_sysinfo_freq freq[1024]; memset(freq, 0, sizeof(freq)); - gsm48_decode_freq_list(freq, chan_list, 16, 0xce, 1); + gsm48_decode_freq_list(freq, chan_list, 16, mask, 1); for (i = 0; i < 1024; i++) { if (freq[i].mask) { if (!n) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I47f2eab54ef8487b14992fd7a69d5c9ccbb3f5cf Gerrit-Change-Number: 27377 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bitvec2freq_list(): determine empty set by checking the ARFCN count

by fixeria

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-bsc/+/27357 to look at the new patch set (#2). Change subject: bitvec2freq_list(): determine empty set by checking the ARFCN count ...................................................................... bitvec2freq_list(): determine empty set by checking the ARFCN count I find it cleaner to relay on the counter ('arfcns' in this case) to check if the set is empty, rather than checking one of the resulting values ('max'). There is just a cosmetic change. Change-Id: I29ca51461beec053bcb8b8210f0ad24bb8c7765f Related: SYS#5854 --- M src/osmo-bsc/system_information.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/57/27357/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I29ca51461beec053bcb8b8210f0ad24bb8c7765f Gerrit-Change-Number: 27357 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

2024

2023

2022

gerrit-log March 2022