cellular-infrastructure
/
osmo-gbproxy
mirror of https://gerrit.osmocom.org/osmo-gbproxy
9
0
Fork 0
Code Issues Releases Wiki Activity

vty: Rename 'mgcp-through-msc-ipa' command to 'use-msc-ipa-for-mgcp' 

Currently the 'mgcp' command fails in the 'config-nat' node, because
it get confused with 'mgcp-through-msc-ipa' which is executed
instead because of the prefix based command selection. Thus the
latter command is renamed by this patch to avoid the common prefix.

The workaround in the test suite is removed.
This commit is contained in:
Jacob Erlbeck 2013-09-02 13:17:17 +02:00 committed by Holger Hans Peter Freyther
parent bf8eec7ea2
commit cdf18572bf
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
View File

@ -152,7 +152,7 @@ static int config_write_nat(struct vty *vty)
llist_for_each_entry(pgroup, &_nat->paging_groups, entry)
write_pgroup_lst(vty, pgroup);
if (_nat->mgcp_ipa)
vty_out(vty, " mgcp-through-msc-ipa%s", VTY_NEWLINE);
vty_out(vty, " use-msc-ipa-for-mgcp%s", VTY_NEWLINE);
return CMD_SUCCESS;
}
@ -754,9 +754,9 @@ DEFUN(cfg_nat_ussd_local,
return CMD_SUCCESS;
}
DEFUN(cfg_nat_mgcp_ipa,
cfg_nat_mgcp_ipa_cmd,
"mgcp-through-msc-ipa",
DEFUN(cfg_nat_use_ipa_for_mgcp,
cfg_nat_use_ipa_for_mgcp_cmd,
"use-msc-ipa-for-mgcp",
"This needs to be set at start. Handle MGCP messages through "
"the IPA protocol and not through the UDP socket.\n")
{
@ -1209,7 +1209,7 @@ int bsc_nat_vty_init(struct bsc_nat *nat)
install_element(NAT_NODE, &cfg_nat_ussd_query_cmd);
install_element(NAT_NODE, &cfg_nat_ussd_token_cmd);
install_element(NAT_NODE, &cfg_nat_ussd_local_cmd);
install_element(NAT_NODE, &cfg_nat_mgcp_ipa_cmd);
install_element(NAT_NODE, &cfg_nat_use_ipa_for_mgcp_cmd);
/* access-list */
install_element(NAT_NODE, &cfg_lst_imsi_allow_cmd);

8
openbsc/tests/vty_test_runner.py
View File

@ -264,13 +264,13 @@ class TestVTYNAT(TestVTYGenericBSC):
self.vty.command('mgcp')
self.vty.command('nat')
self.assertEquals(self.vty.node(), 'config-nat')
self.vty.command('line vty')
self.assertEquals(self.vty.node(), 'config-line')
self.vty.command('mgcp')
self.assertEquals(self.vty.node(), 'config-mgcp')
self.vty.command('nat')
self.assertEquals(self.vty.node(), 'config-nat')
self.vty.command('bsc 0')
self.vty.command('line vty')
self.assertEquals(self.vty.node(), 'config-line')
self.vty.command('mgcp')
self.assertEquals(self.vty.node(), 'config-mgcp')
def testRewriteNoRewrite(self):
self.vty.enable()