<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/4605">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Pau Espin Pedrol: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: skip installing cmds now always installed by default<br><br>Depends: I5021c64a787b63314e0f2f1cba0b8fc7bff4f09b<br>Change-Id: I0fc8142756040c98c1862ddb18a77a032f2a7143<br>---<br>M src/mgcp/mgcp_vty.c<br>M src/vty_interface.c<br>2 files changed, 0 insertions(+), 31 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mgcp/mgcp_vty.c b/src/mgcp/mgcp_vty.c</span><br><span>index dfcc6fe..85c70c5 100644</span><br><span>--- a/src/mgcp/mgcp_vty.c</span><br><span>+++ b/src/mgcp/mgcp_vty.c</span><br><span>@@ -858,7 +858,6 @@</span><br><span>  install_element(CONFIG_NODE, &cfg_mgcp_cmd);</span><br><span>     install_node(&mgcp_node, config_write_mgcp);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    install_default(MGCP_NODE);</span><br><span>  install_element(MGCP_NODE, &ournode_exit_cmd);</span><br><span>   install_element(MGCP_NODE, &ournode_end_cmd);</span><br><span>    install_element(MGCP_NODE, &cfg_mgcp_local_ip_cmd);</span><br><span>@@ -883,7 +882,6 @@</span><br><span> </span><br><span>    install_element(MGCP_NODE, &cfg_mgcp_vtrunk_cmd);</span><br><span>        install_node(&vtrunk_node, config_write_vtrunk);</span><br><span style="color: hsl(0, 100%, 40%);">-    install_default(VTRUNK_NODE);</span><br><span>        install_element(VTRUNK_NODE, &ournode_exit_cmd);</span><br><span>         install_element(VTRUNK_NODE, &ournode_end_cmd);</span><br><span>  install_element(VTRUNK_NODE, &cfg_vtrunk_number_endp_cmd);</span><br><span>@@ -897,7 +895,6 @@</span><br><span> </span><br><span>     install_element(MGCP_NODE, &cfg_mgcp_trunk_cmd);</span><br><span>         install_node(&trunk_node, config_write_trunk);</span><br><span style="color: hsl(0, 100%, 40%);">-      install_default(TRUNK_NODE);</span><br><span>         install_element(TRUNK_NODE, &ournode_exit_cmd);</span><br><span>  install_element(TRUNK_NODE, &ournode_end_cmd);</span><br><span>   install_element(TRUNK_NODE, &cfg_trunk_payload_number_cmd);</span><br><span>diff --git a/src/vty_interface.c b/src/vty_interface.c</span><br><span>index 3a654c0..ab90897 100644</span><br><span>--- a/src/vty_interface.c</span><br><span>+++ b/src/vty_interface.c</span><br><span>@@ -77,31 +77,6 @@</span><br><span>        return vty->node;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(node_exit, node_exit_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">-      "exit", "Exit the current node\n")</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-       ss7_go_parent(vty);</span><br><span style="color: hsl(0, 100%, 40%);">-     return CMD_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(node_end, node_end_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">-      "end", "End the current mode and change to the enable node\n")</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-      switch (vty->node) {</span><br><span style="color: hsl(0, 100%, 40%);">- case VIEW_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- case ENABLE_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">-               break;</span><br><span style="color: hsl(0, 100%, 40%);">-  default:</span><br><span style="color: hsl(0, 100%, 40%);">-                vty_config_unlock(vty);</span><br><span style="color: hsl(0, 100%, 40%);">-         vty->node = ENABLE_NODE;</span><br><span style="color: hsl(0, 100%, 40%);">-             vty->index = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-           vty->index_sub = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-               break;</span><br><span style="color: hsl(0, 100%, 40%);">-  }</span><br><span style="color: hsl(0, 100%, 40%);">-       return CMD_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static struct vty_app_info vty_info = {</span><br><span>      .name           = "OsmoSTP",</span><br><span>       .version        = VERSION,</span><br><span>@@ -1316,9 +1291,6 @@</span><br><span> </span><br><span> static void install_defaults(int node)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   install_default(node);</span><br><span style="color: hsl(0, 100%, 40%);">-  install_element(node, &node_exit_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">-      install_element(node, &node_end_cmd);</span><br><span>    install_element(node, &cfg_description_cmd);</span><br><span>     install_element(node, &cfg_no_description_cmd);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/4605">change 4605</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/4605"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: cellmgr-ng </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I0fc8142756040c98c1862ddb18a77a032f2a7143 </div>
<div style="display:none"> Gerrit-Change-Number: 4605 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>