Osmocom Open Build Service

osmo-bsc.spec Changed

commit_9f7611a32f558fe70f4aa30c222b865dadda36ad.txt Deleted

commit_f2768d39c107be7c2d8ca60079394566bc007a8b.txt Added

osmo-bsc_1.10.0.96.9f761.dsc -> osmo-bsc_1.10.0.98.f276.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-bsc
 Binary: osmo-bsc, osmo-bsc-dbg, abisip-find, osmo-bsc-ipaccess-utils, osmo-bsc-bs11-utils, osmo-bsc-meas-utils, osmo-bsc-doc
 Architecture: any all
-Version: 1.10.0.96.9f761
+Version: 1.10.0.98.f276
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmo-bsc
 Standards-Version: 3.9.8
@@ -18,8 +18,8 @@
  osmo-bsc-ipaccess-utils deb net extra arch=any
  osmo-bsc-meas-utils deb net extra arch=any
 Checksums-Sha1:
- 8103ccd225bd00005a5e8202a90e9a959ce76a9e 595700 osmo-bsc_1.10.0.96.9f761.tar.xz
+ 0fa98afdfcb04898e2a98b97ef327d3ae8cc0c67 595776 osmo-bsc_1.10.0.98.f276.tar.xz
 Checksums-Sha256:
- f141dfe294e2d1710c42dcec2afb02b8bf62f3238d5d84f597ef0e4913ac060d 595700 osmo-bsc_1.10.0.96.9f761.tar.xz
+ 11b217c3b21742ad30684c02207a17d3690bb4411ec8de85466e7b1bd9ef1f77 595776 osmo-bsc_1.10.0.98.f276.tar.xz
 Files:
- 268c712b6b78abf7f5a783c6b90d79c6 595700 osmo-bsc_1.10.0.96.9f761.tar.xz
+ 4d725ef9a90dc438fe12380bb2f2720a 595776 osmo-bsc_1.10.0.98.f276.tar.xz

osmo-bsc_1.10.0.96.9f761.tar.xz/.tarball-version -> osmo-bsc_1.10.0.98.f276.tar.xz/.tarball-version Changed

osmo-bsc_1.10.0.96.9f761.tar.xz/debian/changelog -> osmo-bsc_1.10.0.98.f276.tar.xz/debian/changelog Changed

osmo-bsc_1.10.0.96.9f761.tar.xz/src/osmo-bsc/bsc_vty.c -> osmo-bsc_1.10.0.98.f276.tar.xz/src/osmo-bsc/bsc_vty.c Changed

