<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12130">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout'<br><br>I want to add 'mncc internal' and 'mncc external' commands, and IMHO makes most<br>sense to have a common 'mncc' keyword to start MNCC config commands with. To<br>put it in terms of VTY online help:<br><br> OsmoMSC(config-msc)# mncc ?<br> internal Use internal MNCC handler<br> external Use internal MNCC handler<br> guard-timeout Set global guard timeout<br><br>So far only the 'guard-timeout' exists, I want to add 'internal' and 'external'<br>in a subsequent commit.<br><br>Keep the old command 'mncc-guard-timeout' as deprecated alias. That means it<br>still works from old config files, but online documentation will omit it.<br><br>On 'write', write back the new format instead.<br><br>Rationale: see I2ec59d5eba407f83295528b51b93678d446b9cee<br><br>Change-Id: I52d69af48e1ddc87b3fb54bf66a01b1b8cbf5abe<br>---<br>M src/libmsc/msc_vty.c<br>M tests/test_nodes.vty<br>2 files changed, 16 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/30/12130/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c</span><br><span>index aaefb0b..d9e57a7 100644</span><br><span>--- a/src/libmsc/msc_vty.c</span><br><span>+++ b/src/libmsc/msc_vty.c</span><br><span>@@ -335,16 +335,25 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define MNCC_STR "Configure Mobile Network Call Control\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define MNCC_GUARD_TIMEOUT_STR "Set global guard timer for mncc interface activity\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define MNCC_GUARD_TIMEOUT_VALUE_STR "guard timer value (sec.)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(cfg_msc_mncc_guard_timeout,</span><br><span> cfg_msc_mncc_guard_timeout_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "mncc-guard-timeout <0-255>",</span><br><span style="color: hsl(0, 100%, 40%);">- "Set global guard timer for mncc interface activity\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "guard timer value (sec.)")</span><br><span style="color: hsl(120, 100%, 40%);">+ "mncc guard-timeout <0-255>",</span><br><span style="color: hsl(120, 100%, 40%);">+ MNCC_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ MNCC_GUARD_TIMEOUT_STR MNCC_GUARD_TIMEOUT_VALUE_STR)</span><br><span> {</span><br><span> gsmnet->mncc_guard_timeout = atoi(argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ALIAS_DEPRECATED(cfg_msc_mncc_guard_timeout,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_msc_deprecated_mncc_guard_timeout_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "mncc-guard-timeout <0-255>",</span><br><span style="color: hsl(120, 100%, 40%);">+ MNCC_GUARD_TIMEOUT_STR MNCC_GUARD_TIMEOUT_VALUE_STR);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(cfg_msc_assign_tmsi, cfg_msc_assign_tmsi_cmd,</span><br><span> "assign-tmsi",</span><br><span> "Assign TMSI during Location Updating.\n")</span><br><span>@@ -433,7 +442,7 @@</span><br><span> static int config_write_msc(struct vty *vty)</span><br><span> {</span><br><span> vty_out(vty, "msc%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " mncc-guard-timeout %i%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " mncc guard-timeout %i%s",</span><br><span> gsmnet->mncc_guard_timeout, VTY_NEWLINE);</span><br><span> vty_out(vty, " %sassign-tmsi%s",</span><br><span> gsmnet->vlr->cfg.assign_tmsi? "" : "no ", VTY_NEWLINE);</span><br><span>@@ -1443,6 +1452,7 @@</span><br><span> install_node(&msc_node, config_write_msc);</span><br><span> install_element(MSC_NODE, &cfg_msc_assign_tmsi_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_mncc_guard_timeout_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSC_NODE, &cfg_msc_deprecated_mncc_guard_timeout_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_no_assign_tmsi_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_auth_tuple_max_reuse_count_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_auth_tuple_reuse_on_error_cmd);</span><br><span>diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty</span><br><span>index 61470c4..6a55e1b 100644</span><br><span>--- a/tests/test_nodes.vty</span><br><span>+++ b/tests/test_nodes.vty</span><br><span>@@ -30,7 +30,7 @@</span><br><span> OsmoMSC(config-msc)# list</span><br><span> ...</span><br><span> assign-tmsi</span><br><span style="color: hsl(0, 100%, 40%);">- mncc-guard-timeout <0-255></span><br><span style="color: hsl(120, 100%, 40%);">+ mncc guard-timeout <0-255></span><br><span> no assign-tmsi</span><br><span> auth-tuple-max-reuse-count <-1-2147483647></span><br><span> auth-tuple-reuse-on-error (0|1)</span><br><span>@@ -96,7 +96,7 @@</span><br><span> mm info 1</span><br><span> periodic location update 30</span><br><span> msc</span><br><span style="color: hsl(0, 100%, 40%);">- mncc-guard-timeout 180</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc guard-timeout 180</span><br><span> assign-tmsi</span><br><span> cs7-instance-a 0</span><br><span> cs7-instance-iu 0</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12130">change 12130</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12130"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I52d69af48e1ddc87b3fb54bf66a01b1b8cbf5abe </div>
<div style="display:none"> Gerrit-Change-Number: 12130 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>