neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/31611 )
(
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: vty: msc / codec-list: forbid invalid codec versions
......................................................................
vty: msc / codec-list: forbid invalid codec versions
Change-Id: I421c306aa22dfdad0f30c6ba8b482e1eff188a8e
---
M src/osmo-bsc/bsc_vty.c
M tests/msc.vty
2 files changed, 26 insertions(+), 10 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index a860770..20d57db 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -2742,6 +2742,13 @@
else if (strncmp("fr", argv[i], 2) == 0)
tmp[i].hr = 0;
+ /* forbid invalid versions */
+ if (tmp[i].ver < 1 || tmp[i].ver > 7
+ || (tmp[i].hr && tmp[i].ver == 2)) {
+ vty_out(vty, "'%s' is not a valid codec version%s",
argv[i], VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
/* prevent duplicate entries */
for (j = 0; j < i; j++) {
if (gsm_audio_support_cmp(&tmp[j], &tmp[i]) == 0) {
diff --git a/tests/msc.vty b/tests/msc.vty
index 8cbcb83..74eca2a 100644
--- a/tests/msc.vty
+++ b/tests/msc.vty
@@ -62,49 +62,49 @@
...
OsmoBSC(config-msc)# codec-list fr0 fr1
+'fr0' is not a valid codec version
OsmoBSC(config-msc)# show running-config
...
msc 0
...
- codec-list fr0 fr1
+ codec-list hr1 hr3 fr1 fr2 fr3
...
-OsmoBSC(config-msc)# # ERROR: fr0 should be rejected
OsmoBSC(config-msc)# codec-list hr0 hr1
+'hr0' is not a valid codec version
OsmoBSC(config-msc)# show running-config
...
msc 0
...
- codec-list hr0 hr1
+ codec-list hr1 hr3 fr1 fr2 fr3
...
-OsmoBSC(config-msc)# # ERROR: hr0 should be rejected
OsmoBSC(config-msc)# codec-list fr8 fr9
+'fr8' is not a valid codec version
OsmoBSC(config-msc)# show running-config
...
msc 0
...
- codec-list fr8 fr9
+ codec-list hr1 hr3 fr1 fr2 fr3
...
-OsmoBSC(config-msc)# # ERROR: fr8 and fr9 should be rejected
OsmoBSC(config-msc)# codec-list hr8 hr9
+'hr8' is not a valid codec version
OsmoBSC(config-msc)# show running-config
...
msc 0
...
- codec-list hr8 hr9
+ codec-list hr1 hr3 fr1 fr2 fr3
...
-OsmoBSC(config-msc)# # ERROR: hr8 and hr9 should be rejected
OsmoBSC(config-msc)# codec-list fr2 hr2
+'hr2' is not a valid codec version
OsmoBSC(config-msc)# show running-config
...
msc 0
...
- codec-list fr2 hr2
+ codec-list hr1 hr3 fr1 fr2 fr3
...
-OsmoBSC(config-msc)# # TODO: should hr2 be rejected
OsmoBSC(config-msc)# codec-list fr1 fr2 fr3 fr4
OsmoBSC(config-msc)# show running-config
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31611
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I421c306aa22dfdad0f30c6ba8b482e1eff188a8e
Gerrit-Change-Number: 31611
Gerrit-PatchSet: 4
Gerrit-Owner: neels <nhofm...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: neels <nhofm...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
