[PATCH] osmo-bsc[master]: vty: Permit codec-list containing both full-rate and half-ra...

Harald Welte gerrit-no-reply at lists.osmocom.org
Tue Feb 13 23:50:43 UTC 2018


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

vty: Permit codec-list containing both full-rate and half-rate codecs

Once upon a time, in the old osmo-bsc-sccplite, there was a restriction
of not being able to handle configurations with both TCH/F and TCH/H
type codecs.  This time is long gone, so let's remove this constraint.

Change-Id: Iba0822f57c41cedeeb7f069be540f3a851752a23
Closes: OS#2763
---
M src/osmo-bsc/osmo_bsc_vty.c
1 file changed, 2 insertions(+), 14 deletions(-)


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

diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c
index fb8b275..e173b4a 100644
--- a/src/osmo-bsc/osmo_bsc_vty.c
+++ b/src/osmo-bsc/osmo_bsc_vty.c
@@ -289,10 +289,7 @@
       "List of audio codecs, e.g. fr3 fr1 hr3\n")
 {
 	struct bsc_msc_data *data = bsc_msc_data(vty);
-	int saw_fr, saw_hr;
 	int i;
-
-	saw_fr = saw_hr = 0;
 
 	/* free the old list... if it exists */
 	if (data->audio_support) {
@@ -319,19 +316,10 @@
 				struct gsm_audio_support);
 		data->audio_support[i]->ver = atoi(argv[i] + 2);
 
-		if (strncmp("hr", argv[i], 2) == 0) {
+		if (strncmp("hr", argv[i], 2) == 0)
 			data->audio_support[i]->hr = 1;
-			saw_hr = 1;
-		} else if (strncmp("fr", argv[i], 2) == 0) {
+		else if (strncmp("fr", argv[i], 2) == 0)
 			data->audio_support[i]->hr = 0;
-			saw_fr = 1;
-		}
-
-		if (saw_hr && saw_fr) {
-			vty_out(vty, "Can not have full-rate and half-rate codec.%s",
-					VTY_NEWLINE);
-			return CMD_ERR_INCOMPLETE;
-		}
 	}
 
 	return CMD_SUCCESS;

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

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


More information about the gerrit-log mailing list