@@ -2712,6 +2712,7 @@
 {
 	struct bsc_msc_data *data = bsc_msc_data(vty);
 	struct gsm_audio_support tmpARRAY_SIZE(data->audio_support);
+	const char *arg = NULL;
 	int i;
 
 	/* Nr of arguments must fit in the array */
@@ -2724,35 +2725,28 @@
 	/* check all given arguments first */
 	for (i = 0; i < argc; i++) {
 		int j;
+		int ver;
+		arg = argvi;
 
-		/* check for hrX or frX */
-		if (strlen(argvi) != 3
-				|| argvi1 != 'r'
-				|| (argvi0 != 'h' && argvi0 != 'f')
-				|| argvi2 < '0'
-				|| argvi2 > '9') {
-			vty_out(vty, "Codec name must be hrX or frX. Was '%s'%s", argvi, VTY_NEWLINE);
-			return CMD_WARNING;
-		}
-
-		/* store in tmp first, to not overwrite data->audio_support in case of error */
-		tmpi.ver = atoi(argvi + 2);
-		if (strncmp("hr", argvi, 2) == 0)
+		if (strncmp("hr", arg, 2) == 0)
 			tmpi.hr = 1;
-		else if (strncmp("fr", argvi, 2) == 0)
+		else if (strncmp("fr", arg, 2) == 0)
 			tmpi.hr = 0;
+		else
+			goto invalid_arg;
 
-		/* forbid invalid versions */
-		if (tmpi.ver < 1 || tmpi.ver > 7
-		    || (tmpi.hr && tmpi.ver == 2)) {
-			vty_out(vty, "'%s' is not a valid codec version%s", argvi, VTY_NEWLINE);
-			return CMD_WARNING;
-		}
+		ver = atoi(arg + 2);
+		if (ver < 1 || ver > 7)
+			goto invalid_arg;
+		tmpi.ver = ver;
+
+		if (tmpi.hr == 1 && ver == 2)
+			goto invalid_arg;
 
 		/* prevent duplicate entries */
 		for (j = 0; j < i; j++) {
 			if (gsm_audio_support_cmp(&tmpj, &tmpi) == 0) {
-				vty_out(vty, "duplicate entry in 'msc' / 'codec-support': %s%s", argvi, VTY_NEWLINE);
+				vty_out(vty, "duplicate entry in 'msc' / 'codec-list': %s%s", argvi, VTY_NEWLINE);
 				return CMD_WARNING;
 			}
 		}
@@ -2762,6 +2756,10 @@
 	data->audio_length = argc;
 
 	return CMD_SUCCESS;
+
+invalid_arg:
+	vty_out(vty, "%s is not a valid codec version%s", osmo_quote_cstr_c(OTC_SELECT, arg, -1), VTY_NEWLINE);
+	return CMD_WARNING;
 }
 
 #define LEGACY_STR "This command has no effect, it is kept to support legacy config files\n"

osmo-bsc_1.10.0.96.9f761.tar.xz/tests/msc.vty -> osmo-bsc_1.10.0.98.f276.tar.xz/tests/msc.vty Changed

@@ -33,16 +33,16 @@
 ...
 
 OsmoBSC(config-msc)# codec-list foo
-Codec name must be hrX or frX. Was 'foo'
+"foo" is not a valid codec version
 
 OsmoBSC(config-msc)# codec-list fr10
-Codec name must be hrX or frX. Was 'fr10'
+"fr10" is not a valid codec version
 
 OsmoBSC(config-msc)# codec-list hr10
-Codec name must be hrX or frX. Was 'hr10'
+"hr10" is not a valid codec version
 
 OsmoBSC(config-msc)# codec-list FR1
-Codec name must be hrX or frX. Was 'FR1'
+"FR1" is not a valid codec version
 
 OsmoBSC(config-msc)# # Ensure the codec-list with wrong args did not change the config
 OsmoBSC(config-msc)# show running-config
@@ -53,7 +53,7 @@
 ...
 
 OsmoBSC(config-msc)# codec-list fr1 fr1
-duplicate entry in 'msc' / 'codec-support': fr1
+duplicate entry in 'msc' / 'codec-list': fr1
 OsmoBSC(config-msc)# show running-config
 ...
 msc 0
@@ -62,7 +62,7 @@
 ...
 
 OsmoBSC(config-msc)# codec-list fr0 fr1
-'fr0' is not a valid codec version
+"fr0" is not a valid codec version
 OsmoBSC(config-msc)# show running-config
 ...
 msc 0
@@ -71,7 +71,7 @@
 ...
 
 OsmoBSC(config-msc)# codec-list hr0 hr1
-'hr0' is not a valid codec version
+"hr0" is not a valid codec version
 OsmoBSC(config-msc)# show running-config
 ...
 msc 0
@@ -80,7 +80,7 @@
 ...
 
 OsmoBSC(config-msc)# codec-list fr8 fr9
-'fr8' is not a valid codec version
+"fr8" is not a valid codec version
 OsmoBSC(config-msc)# show running-config
 ...
 msc 0
@@ -89,7 +89,7 @@
 ...
 
 OsmoBSC(config-msc)# codec-list hr8 hr9
-'hr8' is not a valid codec version
+"hr8" is not a valid codec version
 OsmoBSC(config-msc)# show running-config
 ...
 msc 0
@@ -98,7 +98,7 @@
 ...
 
 OsmoBSC(config-msc)# codec-list fr2 hr2
-'hr2' is not a valid codec version
+"hr2" is not a valid codec version
 OsmoBSC(config-msc)# show running-config
 ...
 msc 0

Changes of Revision 108