diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-09-30 09:22:30 +0800 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-10-01 11:11:30 +0800 |
| commit | db1f75c3e305b87577d219365811fa5e5037a80d (patch) | |
| tree | e21e2ef1eb4dcc376a9c545e62280a3863f62657 /openbsc/src/libbsc/system_information.c | |
| parent | 725bcb71f07e572672bdeb878bb1fbd94bb44eba (diff) | |
Make sure BA-IND in all SI2xxx is '0' and in all SI5xxx is '1'
In masurement reports sent by the MS, this can then be used to correlate
if a given measurement report was in response to a BCCH/neighbor list
received on BCCH (SI2xxx) or on dowlink SACCH (SI5xxx).
Closes: OS#2525
Change-Id: I1cd0dc51026dcd0e508e63eea4e333e6b184787a
Diffstat (limited to 'openbsc/src/libbsc/system_information.c')
| -rw-r--r-- | openbsc/src/libbsc/system_information.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/openbsc/src/libbsc/system_information.c b/openbsc/src/libbsc/system_information.c index c7fc4bf59..abb1a6dc9 100644 --- a/openbsc/src/libbsc/system_information.c +++ b/openbsc/src/libbsc/system_information.c @@ -586,6 +586,7 @@ static int generate_bcch_chan_list(uint8_t *chan_list, struct gsm_bts *bts, { struct gsm_bts *cur_bts; struct bitvec *bv; + int rc; if (si5 && bts->neigh_list_manual_mode == NL_MODE_MANUAL_SI5SEP) bv = &bts->si_common.si5_neigh_list; @@ -606,7 +607,20 @@ static int generate_bcch_chan_list(uint8_t *chan_list, struct gsm_bts *bts, } /* then we generate a GSM 04.08 frequency list from the bitvec */ - return bitvec2freq_list(chan_list, bv, bts, bis, ter); + rc = bitvec2freq_list(chan_list, bv, bts, bis, ter); + if (rc < 0) + return rc; + + /* Set BA-IND depending on whether we're generating SI2 or SI5. + * The point here is to be able to correlate whether a given MS + * measurement report was using the neighbor cells advertised in + * SI2 or in SI5, as those two could very well be different */ + if (si5) + chan_list[0] |= 0x10; + else + chan_list[0] &= ~0x10; + + return rc; } static int list_arfcn(uint8_t *chan_list, uint8_t mask, char *text) |