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

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

by fixeria

fixeria has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved 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-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

3 years, 4 months

1
0
0 0

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

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27381 ) Change subject: bitvec2freq_list(): fix handling of E-GSM ARFCNs ...................................................................... Patch Set 1: Code-Review+2 -- 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-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: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 03 Mar 2022 19:24:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

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

by fixeria

fixeria 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+2 -- 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 19:24:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bts[master]: bts-trx: Log lchan if avaialble in Meas Avg

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27399 ) Change subject: bts-trx: Log lchan if avaialble in Meas Avg ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/27399/comment/a6855519_d1263cef PS1, Line 693: LOGP(DMEAS, LOGL_DEBUG, "%s%sMeasurement AVG (num=%u, shift=%u): " Alternatively, we could make LOGPLCHAN() NULL-safe and use it here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1460715fa46c4195c5aaac91be776ad770d8099e Gerrit-Change-Number: 27399 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 19:21:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-gbproxy[master]: gbproxy_peer: Add rate counters when forwarding packets fail

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/27396 ) Change subject: gbproxy_peer: Add rate counters when forwarding packets fail ...................................................................... gbproxy_peer: Add rate counters when forwarding packets fail Change-Id: I7fa972ba843993dac84241c04d66d5b7e2a0b40f --- M include/osmocom/gbproxy/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_peer.c 3 files changed, 17 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gbproxy/gb_proxy.h b/include/osmocom/gbproxy/gb_proxy.h index 0657df7..00309e1 100644 --- a/include/osmocom/gbproxy/gb_proxy.h +++ b/include/osmocom/gbproxy/gb_proxy.h @@ -50,6 +50,8 @@ GBPROX_PEER_CTR_DROPPED, GBPROX_PEER_CTR_INV_NSEI, GBPROX_PEER_CTR_TX_ERR, + GBPROX_PEER_CTR_FWD_FROM_SGSN_ERR, + GBPROX_PEER_CTR_FWD_FROM_BSS_ERR, GBPROX_PEER_CTR_LAST, }; diff --git a/src/gb_proxy.c b/src/gb_proxy.c index c2b958a..298e132 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -532,6 +532,9 @@ } } + if (rc < 0) + rate_ctr_inc(rate_ctr_group_get_ctr(bss_bvc->ctrg, GBPROX_PEER_CTR_FWD_FROM_BSS_ERR)); + return 0; } @@ -606,8 +609,12 @@ default: break; } - return gbprox_relay2peer(msg, bss_bvc, bss_bvc->bvci); + rc = gbprox_relay2peer(msg, bss_bvc, bss_bvc->bvci); + if (rc < 0) + rate_ctr_inc(rate_ctr_group_get_ctr(bss_bvc->ctrg, GBPROX_PEER_CTR_FWD_FROM_SGSN_ERR)); + + return rc; } /*********************************************************************** diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c index 74bde3a..1e300ad 100644 --- a/src/gb_proxy_peer.c +++ b/src/gb_proxy_peer.c @@ -39,11 +39,13 @@ extern void *tall_sgsn_ctx; static const struct rate_ctr_desc bvc_ctr_description[] = { - [GBPROX_PEER_CTR_BLOCKED] = { "blocked", "BVC Block " }, - [GBPROX_PEER_CTR_UNBLOCKED] = { "unblocked", "BVC Unblock " }, - [GBPROX_PEER_CTR_DROPPED] = { "dropped", "BVC blocked, dropped packet " }, - [GBPROX_PEER_CTR_INV_NSEI] = { "inv-nsei", "NSEI mismatch " }, - [GBPROX_PEER_CTR_TX_ERR] = { "tx-err", "NS Transmission error " }, + [GBPROX_PEER_CTR_BLOCKED] = { "blocked", "BVC Block " }, + [GBPROX_PEER_CTR_UNBLOCKED] = { "unblocked", "BVC Unblock " }, + [GBPROX_PEER_CTR_DROPPED] = { "dropped", "BVC blocked, dropped packet " }, + [GBPROX_PEER_CTR_INV_NSEI] = { "inv-nsei", "NSEI mismatch " }, + [GBPROX_PEER_CTR_TX_ERR] = { "tx-err", "NS Transmission error " }, + [GBPROX_PEER_CTR_FWD_FROM_SGSN_ERR] = { "fwd-sgsn-err", "Forwarding data from SGSN failed" }, + [GBPROX_PEER_CTR_FWD_FROM_BSS_ERR] = { "fwd-bss-err", "Forwarding data from BSS failed " }, }; osmo_static_assert(ARRAY_SIZE(bvc_ctr_description) == GBPROX_PEER_CTR_LAST, everything_described); -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/27396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I7fa972ba843993dac84241c04d66d5b7e2a0b40f Gerrit-Change-Number: 27396 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-gbproxy[master]: gbproxy: Only route to an SGSN if the BVC is not blocked

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/27322 ) Change subject: gbproxy: Only route to an SGSN if the BVC is not blocked ...................................................................... gbproxy: Only route to an SGSN if the BVC is not blocked Change-Id: I0b54813c04bae2c63975082ad2dacae8affd3127 --- M src/gb_proxy.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 69a58d4..c2b958a 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -348,6 +348,8 @@ continue; if (sgsn->nse != sgsn_bvc->nse) continue; + if (!bssgp_bvc_fsm_is_unblocked(sgsn_bvc->fi)) + continue; return sgsn_bvc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/27322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0b54813c04bae2c63975082ad2dacae8affd3127 Gerrit-Change-Number: 27322 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-gbproxy[master]: gbproxy_peer: Use designated initializers for bvc_ctr_description

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/27395 ) Change subject: gbproxy_peer: Use designated initializers for bvc_ctr_description ...................................................................... gbproxy_peer: Use designated initializers for bvc_ctr_description Change-Id: If571e5d5b653291f34df516b801f35225dd4f7c9 --- M src/gb_proxy_peer.c 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c index 0070155..74bde3a 100644 --- a/src/gb_proxy_peer.c +++ b/src/gb_proxy_peer.c @@ -39,11 +39,11 @@ extern void *tall_sgsn_ctx; static const struct rate_ctr_desc bvc_ctr_description[] = { - { "blocked", "BVC Block " }, - { "unblocked", "BVC Unblock " }, - { "dropped", "BVC blocked, dropped packet " }, - { "inv-nsei", "NSEI mismatch " }, - { "tx-err", "NS Transmission error " }, + [GBPROX_PEER_CTR_BLOCKED] = { "blocked", "BVC Block " }, + [GBPROX_PEER_CTR_UNBLOCKED] = { "unblocked", "BVC Unblock " }, + [GBPROX_PEER_CTR_DROPPED] = { "dropped", "BVC blocked, dropped packet " }, + [GBPROX_PEER_CTR_INV_NSEI] = { "inv-nsei", "NSEI mismatch " }, + [GBPROX_PEER_CTR_TX_ERR] = { "tx-err", "NS Transmission error " }, }; osmo_static_assert(ARRAY_SIZE(bvc_ctr_description) == GBPROX_PEER_CTR_LAST, everything_described); -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/27395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: If571e5d5b653291f34df516b801f35225dd4f7c9 Gerrit-Change-Number: 27395 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-gbproxy[master]: gbproxy_peer: Add rate counters when forwarding packets fail

by laforge

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/27396 ) Change subject: gbproxy_peer: Add rate counters when forwarding packets fail ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/27396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I7fa972ba843993dac84241c04d66d5b7e2a0b40f Gerrit-Change-Number: 27396 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 18:15:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-gbproxy[master]: gbproxy_peer: Use designated initializers for bvc_ctr_description

by laforge

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/27395 ) Change subject: gbproxy_peer: Use designated initializers for bvc_ctr_description ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/27395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: If571e5d5b653291f34df516b801f35225dd4f7c9 Gerrit-Change-Number: 27395 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 18:08:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-gbproxy[master]: gbproxy: Only route to an SGSN if the BVC is not blocked

by laforge

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/27322 ) Change subject: gbproxy: Only route to an SGSN if the BVC is not blocked ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/27322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0b54813c04bae2c63975082ad2dacae8affd3127 Gerrit-Change-Number: 27322 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 18:07:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022