<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23450">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: always use the same method to print NSVCs<br><br>The binds also print a list of associated NSVC when<br>dumping the bind.<br>However the binds using their own representation of<br>printing the NSVC which is different to `show ns entities`.<br>Use the same function to print NS-VC.<br><br>Before:<br> NSVCI 00000: udp)[127.0.0.1]:23000<>[127.0.0.1]:22000<br>After:<br> NSVCI none: UNCONFIGURED DYNAMIC data_weight=1 sig_weight=1 udp)[127.0.0.1]:23000<>[127.0.0.1]:22000<br><br>Change-Id: If31ec6c1c07dc134ab1ddeb915bc89747c7be048<br>---<br>M src/gb/gprs_ns2_fr.c<br>M src/gb/gprs_ns2_internal.h<br>M src/gb/gprs_ns2_udp.c<br>M src/gb/gprs_ns2_vty.c<br>M tests/gb/gprs_ns2_vty.vty<br>5 files changed, 13 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/50/23450/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c</span><br><span>index 6ba2268..84f3784 100644</span><br><span>--- a/src/gb/gprs_ns2_fr.c</span><br><span>+++ b/src/gb/gprs_ns2_fr.c</span><br><span>@@ -135,7 +135,7 @@</span><br><span> nsvc->priv = NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void dump_vty(const struct gprs_ns2_vc_bind *bind, struct vty *vty, bool _stats)</span><br><span style="color: hsl(120, 100%, 40%);">+static void dump_vty(const struct gprs_ns2_vc_bind *bind, struct vty *vty, bool stats)</span><br><span> {</span><br><span> struct priv_bind *priv;</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span>@@ -151,7 +151,7 @@</span><br><span> osmo_fr_role_str(fr_link->role), priv->if_running ? "UP" : "DOWN", VTY_NEWLINE);</span><br><span> </span><br><span> llist_for_each_entry(nsvc, &bind->nsvc, blist) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " NSVCI %05u: %s%s", nsvc->nsvci, gprs_ns2_ll_str(nsvc), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_vty_dump_nsvc(vty, nsvc, stats);</span><br><span> }</span><br><span> </span><br><span> priv = bind->priv;</span><br><span>diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h</span><br><span>index e8fe696..4883efd 100644</span><br><span>--- a/src/gb/gprs_ns2_internal.h</span><br><span>+++ b/src/gb/gprs_ns2_internal.h</span><br><span>@@ -391,6 +391,7 @@</span><br><span> int ns2_vc_is_unblocked(struct gprs_ns2_vc *nsvc);</span><br><span> int ns2_vc_block(struct gprs_ns2_vc *nsvc);</span><br><span> int ns2_vc_unblock(struct gprs_ns2_vc *nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+void ns2_vty_dump_nsvc(struct vty *vty, struct gprs_ns2_vc *nsvc, bool stats);</span><br><span> </span><br><span> /* nse */</span><br><span> void ns2_nse_notify_unblocked(struct gprs_ns2_vc *nsvc, bool unblocked);</span><br><span>diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c</span><br><span>index 5765c77..4c986a2 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -85,7 +85,7 @@</span><br><span> }</span><br><span> </span><br><span> static void dump_vty(const struct gprs_ns2_vc_bind *bind,</span><br><span style="color: hsl(0, 100%, 40%);">- struct vty *vty, bool _stats)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vty *vty, bool stats)</span><br><span> {</span><br><span> struct priv_bind *priv;</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span>@@ -109,7 +109,7 @@</span><br><span> vty_out(vty, " %lu NS-VC: %s", nsvcs, VTY_NEWLINE);</span><br><span> </span><br><span> llist_for_each_entry(nsvc, &bind->nsvc, blist) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " NSVCI %05u: %s%s", nsvc->nsvci, gprs_ns2_ll_str(nsvc), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_vty_dump_nsvc(vty, nsvc, stats);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c</span><br><span>index a769ad1..d29ac6c 100644</span><br><span>--- a/src/gb/gprs_ns2_vty.c</span><br><span>+++ b/src/gb/gprs_ns2_vty.c</span><br><span>@@ -1696,7 +1696,7 @@</span><br><span> }</span><br><span> </span><br><span> /* non-config commands */</span><br><span style="color: hsl(0, 100%, 40%);">-static void dump_nsvc(struct vty *vty, struct gprs_ns2_vc *nsvc, bool stats)</span><br><span style="color: hsl(120, 100%, 40%);">+void ns2_vty_dump_nsvc(struct vty *vty, struct gprs_ns2_vc *nsvc, bool stats)</span><br><span> {</span><br><span> char nsvci_str[32];</span><br><span> </span><br><span>@@ -1728,9 +1728,9 @@</span><br><span> llist_for_each_entry(nsvc, &nse->nsvc, list) {</span><br><span> if (persistent_only) {</span><br><span> if (nsvc->persistent)</span><br><span style="color: hsl(0, 100%, 40%);">- dump_nsvc(vty, nsvc, stats);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_vty_dump_nsvc(vty, nsvc, stats);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- dump_nsvc(vty, nsvc, stats);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_vty_dump_nsvc(vty, nsvc, stats);</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -1840,7 +1840,7 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- dump_nsvc(vty, nsvc, show_stats);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_vty_dump_nsvc(vty, nsvc, show_stats);</span><br><span> }</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span>diff --git a/tests/gb/gprs_ns2_vty.vty b/tests/gb/gprs_ns2_vty.vty</span><br><span>index f0253fc..67838e9 100644</span><br><span>--- a/tests/gb/gprs_ns2_vty.vty</span><br><span>+++ b/tests/gb/gprs_ns2_vty.vty</span><br><span>@@ -43,7 +43,7 @@</span><br><span> UDP bind: 127.0.0.14:42999 DSCP: 0</span><br><span> IP-SNS signalling weight: 1 data weight: 1</span><br><span> 1 NS-VC: </span><br><span style="color: hsl(0, 100%, 40%);">- NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.15]:9496</span><br><span style="color: hsl(120, 100%, 40%);">+ NSVCI none: RECOVERING PERSIST data_weight=1 sig_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496</span><br><span> OsmoNSdummy# configure terminal</span><br><span> OsmoNSdummy(config)# ns</span><br><span> OsmoNSdummy(config-ns)# nse 1234</span><br><span>@@ -58,9 +58,9 @@</span><br><span> UDP bind: 127.0.0.14:42999 DSCP: 0</span><br><span> IP-SNS signalling weight: 1 data weight: 1</span><br><span> 3 NS-VC: </span><br><span style="color: hsl(0, 100%, 40%);">- NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.17]:9496</span><br><span style="color: hsl(0, 100%, 40%);">- NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.16]:9496</span><br><span style="color: hsl(0, 100%, 40%);">- NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.15]:9496</span><br><span style="color: hsl(120, 100%, 40%);">+ NSVCI none: RECOVERING PERSIST data_weight=0 sig_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.17]:9496</span><br><span style="color: hsl(120, 100%, 40%);">+ NSVCI none: RECOVERING PERSIST data_weight=9 sig_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.16]:9496</span><br><span style="color: hsl(120, 100%, 40%);">+ NSVCI none: RECOVERING PERSIST data_weight=1 sig_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496</span><br><span> OsmoNSdummy# configure terminal</span><br><span> OsmoNSdummy(config)# ns</span><br><span> OsmoNSdummy(config-ns)# nse 1234</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23450">change 23450</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/+/23450"/><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: If31ec6c1c07dc134ab1ddeb915bc89747c7be048 </div>
<div style="display:none"> Gerrit-Change-Number: 23450 </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-MessageType: newchange </div>