<p>daniel <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21028">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
lynxis lazus: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Let libosmocore handle VTY parent node tracking<br><br>* is_config_node is deprecated, so don't set it<br>* go_parent_cb is only used if we want to do special stuff upon exiting<br> a node, in osmo-sgsn and gtphub only osmo_ss7_vty_go_parent() needs to<br> be called<br><br>Change-Id: I2008dd9026922d29ee703c59e70d3fecced0ee18<br>---<br>M src/gbproxy/gb_proxy_main.c<br>M src/gtphub/gtphub_main.c<br>M src/sgsn/sgsn_main.c<br>3 files changed, 4 insertions(+), 94 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gbproxy/gb_proxy_main.c b/src/gbproxy/gb_proxy_main.c</span><br><span>index f8c5ade..63e5f49 100644</span><br><span>--- a/src/gbproxy/gb_proxy_main.c</span><br><span>+++ b/src/gbproxy/gb_proxy_main.c</span><br><span>@@ -183,39 +183,9 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int gbproxy_vty_is_config_node(struct vty *vty, int node)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- switch (node) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* add items that are not config */</span><br><span style="color: hsl(0, 100%, 40%);">- case CONFIG_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int gbproxy_vty_go_parent(struct vty *vty)</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 GBPROXY_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- if (gbproxy_vty_is_config_node(vty, vty->node))</span><br><span style="color: hsl(0, 100%, 40%);">- vty->node = CONFIG_NODE;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- vty->node = ENABLE_NODE;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- vty->index = NULL;</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%);">- return vty->node;</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 = "OsmoGbProxy",</span><br><span> .version = PACKAGE_VERSION,</span><br><span style="color: hsl(0, 100%, 40%);">- .go_parent_cb = gbproxy_vty_go_parent,</span><br><span style="color: hsl(0, 100%, 40%);">- .is_config_node = gbproxy_vty_is_config_node,</span><br><span> };</span><br><span> </span><br><span> /* default categories */</span><br><span>diff --git a/src/gtphub/gtphub_main.c b/src/gtphub/gtphub_main.c</span><br><span>index 664c801..665224a 100644</span><br><span>--- a/src/gtphub/gtphub_main.c</span><br><span>+++ b/src/gtphub/gtphub_main.c</span><br><span>@@ -118,44 +118,12 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if BUILD_IU</span><br><span style="color: hsl(0, 100%, 40%);">-int gtphub_vty_go_parent(struct vty *vty)</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%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_ss7_vty_go_parent(vty);</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%);">- return vty->node;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int gtphub_vty_is_config_node(struct vty *vty, int node)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- /* Check if libosmo-sccp declares the node in</span><br><span style="color: hsl(0, 100%, 40%);">- * question as config node */</span><br><span style="color: hsl(0, 100%, 40%);">-#if BUILD_IU</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_ss7_is_config_node(vty, node))</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (node) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* add items that are not config */</span><br><span style="color: hsl(0, 100%, 40%);">- case CONFIG_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</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%);">-</span><br><span> static struct vty_app_info vty_info = {</span><br><span> .name = "OsmoGTPhub",</span><br><span> .version = PACKAGE_VERSION,</span><br><span> #if BUILD_IU</span><br><span style="color: hsl(0, 100%, 40%);">- .go_parent_cb = gtphub_vty_go_parent,</span><br><span style="color: hsl(120, 100%, 40%);">+ .go_parent_cb = osmo_ss7_vty_go_parent,</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">- .is_config_node = gtphub_vty_is_config_node,</span><br><span> };</span><br><span> </span><br><span> struct cmdline_cfg {</span><br><span>diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c</span><br><span>index 3044f95..1eccad8 100644</span><br><span>--- a/src/sgsn/sgsn_main.c</span><br><span>+++ b/src/sgsn/sgsn_main.c</span><br><span>@@ -172,35 +172,6 @@</span><br><span> /* NSI that BSSGP uses when transmitting on NS */</span><br><span> extern struct gprs_ns_inst *bssgp_nsi;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int sgsn_vty_is_config_node(struct vty *vty, int node)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- /* So far the SGSN has no nested nodes that need parent node</span><br><span style="color: hsl(0, 100%, 40%);">- * declaration, except for the ss7 vty nodes. */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (node) {</span><br><span style="color: hsl(0, 100%, 40%);">- case SGSN_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">-#if BUILD_IU</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_ss7_is_config_node(vty, node);</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int sgsn_vty_go_parent(struct vty *vty)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- /* So far the SGSN has no nested nodes that need parent node</span><br><span style="color: hsl(0, 100%, 40%);">- * declaration, except for the ss7 vty nodes. */</span><br><span style="color: hsl(0, 100%, 40%);">-#if BUILD_IU</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_ss7_vty_go_parent(vty);</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">- vty->node = CONFIG_NODE;</span><br><span style="color: hsl(0, 100%, 40%);">- vty->index = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void bvc_reset_persistent_nsvcs(void)</span><br><span> {</span><br><span> /* Send BVC-RESET on all persistent NSVCs */</span><br><span>@@ -221,8 +192,9 @@</span><br><span> static struct vty_app_info vty_info = {</span><br><span> .name = "OsmoSGSN",</span><br><span> .version = PACKAGE_VERSION,</span><br><span style="color: hsl(0, 100%, 40%);">- .go_parent_cb = sgsn_vty_go_parent,</span><br><span style="color: hsl(0, 100%, 40%);">- .is_config_node = sgsn_vty_is_config_node,</span><br><span style="color: hsl(120, 100%, 40%);">+#if BUILD_IU</span><br><span style="color: hsl(120, 100%, 40%);">+ .go_parent_cb = osmo_ss7_vty_go_parent,</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> };</span><br><span> </span><br><span> static void print_help(void)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21028">change 21028</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/c/osmo-sgsn/+/21028"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2008dd9026922d29ee703c59e70d3fecced0ee18 </div>
<div style="display:none"> Gerrit-Change-Number: 21028 </div>
<div style="display:none"> Gerrit-PatchSet: 8 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>