paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-10-27 18:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

gsm_bts_trx_set_system_infos(): Disable non-existing SI

Browse Source 
If we previously had a given SI present/active, we must send a
zero-length BCCH FILLING for that SI type to the BTS to stop it from
further transmitting this SI.

Change-Id: I33e356e2fa3a69efac9080813e3e9ef4e6438ed1
Closes: OS#2368
This commit is contained in:
Harald Welte
2017-07-15 23:23:58 +02:00
committed by Neels Hofmeyr
parent 8008ac0175
commit ca52991d6e
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libbsc/bsc_init.c
View File

@@ -104,8 +104,11 @@ static int rsl_si(struct gsm_bts_trx *trx, enum osmo_sysinfo_type i, int si_len)
struct gsm_bts *bts = trx->bts; struct gsm_bts *bts = trx->bts;
int rc, j; int rc, j;
DEBUGP(DRR, "SI%s: %s\n", get_value_string(osmo_sitype_strs, i), if (si_len) {
osmo_hexdump(GSM_BTS_SI(bts, i), GSM_MACBLOCK_LEN)); DEBUGP(DRR, "SI%s: %s\n", get_value_string(osmo_sitype_strs, i),
osmo_hexdump(GSM_BTS_SI(bts, i), GSM_MACBLOCK_LEN));
} else
DEBUGP(DRR, "SI%s: OFF\n", get_value_string(osmo_sitype_strs, i));
switch (i) { switch (i) {
case SYSINFO_TYPE_5: case SYSINFO_TYPE_5:
@@ -113,14 +116,18 @@ static int rsl_si(struct gsm_bts_trx *trx, enum osmo_sysinfo_type i, int si_len)
case SYSINFO_TYPE_5ter: case SYSINFO_TYPE_5ter:
case SYSINFO_TYPE_6: case SYSINFO_TYPE_6:
rc = rsl_sacch_filling(trx, osmo_sitype2rsl(i), rc = rsl_sacch_filling(trx, osmo_sitype2rsl(i),
GSM_BTS_SI(bts, i), si_len); si_len ? GSM_BTS_SI(bts, i) : NULL, si_len);
break; break;
case SYSINFO_TYPE_2quater: case SYSINFO_TYPE_2quater:
if (si_len == 0) {
rc = rsl_bcch_info(trx, i, NULL, 0);
break;
}
for (j = 0; j <= bts->si2q_count; j++) for (j = 0; j <= bts->si2q_count; j++)
rc = rsl_bcch_info(trx, i, (const uint8_t *)GSM_BTS_SI2Q(bts, j), GSM_MACBLOCK_LEN); rc = rsl_bcch_info(trx, i, (const uint8_t *)GSM_BTS_SI2Q(bts, j), GSM_MACBLOCK_LEN);
break; break;
default: default:
rc = rsl_bcch_info(trx, i, GSM_BTS_SI(bts, i), si_len); rc = rsl_bcch_info(trx, i, si_len ? GSM_BTS_SI(bts, i) : NULL, si_len);
break; break;
} }
@@ -193,9 +200,13 @@ int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx)
for (n = 0; n < n_si; n++) { for (n = 0; n < n_si; n++) {
i = gen_si[n]; i = gen_si[n];
/* if we don't currently have this SI, we send a zero-length
* RSL BCCH FILLING / SACCH FILLING * in order to deactivate
* the SI, in case it might have previously been active */
if (!GSM_BTS_HAS_SI(bts, i)) if (!GSM_BTS_HAS_SI(bts, i))
continue; rc = rsl_si(trx, i, 0);
rc = rsl_si(trx, i, si_len[i]); else
rc = rsl_si(trx, i, si_len[i]);
if (rc < 0) if (rc < 0)
return rc; return rc;
} }