pespin has uploaded this change for review.

View Change

Fix BTS nr >255 wrapping up during bts allocation

Commit which introduced the gsm_bts_nr_t type forgot to use it in these
functions.
As a result, bts 256 ended up trying to allocate rate counters for id=0.

Change-Id: I5128becaf453f5cfbc722a55c756432e525fc884
Fixes: 6fe0e28a23a3aa3e707d147569add7f68d5dc4a1
Related: SYS#7063
---
M include/osmocom/bsc/bts.h
M include/osmocom/bsc/bts_sm.h
M src/osmo-bsc/bts.c
M src/osmo-bsc/bts_sm.c
4 files changed, 4 insertions(+), 4 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/38/39138/1

diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h
index 251c161..248c746 100644
--- a/include/osmocom/bsc/bts.h
+++ b/include/osmocom/bsc/bts.h
@@ -805,7 +805,7 @@
 	return &lai;
 }
 
-struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm, uint8_t bts_num);
+struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm, gsm_bts_nr_t bts_num);
 int gsm_bts_check_cfg(struct gsm_bts *bts);
 
 char *gsm_bts_name(const struct gsm_bts *bts);
diff --git a/include/osmocom/bsc/bts_sm.h b/include/osmocom/bsc/bts_sm.h
index 13be3d9..8fbdd74 100644
--- a/include/osmocom/bsc/bts_sm.h
+++ b/include/osmocom/bsc/bts_sm.h
@@ -68,7 +68,7 @@
 	return site_mgr->bts[0];
 }
 
-struct gsm_bts_sm *gsm_bts_sm_alloc(struct gsm_network *net, uint8_t bts_num);
+struct gsm_bts_sm *gsm_bts_sm_alloc(struct gsm_network *net, gsm_bts_nr_t bts_num);
 
 void gsm_bts_sm_mo_reset(struct gsm_bts_sm *bts_sm);
 
diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c
index c21e5b3..9febe35 100644
--- a/src/osmo-bsc/bts.c
+++ b/src/osmo-bsc/bts.c
@@ -193,7 +193,7 @@
  * This part is shared among the thin programs in osmo-bsc/src/utils/.
  * osmo-bsc requires further initialization that pulls in more dependencies (see
  * bsc_bts_alloc_register()). */
-struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm, uint8_t bts_num)
+struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm, gsm_bts_nr_t bts_num)
 {
 	struct gsm_bts *bts = talloc_zero(bts_sm, struct gsm_bts);
 
diff --git a/src/osmo-bsc/bts_sm.c b/src/osmo-bsc/bts_sm.c
index ca572f1..d122369 100644
--- a/src/osmo-bsc/bts_sm.c
+++ b/src/osmo-bsc/bts_sm.c
@@ -49,7 +49,7 @@
 	return 0;
 }
 
-struct gsm_bts_sm *gsm_bts_sm_alloc(struct gsm_network *net, uint8_t bts_num)
+struct gsm_bts_sm *gsm_bts_sm_alloc(struct gsm_network *net, gsm_bts_nr_t bts_num)
 {
 	struct gsm_bts_sm *bts_sm = talloc_zero(net, struct gsm_bts_sm);
 	struct gsm_bts *bts;

To view, visit change 39138. To unsubscribe, or for help writing mail filters, visit settings.