Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/10845 )
Change subject: CBCH: Fix rejecting SMS-CB related RSL messages
......................................................................
CBCH: Fix rejecting SMS-CB related RSL messages
Normally, the "Common Channel" related RSL messages should actually
contain such a common channel. However, since cell broadcast is
implemented inside what's essentially a downlink SDCCH, we should add
some explicit exceptions.
Before this patch, any RSL SMS BC CMD would have been discarded and
an RSL Error Indiciation returned.
Change-Id: I2f7f1dd43505cc27cd33489d8b0e8c981cd93880
Closes: OS#3533
---
M src/common/rsl.c
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/common/rsl.c b/src/common/rsl.c
index ff2d997..c6c00ea 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -2725,8 +2725,12 @@
}
msg->l3h = (unsigned char *)cch + sizeof(*cch);
- if (chan_nr_is_dchan(cch->chan_nr))
- return rsl_reject_unknown_lchan(msg);
+ /* normally we don't permit dedicated channels here ... */
+ if (chan_nr_is_dchan(cch->chan_nr)) {
+ /* ... however, CBCH is on a SDCCH, so we must permit it */
+ if (cch->c.msg_type != RSL_MT_SMS_BC_CMD && cch->c.msg_type !=
RSL_MT_SMS_BC_REQ)
+ return rsl_reject_unknown_lchan(msg);
+ }
msg->lchan = lchan_lookup(trx, cch->chan_nr, "RSL rx CCHAN: ");
if (!msg->lchan) {
--
To view, visit https://gerrit.osmocom.org/10845
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I2f7f1dd43505cc27cd33489d8b0e8c981cd93880
Gerrit-Change-Number: 10845
Gerrit-PatchSet: 3
Gerrit-Owner: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
