<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23546">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: Dump frame relay state to VTY during "show ns"<br><br>When doing a "show ns", let's also dump the state of the frame<br>relay network, with all its links and DLCs (if any).<br><br>Change-Id: I798af3e97dc014b6e0fcde86560a1809852f7510<br>Related: OS#4877<br>---<br>M include/osmocom/gprs/frame_relay.h<br>M src/gb/frame_relay.c<br>M src/gb/gprs_ns2_vty.c<br>3 files changed, 39 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/23546/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gprs/frame_relay.h b/include/osmocom/gprs/frame_relay.h</span><br><span>index 8ab9790..81b42a6 100644</span><br><span>--- a/include/osmocom/gprs/frame_relay.h</span><br><span>+++ b/include/osmocom/gprs/frame_relay.h</span><br><span>@@ -33,6 +33,7 @@</span><br><span> </span><br><span> struct osmo_tdef;</span><br><span> struct msgb;</span><br><span style="color: hsl(120, 100%, 40%);">+struct vty;</span><br><span> </span><br><span> enum osmo_fr_role {</span><br><span> FR_ROLE_USER_EQUIPMENT,</span><br><span>@@ -132,6 +133,7 @@</span><br><span> /* allocate a frame relay network */</span><br><span> struct osmo_fr_network *osmo_fr_network_alloc(void *ctx);</span><br><span> void osmo_fr_network_free(struct osmo_fr_network *net);</span><br><span style="color: hsl(120, 100%, 40%);">+void osmo_fr_network_dump_vty(struct vty *vty, const struct osmo_fr_network *net);</span><br><span> </span><br><span> /* allocate a frame relay link in a given network */</span><br><span> struct osmo_fr_link *osmo_fr_link_alloc(struct osmo_fr_network *net, enum osmo_fr_role role, const char *name);</span><br><span>diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c</span><br><span>index 84cd17f..4d1df67 100644</span><br><span>--- a/src/gb/frame_relay.c</span><br><span>+++ b/src/gb/frame_relay.c</span><br><span>@@ -1014,3 +1014,38 @@</span><br><span> }</span><br><span> return NULL;</span><br><span> }</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%);">+#include <osmocom/vty/vty.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/vty/tdef_vty.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void fr_dlc_dump_vty(struct vty *vty, const struct osmo_fr_dlc *dlc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " FR DLC %05u: %s%s%s%s", dlc->dlci,</span><br><span style="color: hsl(120, 100%, 40%);">+ dlc->active ? "ACTIVE" : "INACTIVE",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlc->add ? " ADDED" : "", dlc->del ? " DELETED" : "", VTY_NEWLINE);</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%);">+static void fr_link_dump_vty(struct vty *vty, const struct osmo_fr_link *link)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_fr_dlc *dlc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "FR Link '%s': Role %s, LastRxSeq %u, LastTxSeq %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ link->name, link->role == FR_ROLE_USER_EQUIPMENT ? "USER" : "NETWORK",</span><br><span style="color: hsl(120, 100%, 40%);">+ link->last_rx_seq, link->last_tx_seq, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(dlc, &link->dlc_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr_dlc_dump_vty(vty, dlc);</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 style="color: hsl(120, 100%, 40%);">+void osmo_fr_network_dump_vty(struct vty *vty, const struct osmo_fr_network *net)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_fr_link *link;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "FR Network: N391 %u, N392 %u, N393 %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ net->n391, net->n392, net->n393, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_tdef_vty_out_all(vty, net->T_defs, " ");</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(link, &net->links, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr_link_dump_vty(vty, link);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c</span><br><span>index 6eea00d..8ef9f00 100644</span><br><span>--- a/src/gb/gprs_ns2_vty.c</span><br><span>+++ b/src/gb/gprs_ns2_vty.c</span><br><span>@@ -2018,6 +2018,8 @@</span><br><span> {</span><br><span> dump_ns_entities(vty, vty_nsi, false, false);</span><br><span> dump_ns_bind(vty, vty_nsi, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vty_fr_network && llist_count(&vty_fr_network->links))</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fr_network_dump_vty(vty, vty_fr_network);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23546">change 23546</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/+/23546"/><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: I798af3e97dc014b6e0fcde86560a1809852f7510 </div>
<div style="display:none"> Gerrit-Change-Number: 23546 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>