aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2013-02-14 11:17:58 +0100
committerHarald Welte <laforge@gnumonks.org>2014-08-27 23:45:47 +0200
commit9f22fcfd367adbc88183079e27b1cd790a04a6f0 (patch)
tree73fc528c803db5b2cfc63be3c496668429bc7763
parent11b14fd6624a012cb6bdc49f2dea970f02fda653 (diff)
Correctly fill system information messages from BSC
SI 5*/6 require L2 header of 0x03,0x03. All SI might be less than 23 octets, so they need to be filled with 0x2b.
-rw-r--r--src/common/rsl.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/common/rsl.c b/src/common/rsl.c
index bc7fddb9..11c7c715 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -318,6 +318,7 @@ static int rsl_rx_bcch_info(struct gsm_bts_trx *trx, struct msgb *msg)
if (len > sizeof(sysinfo_buf_t))
len = sizeof(sysinfo_buf_t);
bts->si_valid |= (1 << osmo_si);
+ memset(bts->si_buf[osmo_si], 0x2b, sizeof(sysinfo_buf_t));
memcpy(bts->si_buf[osmo_si],
TLVP_VAL(&tp, RSL_IE_FULL_BCCH_INFO), len);
LOGP(DRSL, LOGL_INFO, " Rx RSL BCCH INFO (SI%s)\n",
@@ -327,6 +328,7 @@ static int rsl_rx_bcch_info(struct gsm_bts_trx *trx, struct msgb *msg)
if (len > sizeof(sysinfo_buf_t))
len = sizeof(sysinfo_buf_t);
bts->si_valid |= (1 << osmo_si);
+ memset(bts->si_buf[osmo_si], 0x2b, sizeof(sysinfo_buf_t));
memcpy(bts->si_buf[osmo_si],
TLVP_VAL(&tp, RSL_IE_L3_INFO), len);
LOGP(DRSL, LOGL_INFO, " Rx RSL BCCH INFO (SI%s)\n",
@@ -441,6 +443,7 @@ static int rsl_rx_sacch_fill(struct gsm_bts_trx *trx, struct msgb *msg)
bts->si_valid |= (1 << osmo_si);
bts->si_buf[osmo_si][0] = 0x03; /* C/R + EA */
bts->si_buf[osmo_si][1] = 0x03; /* UI frame */
+ memset(bts->si_buf[osmo_si]+2, 0x2b, sizeof(sysinfo_buf_t)-2);
memcpy(bts->si_buf[osmo_si]+2,
TLVP_VAL(&tp, RSL_IE_L3_INFO), len);
LOGP(DRSL, LOGL_INFO, " Rx RSL SACCH FILLING (SI%s)\n",
@@ -785,8 +788,9 @@ static int rsl_rx_chan_activ(struct msgb *msg)
if (copy_len > sizeof(sysinfo_buf_t)-2)
copy_len = sizeof(sysinfo_buf_t)-2;
lchan->si.valid |= (1 << osmo_si);
- lchan->si.buf[osmo_si][0] = 0x00;
+ lchan->si.buf[osmo_si][0] = 0x03;
lchan->si.buf[osmo_si][1] = 0x03;
+ memset(lchan->si.buf[osmo_si]+2, 0x2b, sizeof(sysinfo_buf_t)-2);
memcpy(lchan->si.buf[osmo_si]+2, cur, copy_len);
cur += si_len;
@@ -1115,8 +1119,9 @@ static int rsl_rx_sacch_inf_mod(struct msgb *msg)
if (len > sizeof(sysinfo_buf_t)-2)
len = sizeof(sysinfo_buf_t)-2;
lchan->si.valid |= (1 << osmo_si);
- lchan->si.buf[osmo_si][0] = 0x00;
+ lchan->si.buf[osmo_si][0] = 0x03;
lchan->si.buf[osmo_si][1] = 0x03;
+ memset(lchan->si.buf[osmo_si]+2, 0x2b, sizeof(sysinfo_buf_t)-2);
memcpy(lchan->si.buf[osmo_si]+2,
TLVP_VAL(&tp, RSL_IE_L3_INFO), len);
LOGP(DRSL, LOGL_INFO, "%s Rx RSL SACCH FILLING (SI%s)\n",