cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

fix wrong ARFCNs in local-cell neighbor config 

For neighbors configured without explicit ARFCN+BSIC ('neighbor bts N',
'neighbor lac-ci N M', ...), actually use the local neighbor cell's
ARFCN.

So far the code looked correct on first sight, but passed an unused part
of the struct neighbor union, always resulting in ARFCN 0.

Related: SYS#5367
Change-Id: Ifb54d9a91e9bca032c721f12c873c6216733e7b1
This commit is contained in:
Neels Hofmeyr 2021-04-18 15:56:13 +02:00
parent da6dae0daa
commit 6be9e42a1d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osmo-bsc/system_information.c
View File

@ -673,12 +673,14 @@ static int generate_bcch_chan_list(uint8_t *chan_list, struct gsm_bts *bts,
bitvec_set_bit_pos(bv, n->cell_id.ab.arfcn, 1);
} else {
struct gsm_bts *neigh_bts;
if (resolve_local_neighbor(&neigh_bts, bts, n) == 0)
bitvec_set_bit_pos(bv, n->cell_id.ab.arfcn, 1);
else
if (resolve_local_neighbor(&neigh_bts, bts, n)) {
LOGP(DHO, LOGL_ERROR,
"Neither local nor remote neighbor: BTS %u -> %s\n",
bts->nr, neighbor_to_str_c(OTC_SELECT, n));
continue;
}
if (neigh_bts->c0)
bitvec_set_bit_pos(bv, neigh_bts->c0->arfcn, 1);
}
}
}