Attention is currently required from: pespin.
laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38087?usp=email )
Change subject: Introduce hashtable to lookup bts by LAC
......................................................................
Patch Set 2:
(1 comment)
File src/osmo-bsc/neighbor_ident.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/38087/comment/54c74777_7cee2a92?usp… :
PS2, Line 381: f (bts_tmp->location_area_code != lac)
: continue;
shouldn't this be now an error message in all of those iterations (not just this function)? After all, it would indicate corruption of our hash table...
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38087?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Id523027b49e0f58cd2c8c9b4dee619de415dbd15
Gerrit-Change-Number: 38087
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 10 Sep 2024 18:36:20 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Attention is currently required from: pespin.
laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38085?usp=email )
Change subject: gsm_bts_num(): use hashtable to lookup bts
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
File include/osmocom/bsc/gsm_data.h:
https://gerrit.osmocom.org/c/osmo-bsc/+/38085/comment/efa25ef4_c4573455?usp… :
PS1, Line 990: 6
why only 6? In very small lab type setups, a few more hash buckets will not matter performance-wise. In large setups, we know the number of BTS will be >256 soon, and hence I'd have suggested at least 8 bits or more here?
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38085?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I7312da7d9aa80c6d0f2e92e9c7d20d32ce453ad1
Gerrit-Change-Number: 38085
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 10 Sep 2024 18:34:48 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Attention is currently required from: pespin.
laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38082?usp=email )
Change subject: bts: Make sure bts_location entries in bts->loc_list are freed
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38082?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I4de3d56a4f1f6bd1fe880b72cdd384c2398dabc9
Gerrit-Change-Number: 38082
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 10 Sep 2024 18:31:13 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38077?usp=email )
Change subject: pcu_info_update(): Simplify code path with early return
......................................................................
pcu_info_update(): Simplify code path with early return
This makes it easy to add more checks, like done in a follow-up patch.
Change-Id: I694a0403e93af4435062f2b4534f84943007df87
---
M src/osmo-bsc/pcu_sock.c
1 file changed, 10 insertions(+), 9 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/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c
index d4eee44..83513f6 100644
--- a/src/osmo-bsc/pcu_sock.c
+++ b/src/osmo-bsc/pcu_sock.c
@@ -363,15 +363,16 @@
/* Allow test to overwrite it */
__attribute__((weak)) void pcu_info_update(struct gsm_bts *bts)
{
- if (pcu_connected(bts->network)) {
- if (bsc_co_located_pcu(bts)) {
- /* In cases where the CCU is connected via an E1 line, we transmit the connection parameters for the
- * PDCH before we announce the other BTS related parameters. */
- if (is_e1_bts(bts))
- pcu_tx_e1_ccu_ind(bts);
- pcu_tx_info_ind(bts);
- }
- }
+ if (!pcu_connected(bts->network))
+ return;
+ if (!bsc_co_located_pcu(bts))
+ return;
+
+ /* In cases where the CCU is connected via an E1 line, we transmit the connection parameters for the
+ * PDCH before we announce the other BTS related parameters. */
+ if (is_e1_bts(bts))
+ pcu_tx_e1_ccu_ind(bts);
+ pcu_tx_info_ind(bts);
}
static int pcu_tx_data_ind(struct gsm_bts_trx_ts *ts, uint8_t sapi, uint32_t fn,
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38077?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I694a0403e93af4435062f2b4534f84943007df87
Gerrit-Change-Number: 38077
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38078?usp=email )
Change subject: Log unsupported PCUIF for bts > 255
......................................................................
Log unsupported PCUIF for bts > 255
Since the "struct gsm_pcu_if"->bts_nr is still uint8_t, that means
only the first 256 configured BTS can properly make use of the
PCUIF interface and hence have gprs support.
This is not a major problem as long as the BTS connected to osmo-bsc
are of type osmo-bts, since usually those use a BTS co-located
osmo-pcu, hence on each one bts_nr=0.
But if we wanted to run them with osmo-bsc PCU co-located,
(eg rbs2000), then we'd need to extend the PCUIF interface.
Related: OS#6565
Related: SYS#7062
Change-Id: If5a8cd94195422989de3daa04be7ffc858c0a8eb
---
M src/osmo-bsc/pcu_sock.c
1 file changed, 14 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c
index 83513f6..02a3d84 100644
--- a/src/osmo-bsc/pcu_sock.c
+++ b/src/osmo-bsc/pcu_sock.c
@@ -367,6 +367,10 @@
return;
if (!bsc_co_located_pcu(bts))
return;
+ if (bts->nr > 0xff) { /* OS#6565 */
+ LOG_BTS(bts, DPCU, LOGL_ERROR, "bts id > 255 cannot be configured over PCUIF! GPRS won't work for this BTS!");
+ return;
+ }
/* In cases where the CCU is connected via an E1 line, we transmit the connection parameters for the
* PDCH before we announce the other BTS related parameters. */
@@ -429,6 +433,11 @@
return -EINVAL;
}
+ if (bts->nr > 0xff) { /* OS#6565 */
+ LOG_BTS(bts, DPCU, LOGL_ERROR, "CHAN RQD(GPRS) on bts id > 255 cannot be sent over PCUIF! GPRS won't work for this BTS!");
+ return -EINVAL;
+ }
+
LOG_BTS(bts, DPCU, LOGL_INFO, "Sending RACH indication: qta=%d, ra=%d, "
"fn=%d\n", qta, ra, fn);
@@ -887,6 +896,11 @@
struct gsm_bts_trx *trx;
int j;
+ if (bts->nr > 0xff) { /* OS#6565 */
+ LOG_BTS(bts, DPCU, LOGL_ERROR, "bts id > 255 cannot be configured over PCUIF! GPRS won't work for this BTS!");
+ return;
+ }
+
/* activate PDCH */
llist_for_each_entry(trx, &bts->trx_list, list) {
for (j = 0; j < ARRAY_SIZE(trx->ts); j++) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38078?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: If5a8cd94195422989de3daa04be7ffc858c0a8eb
Gerrit-Change-Number: 38078
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>