[PATCH] osmo-bts[master]: rsl: If CHAN ACT or MODE MODIF fails, send respective NACK

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Wed May 9 18:11:32 UTC 2018


Review at  https://gerrit.osmocom.org/8092

rsl: If CHAN ACT or MODE MODIF fails, send respective NACK

The existign code only sent an ERROR REPORT, but it failed to actually
send a proper NACK to the related request.  This is confusing, as the
operation should always be ACKed or NACKed, and not simply result in no
response.

Change-Id: Ic374a8e5e239ffe37082a54cdb94cb6ac9723e83
Closes: OS#3254
---
M src/common/rsl.c
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/92/8092/1

diff --git a/src/common/rsl.c b/src/common/rsl.c
index 23778b7..6fc3ac8 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -961,8 +961,8 @@
 		const uint8_t *val = TLVP_VAL(&tp, RSL_IE_ENCR_INFO);
 
 		if (encr_info2lchan(lchan, val, len) < 0) {
-			 return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT,
-						    &dch->chan_nr, NULL, msg);
+			rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, NULL, msg);
+			return rsl_tx_chan_act_acknack(lchan, RSL_ERR_ENCR_UNIMPL);
 		}
 	} else
 		memset(&lchan->encr, 0, sizeof(lchan->encr));
@@ -1387,8 +1387,8 @@
 		const uint8_t *val = TLVP_VAL(&tp, RSL_IE_ENCR_INFO);
 
 		if (encr_info2lchan(lchan, val, len) < 0) {
-			 return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr,
-					 	    NULL, msg);
+			rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, NULL, msg);
+			return rsl_tx_mode_modif_nack(lchan, RSL_ERR_ENCR_UNIMPL);
 		}
 	}
 

-- 
To view, visit https://gerrit.osmocom.org/8092
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic374a8e5e239ffe37082a54cdb94cb6ac9723e83
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>



More information about the gerrit-log mailing list