Change in osmo-bsc[master]: SI Type 4: fix missing CBCH Mobile Allocation IE

[fixeria]

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19950 )


Change subject: SI Type 4: fix missing CBCH Mobile Allocation IE
......................................................................

SI Type 4: fix missing CBCH Mobile Allocation IE

According to 3GPP TS 44.018, section 9.1.36.2, the CBCH Mobile
Allocation IE shall be present if CBCH Channel Description IE
indicates frequency hopping.  For some reason it was missing.

This change makes BSC_Tests.TC_fh_params_si4_cbch pass.

Change-Id: I8dce506a07d9d291b631b44fa2177c9deff6aa88
Related: SYS#4868, OS#4545
---
M src/osmo-bsc/system_information.c
1 file changed, 16 insertions(+), 7 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/19950/1

diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c
index 7011127..2418e32 100644
--- a/src/osmo-bsc/system_information.c
+++ b/src/osmo-bsc/system_information.c
@@ -944,7 +944,7 @@
 	int rc;
 	struct gsm48_system_information_type_4 *si4 = (struct gsm48_system_information_type_4 *) GSM_BTS_SI(bts, t);
 	struct gsm_lchan *cbch_lchan;
-	uint8_t *restoct = si4->data;
+	uint8_t *tail = si4->data;
 
 	/* length of all IEs present except SI4 rest octets and l2_plen */
 	int l2_plen = sizeof(*si4) - 1;
@@ -963,13 +963,22 @@
 	/* Optional: CBCH Channel Description + CBCH Mobile Allocation */
 	cbch_lchan = gsm_bts_get_cbch(bts);
 	if (cbch_lchan) {
+		const struct gsm_bts_trx_ts *ts = cbch_lchan->ts;
 		struct gsm48_chan_desc cd;
+
+		/* 10.5.2.5 (TV) CBCH Channel Description IE */
 		gsm48_lchan2chan_desc_as_configured(&cd, cbch_lchan);
-		tv_fixed_put(si4->data, GSM48_IE_CBCH_CHAN_DESC, 3,
-			     (uint8_t *) &cd);
-		l2_plen += 3 + 1;
-		restoct += 3 + 1;
-		/* we don't use hopping and thus don't need a CBCH MA */
+		tail = tv_fixed_put(tail, GSM48_IE_CBCH_CHAN_DESC,
+				    sizeof(cd), (uint8_t *) &cd);
+		l2_plen += 1 + sizeof(cd);
+
+		/* 10.5.2.21 (TLV) CBCH Mobile Allocation IE */
+		if (ts->hopping.enabled) {
+			tail = tlv_put(tail, GSM48_IE_CBCH_MOB_AL,
+				       ts->hopping.ma_len,
+				       ts->hopping.ma_data);
+			l2_plen += 2 + ts->hopping.ma_len;
+		}
 	}
 
 	si4->header.l2_plen = GSM48_LEN2PLEN(l2_plen);
@@ -977,7 +986,7 @@
 	/* SI4 Rest Octets (10.5.2.35), containing
 		Optional Power offset, GPRS Indicator,
 		Cell Identity, LSA ID, Selection Parameter */
-	rc = rest_octets_si4(restoct, &si_info, (uint8_t *)GSM_BTS_SI(bts, t) + GSM_MACBLOCK_LEN - restoct);
+	rc = rest_octets_si4(tail, &si_info, (uint8_t *)GSM_BTS_SI(bts, t) + GSM_MACBLOCK_LEN - tail);
 
 	return l2_plen + 1 + rc;
 }

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19950
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I8dce506a07d9d291b631b44fa2177c9deff6aa88
Gerrit-Change-Number: 19950
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200902/31c94e29/attachment.htm>