Change in osmo-bts[master]: rsl: send NACK if BTS_FEAT_ACCH_REP is not supported

[fixeria]

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

Change subject: rsl: send NACK if BTS_FEAT_ACCH_REP is not supported
......................................................................

rsl: send NACK if BTS_FEAT_ACCH_REP is not supported

Change-Id: I7993cf7842ffde561f2bdc50f56516c3a188b2bc
Related: SYS#5114
---
M src/common/rsl.c
1 file changed, 13 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved



diff --git a/src/common/rsl.c b/src/common/rsl.c
index d14395b..3cbfff6 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1566,7 +1566,7 @@
 }
 
 /* Parse RSL_IE_OSMO_REP_ACCH_CAP */
-static void parse_repeated_acch_capability(struct gsm_lchan *lchan, struct tlv_parsed *tp)
+static int parse_repeated_acch_capability(struct gsm_lchan *lchan, struct tlv_parsed *tp)
 {
 	/* 3GPP TS 24.008, section 10.5.1.7 defines a Repeated ACCH Capability
 	 * bit that indicates if REPEATED FACCH/SACCH is supported or not.
@@ -1577,10 +1577,15 @@
 	memset(&lchan->repeated_acch_capability, 0, sizeof(lchan->repeated_acch_capability));
 
 	if (!TLVP_PRES_LEN(tp, RSL_IE_OSMO_REP_ACCH_CAP, sizeof(lchan->repeated_acch_capability)))
-		return;
+		return 0;
+
+	if (!osmo_bts_has_feature(lchan->ts->trx->bts->features, BTS_FEAT_ACCH_REP))
+		return -RSL_ERR_OPT_IE_ERROR;
 
 	memcpy(&lchan->repeated_acch_capability, TLVP_VAL(tp, RSL_IE_OSMO_REP_ACCH_CAP),
 	       sizeof(lchan->repeated_acch_capability));
+
+	return 0;
 }
 
 /* Parse RSL_IE_OSMO_TOP_ACCH_CAP */
@@ -1912,7 +1917,9 @@
 	/* Remember to send an RSL ACK once the lchan is active */
 	lchan->rel_act_kind = LCHAN_REL_ACT_RSL;
 
-	parse_repeated_acch_capability(lchan, &tp);
+	rc = parse_repeated_acch_capability(lchan, &tp);
+	if (rc < 0)
+		return rsl_tx_chan_act_acknack(lchan, -rc);
 	rc = parse_temporary_overpower_acch_capability(lchan, &tp);
 	if (rc < 0)
 		return rsl_tx_chan_act_acknack(lchan, -rc);
@@ -2180,7 +2187,9 @@
 	/* 9.3.53 MultiRate Control */
 	/* 9.3.54 Supported Codec Types */
 
-	parse_repeated_acch_capability(lchan, &tp);
+	rc = parse_repeated_acch_capability(lchan, &tp);
+	if (rc < 0)
+		return rsl_tx_mode_modif_nack(lchan, -rc);
 	rc = parse_temporary_overpower_acch_capability(lchan, &tp);
 	if (rc < 0)
 		return rsl_tx_mode_modif_nack(lchan, -rc);

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I7993cf7842ffde561f2bdc50f56516c3a188b2bc
Gerrit-Change-Number: 25890
Gerrit-PatchSet: 1
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/20211022/c4cdac03/attachment.htm>