<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/21656">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: vty2: config_write<br><br>Change-Id: Idb7d867d76ef6deb5d087d50e99ecdd5e620cd79<br>---<br>M src/gb/gprs_ns2_vty2.c<br>1 file changed, 145 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/56/21656/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_vty2.c b/src/gb/gprs_ns2_vty2.c</span><br><span>index 9303c09..d23e2f2 100644</span><br><span>--- a/src/gb/gprs_ns2_vty2.c</span><br><span>+++ b/src/gb/gprs_ns2_vty2.c</span><br><span>@@ -79,6 +79,19 @@</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string vty_fr_role_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { FR_ROLE_USER_EQUIPMENT, "fr" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { FR_ROLE_NETWORK_EQUIPMENT, "frnet" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</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%);">+const struct value_string vty_ll_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_LL_FR, "fr" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_LL_FR_GRE, "frgre" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_LL_UDP, "udp" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct vty_bind *vty_bind_by_name(const char *name)</span><br><span> {</span><br><span> struct vty_bind *vbind;</span><br><span>@@ -268,9 +281,140 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void config_write_vbind(struct vty *vty, struct vty_bind *vbind)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc_bind *bind;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str addr_str;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *netif, *frrole_str, *llstr;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_fr_role frrole;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llstr = get_value_string_or_null(vty_ll_names, vbind->ll);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!llstr)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " bind %s %s%s", llstr, vbind->name, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bind = gprs_ns2_bind_by_name(vty_nsi, vbind->name);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (vbind->ll) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_FR:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bind) {</span><br><span style="color: hsl(120, 100%, 40%);">+ netif = gprs_ns2_fr_bind_netif(bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!netif)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ frrole = gprs_ns2_fr_bind_role(bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((int) frrole == -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ frrole_str = get_value_string_or_null(vty_fr_role_names, frrole);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (netif && frrole_str)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " fr %s %s%s", netif, frrole_str, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_UDP:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bind) {</span><br><span style="color: hsl(120, 100%, 40%);">+ addr = gprs_ns2_ip_bind_sockaddr(bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_sockaddr_str_from_sockaddr(&addr_str, &addr->u.sas)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " listen %s %d%s", addr_str.ip, addr_str.port,</span><br><span style="color: hsl(120, 100%, 40%);">+ 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%);">+ if (vbind->accept_ipaccess)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " accept-ipaccess%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: dscp */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</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%);">+static void config_write_nsvc(struct vty *vty, const struct gprs_ns2_vc *nsvc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *netif;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t dlci;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str addr_str;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (nsvc->nse->ll) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_UNDEF:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_UDP:</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (nsvc->nse->dialect) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NS2_DIALECT_IPACCESS:</span><br><span style="color: hsl(120, 100%, 40%);">+ addr = gprs_ns2_ip_vc_remote(nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!addr)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_from_sockaddr(&addr_str, &addr->u.sas))</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "nsvc ipa %s nsvci %d %s %d%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->bind->name, nsvc->nsvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ addr_str.ip, addr_str.port, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NS2_DIALECT_STATIC_ALIVE:</span><br><span style="color: hsl(120, 100%, 40%);">+ addr = gprs_ns2_ip_vc_remote(nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!addr)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_from_sockaddr(&addr_str, &addr->u.sas))</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "nsvc udp %s %s %d%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->bind->name, addr_str.ip, addr_str.port, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_FR:</span><br><span style="color: hsl(120, 100%, 40%);">+ netif = gprs_ns2_fr_bind_netif(nsvc->bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!netif)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci = gprs_ns2_fr_nsvc_dlci(nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!dlci)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(nsvc->nsvci_is_valid);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "nsvc fr %s dlci %d nsvci %d%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ netif, dlci, nsvc->nsvci, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_FR_GRE:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+static void config_write_nse(struct vty *vty, struct gprs_ns2_nse *nse)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc *nsvc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " nse %d%s", nse->nsei, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (nse->dialect) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NS2_DIALECT_SNS:</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_sns_write_vty(vty, nse);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(nsvc, &nse->nsvc, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ config_write_nsvc(vty, nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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 int config_write_ns(struct vty *vty)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_nse *nse;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vty_bind *vbind;</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%);">+ llist_for_each_entry(vbind, &binds, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ config_write_vbind(vty, vbind);</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%);">+ llist_for_each_entry(nse, &vty_nsi->nse, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nse->persistent)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ config_write_nse(vty, nse);</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%);">+ // TODO timer</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/21656">change 21656</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/+/21656"/><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: Idb7d867d76ef6deb5d087d50e99ecdd5e620cd79 </div>
<div style="display:none"> Gerrit-Change-Number: 21656 </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>