aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/libmsc/msc_vty.c18
-rw-r--r--tests/test_nodes.vty4
2 files changed, 16 insertions, 6 deletions
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index aaefb0b7b..d9e57a73b 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -335,16 +335,25 @@ DEFUN(cfg_msc, cfg_msc_cmd,
return CMD_SUCCESS;
}
+#define MNCC_STR "Configure Mobile Network Call Control\n"
+#define MNCC_GUARD_TIMEOUT_STR "Set global guard timer for mncc interface activity\n"
+#define MNCC_GUARD_TIMEOUT_VALUE_STR "guard timer value (sec.)\n"
+
DEFUN(cfg_msc_mncc_guard_timeout,
cfg_msc_mncc_guard_timeout_cmd,
- "mncc-guard-timeout <0-255>",
- "Set global guard timer for mncc interface activity\n"
- "guard timer value (sec.)")
+ "mncc guard-timeout <0-255>",
+ MNCC_STR
+ MNCC_GUARD_TIMEOUT_STR MNCC_GUARD_TIMEOUT_VALUE_STR)
{
gsmnet->mncc_guard_timeout = atoi(argv[0]);
return CMD_SUCCESS;
}
+ALIAS_DEPRECATED(cfg_msc_mncc_guard_timeout,
+ cfg_msc_deprecated_mncc_guard_timeout_cmd,
+ "mncc-guard-timeout <0-255>",
+ MNCC_GUARD_TIMEOUT_STR MNCC_GUARD_TIMEOUT_VALUE_STR);
+
DEFUN(cfg_msc_assign_tmsi, cfg_msc_assign_tmsi_cmd,
"assign-tmsi",
"Assign TMSI during Location Updating.\n")
@@ -433,7 +442,7 @@ DEFUN(cfg_msc_emergency_msisdn, cfg_msc_emergency_msisdn_cmd,
static int config_write_msc(struct vty *vty)
{
vty_out(vty, "msc%s", VTY_NEWLINE);
- vty_out(vty, " mncc-guard-timeout %i%s",
+ vty_out(vty, " mncc guard-timeout %i%s",
gsmnet->mncc_guard_timeout, VTY_NEWLINE);
vty_out(vty, " %sassign-tmsi%s",
gsmnet->vlr->cfg.assign_tmsi? "" : "no ", VTY_NEWLINE);
@@ -1443,6 +1452,7 @@ void msc_vty_init(struct gsm_network *msc_network)
install_node(&msc_node, config_write_msc);
install_element(MSC_NODE, &cfg_msc_assign_tmsi_cmd);
install_element(MSC_NODE, &cfg_msc_mncc_guard_timeout_cmd);
+ install_element(MSC_NODE, &cfg_msc_deprecated_mncc_guard_timeout_cmd);
install_element(MSC_NODE, &cfg_msc_no_assign_tmsi_cmd);
install_element(MSC_NODE, &cfg_msc_auth_tuple_max_reuse_count_cmd);
install_element(MSC_NODE, &cfg_msc_auth_tuple_reuse_on_error_cmd);
diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty
index 61470c47e..6a55e1be5 100644
--- a/tests/test_nodes.vty
+++ b/tests/test_nodes.vty
@@ -30,7 +30,7 @@ OsmoMSC(config)# msc
OsmoMSC(config-msc)# list
...
assign-tmsi
- mncc-guard-timeout <0-255>
+ mncc guard-timeout <0-255>
no assign-tmsi
auth-tuple-max-reuse-count <-1-2147483647>
auth-tuple-reuse-on-error (0|1)
@@ -96,7 +96,7 @@ network
mm info 1
periodic location update 30
msc
- mncc-guard-timeout 180
+ mncc guard-timeout 180
assign-tmsi
cs7-instance-a 0
cs7-instance-iu 0