diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-12-05 01:07:03 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-12-05 19:35:11 +0000 |
| commit | 05c5680ba16c9a393595e03249a0c5bf4bec0033 (patch) | |
| tree | 513c31f63facbdd7aadfbaab999c06b78b9b8f4c | |
| parent | fb153cbf8cb5e81e851f8dca5a0e466ab6c76cde (diff) | |
vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout'
I want to add 'mncc internal' and 'mncc external' commands, and IMHO makes most
sense to have a common 'mncc' keyword to start MNCC config commands with. To
put it in terms of VTY online help:
OsmoMSC(config-msc)# mncc ?
internal Use internal MNCC handler
external Use internal MNCC handler
guard-timeout Set global guard timeout
So far only the 'guard-timeout' exists, I want to add 'internal' and 'external'
in a subsequent commit.
Keep the old command 'mncc-guard-timeout' as deprecated alias. That means it
still works from old config files, but online documentation will omit it.
On 'write', write back the new format instead.
Rationale: see I2ec59d5eba407f83295528b51b93678d446b9cee
Change-Id: I52d69af48e1ddc87b3fb54bf66a01b1b8cbf5abe
| -rw-r--r-- | src/libmsc/msc_vty.c | 18 | ||||
| -rw-r--r-- | tests/test_nodes.vty | 4 |
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 e03ed0093..9fa9d2a22 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) @@ -82,7 +82,7 @@ network mm info 1 periodic location update 30 msc - mncc-guard-timeout 180 + mncc guard-timeout 180 assign-tmsi cs7-instance-a 0 ... |