Change in osmo-bsc[master]: gsm_04_08_rr: fix hopping parameters in RR Handover Command

[fixeria]

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19944 )

Change subject: gsm_04_08_rr: fix hopping parameters in RR Handover Command
......................................................................

gsm_04_08_rr: fix hopping parameters in RR Handover Command

A similar problem has already been fixed in [1]:

  - include GSM48_IE_MA_AFTER instead of GSM48_IE_MA_BEFORE,
  - fix position of the Mobile Allocation (after time) IE.

This problem was uncovered by (not yet merged) TTCN-3 test case
verifying handling of the hopping parameters [2].  This change
makes it pass.

[1] I43ef66c109b107ebcaa1cb6197637701b13b3787
[2] BSC_Tests.TC_fh_params_handover_cmd

Change-Id: I7569eead9760b6fd4bb91fc2d8d0b8200bebe374
Related: SYS#4868, OS#4545
---
M src/osmo-bsc/gsm_04_08_rr.c
1 file changed, 10 insertions(+), 9 deletions(-)

Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c
index 69ec4d3..be114f0 100644
--- a/src/osmo-bsc/gsm_04_08_rr.c
+++ b/src/osmo-bsc/gsm_04_08_rr.c
@@ -523,23 +523,24 @@
 	if (new_lchan->ts->hopping.enabled) {
 		struct gsm_bts *bts = new_lchan->ts->trx->bts;
 		struct gsm48_system_information_type_1 *si1;
-		uint8_t *cur;
 
 		si1 = GSM_BTS_SI(bts, SYSINFO_TYPE_1);
 		/* Copy the Cell Chan Desc (ARFCNS in this cell) */
-		msgb_put_u8(msg, GSM48_IE_CELL_CH_DESC);
-		cur = msgb_put(msg, GSM48_HOCMD_CCHDESC_LEN);
-		memcpy(cur, si1->cell_channel_description,
-			GSM48_HOCMD_CCHDESC_LEN);
-		/* Copy the Mobile Allocation */
-		msgb_tlv_put(msg, GSM48_IE_MA_BEFORE,
-			     new_lchan->ts->hopping.ma_len,
-			     new_lchan->ts->hopping.ma_data);
+		msgb_tv_fixed_put(msg, GSM48_IE_CELL_CH_DESC,
+				  GSM48_HOCMD_CCHDESC_LEN,
+				  si1->cell_channel_description);
 	}
 	/* FIXME: optional bits for type of synchronization? */
 
 	msgb_tv_put(msg, GSM48_IE_CHANMODE_1, new_lchan->tch_mode);
 
+	/* Mobile Allocation (after time), TLV (see 3GPP TS 44.018, 10.5.2.21) */
+	if (new_lchan->ts->hopping.enabled) {
+		msgb_tlv_put(msg, GSM48_IE_MA_AFTER,
+			     new_lchan->ts->hopping.ma_len,
+			     new_lchan->ts->hopping.ma_data);
+	}
+
 	/* in case of multi rate we need to attach a config */
 	if (new_lchan->tch_mode == GSM48_CMODE_SPEECH_AMR)
 		msgb_tlv_put(msg, GSM48_IE_MUL_RATE_CFG, new_lchan->mr_ms_lv[0],

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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I7569eead9760b6fd4bb91fc2d8d0b8200bebe374
Gerrit-Change-Number: 19944
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200903/1fdaf792/attachment.htm>