<p>lynxis lazus <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22522">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
daniel: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: correct vty config write<br><br>The vty configuration was wrong when any other node was<br>in between the vty configuration (e.g. gb or ss7).<br>The vty code doesn't have a relation between parent and child node.<br>It wasn't detected because this only happened in the sgsn.<br>The pcu doesn't have any binds defined.<br><br>Change-Id: I8a3d67d41baca36b4d1a951a574cd41e556355c5<br>---<br>M src/gb/gprs_ns2_vty.c<br>1 file changed, 26 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c</span><br><span>index 9db8173..1c40759 100644</span><br><span>--- a/src/gb/gprs_ns2_vty.c</span><br><span>+++ b/src/gb/gprs_ns2_vty.c</span><br><span>@@ -401,20 +401,6 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int config_write_ns(struct vty *vty)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "ns%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(vty_nsi->timeout); i++)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " timer %s %u%s",</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(gprs_ns_timer_strs, i),</span><br><span style="color: hsl(0, 100%, 40%);">- vty_nsi->timeout[i], VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">-</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%);">-</span><br><span> static int config_write_ns_nse(struct vty *vty)</span><br><span> {</span><br><span> struct gprs_ns2_nse *nse;</span><br><span>@@ -440,6 +426,30 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int config_write_ns(struct vty *vty)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ int ret;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "ns%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(vty_nsi->timeout); i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " timer %s %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(gprs_ns_timer_strs, i),</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_nsi->timeout[i], VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = config_write_ns_bind(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret)</span><br><span style="color: hsl(120, 100%, 40%);">+ return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = config_write_ns_nse(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret)</span><br><span style="color: hsl(120, 100%, 40%);">+ return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct cmd_node ns_bind_node = {</span><br><span> L_NS_BIND_NODE,</span><br><span> "%s(config-ns-bind)# ",</span><br><span>@@ -1665,7 +1675,7 @@</span><br><span> install_lib_element(L_NS_NODE, &cfg_ns_bind_cmd);</span><br><span> install_lib_element(L_NS_NODE, &cfg_no_ns_bind_cmd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- install_node(&ns_bind_node, config_write_ns_bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_node(&ns_bind_node, NULL);</span><br><span> install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_listen_cmd);</span><br><span> install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_listen_cmd);</span><br><span> install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_dscp_cmd);</span><br><span>@@ -1676,7 +1686,7 @@</span><br><span> install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_fr_cmd);</span><br><span> /* TODO: accept-ip-sns when SGSN SNS has been implemented */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- install_node(&ns_nse_node, config_write_ns_nse);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_node(&ns_nse_node, NULL);</span><br><span> install_lib_element(L_NS_NSE_NODE, &cfg_ns_nse_nsvc_fr_cmd);</span><br><span> install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_nsvci_cmd);</span><br><span> install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_nsvc_fr_dlci_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22522">change 22522</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/libosmocore/+/22522"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8a3d67d41baca36b4d1a951a574cd41e556355c5 </div>
<div style="display:none"> Gerrit-Change-Number: 22522 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </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: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>