<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23415">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: Allow VTY configuration of default binds for IP-SNS<br><br>In the IP-SNS SGSN role, we need to inform the BSS of our local<br>IP endpoints. For statically configured NSEs, those are explicitly<br>stated on a per-NSE level.<br><br>For dynamically created IP-SNS NSEs, we are adding a new VTY<br>command, using which the administrator can configure which binds<br>should be advertised as IP endpoints to such BSS.<br><br>Change-Id: Id01c29b07e9203c9305f2129361a4f5aaefa2c52<br>Related: OS#3373<br>---<br>M src/gb/gprs_ns2.c<br>M src/gb/gprs_ns2_internal.h<br>M src/gb/gprs_ns2_vty.c<br>3 files changed, 106 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/23415/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index 91be542..7fe3956 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -934,8 +934,9 @@</span><br><span> LOGP(DLNS, LOGL_ERROR, "Failed to create NSE(%05u)\n", nsei);</span><br><span> return NS2_CS_ERROR;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns2_sns_add_bind(nse, bind);</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: add (configured) list of other binds */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* add configured list of default binds; if that fails, use only current bind */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ns2_sns_add_sns_default_binds(nse))</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_sns_add_bind(nse, bind);</span><br><span> } else {</span><br><span> /* nsei already known */</span><br><span> if (nse->ll != bind->ll) {</span><br><span>diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h</span><br><span>index f0dd9bf..9788652 100644</span><br><span>--- a/src/gb/gprs_ns2_internal.h</span><br><span>+++ b/src/gb/gprs_ns2_internal.h</span><br><span>@@ -388,3 +388,6 @@</span><br><span> enum gprs_ns2_vc_mode ns2_dialect_to_vc_mode(enum gprs_ns2_dialect dialect);</span><br><span> int ns2_count_transfer_cap(struct gprs_ns2_nse *nse,</span><br><span> uint16_t bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* vty */</span><br><span style="color: hsl(120, 100%, 40%);">+int ns2_sns_add_sns_default_binds(struct gprs_ns2_nse *nse);</span><br><span>diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c</span><br><span>index 47a888f..c910ea7 100644</span><br><span>--- a/src/gb/gprs_ns2_vty.c</span><br><span>+++ b/src/gb/gprs_ns2_vty.c</span><br><span>@@ -3,6 +3,7 @@</span><br><span> </span><br><span> /* (C) 2020 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de></span><br><span> * Author: Alexander Couzens <lynxis@fe80.eu></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2021 by Harald Welte <laforge@osmocom.org></span><br><span> *</span><br><span> * All Rights Reserved</span><br><span> *</span><br><span>@@ -59,6 +60,7 @@</span><br><span> static struct osmo_fr_network *vty_fr_network = NULL;</span><br><span> static struct llist_head binds;</span><br><span> static struct llist_head nses;</span><br><span style="color: hsl(120, 100%, 40%);">+static struct llist_head ip_sns_default_binds;</span><br><span> </span><br><span> struct vty_bind {</span><br><span> struct llist_head list;</span><br><span>@@ -552,6 +554,7 @@</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 style="color: hsl(120, 100%, 40%);">+ struct vty_nse_bind *vbind;</span><br><span> </span><br><span> llist_for_each_entry(nse, &vty_nsi->nse, list) {</span><br><span> if (!nse->persistent)</span><br><span>@@ -560,6 +563,10 @@</span><br><span> _config_write_ns_nse(vty, nse);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(vbind, &ip_sns_default_binds, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " ip-sns-default bind %s%s", vbind->vbind->name, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -1583,6 +1590,95 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* add all IP-SNS default binds to the given NSE */</span><br><span style="color: hsl(120, 100%, 40%);">+int ns2_sns_add_sns_default_binds(struct gprs_ns2_nse *nse)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vty_nse_bind *vnse_bind;</span><br><span style="color: hsl(120, 100%, 40%);">+ int count = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(nse->ll == GPRS_NS2_LL_UDP);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(nse->dialect == GPRS_NS2_DIALECT_SNS);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(vnse_bind, &ip_sns_default_binds, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc_bind *bind = gprs_ns2_bind_by_name(vty_nsi, vnse_bind->vbind->name);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* the bind might not yet created because "listen" is missing. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bind)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_sns_add_bind(nse, bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ count++;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return count;</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%);">+DEFUN(cfg_ns_ip_sns_default_bind, cfg_ns_ip_sns_default_bind_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "ip-sns-default bind ID",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Defaults for dynamically created NSEs created by IP-SNS in SGSN role\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "IP SNS binds\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Name of NS udp bind whose IP endpoint will be used as IP-SNS local endpoint. Can be given multiple times.\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vty_bind *vbind;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vty_nse_bind *vnse_bind;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *name = argv[0];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vbind = vty_bind_by_name(name);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!vbind) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "Can not find the given bind '%s'%s", name, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</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->ll != GPRS_NS2_LL_UDP) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "ip-sns-default bind can only be used with UDP bind%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</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(vnse_bind, &ip_sns_default_binds, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vnse_bind->vbind == vbind)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</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%);">+ vnse_bind = talloc(vty_nsi, struct vty_nse_bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!vnse_bind)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ vnse_bind->vbind = vbind;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add_tail(&vnse_bind->list, &ip_sns_default_binds);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</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%);">+DEFUN(cfg_no_ns_ip_sns_default_bind, cfg_no_ns_ip_sns_default_bind_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no ip-sns-default bind ID",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR "Defaults for dynamically created NSEs created by IP-SNS in SGSN role\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "IP SNS binds\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Name of NS udp bind whose IP endpoint will be removed as IP-SNS local endpoint.\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vty_bind *vbind;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vty_nse_bind *vnse_bind;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *name = argv[0];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vbind = vty_bind_by_name(name);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!vbind) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "Can not find the given bind '%s'%s", name, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</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->ll != GPRS_NS2_LL_UDP) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "ip-sns-default bind can only be used with UDP bind%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</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(vnse_bind, &ip_sns_default_binds, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vnse_bind->vbind == vbind) {</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&vnse_bind->list);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(vnse_bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</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%);">+ vty_out(vty, "Bind '%s' was not an ip-sns-default bind%s", name, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(cfg_ns_nse_ip_sns_bind, cfg_ns_nse_ip_sns_bind_cmd,</span><br><span> "ip-sns-bind BINDID",</span><br><span> "IP SNS binds\n"</span><br><span>@@ -2059,6 +2155,7 @@</span><br><span> vty_nsi = nsi;</span><br><span> INIT_LLIST_HEAD(&binds);</span><br><span> INIT_LLIST_HEAD(&nses);</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&ip_sns_default_binds);</span><br><span> </span><br><span> vty_fr_network = osmo_fr_network_alloc(nsi);</span><br><span> if (!vty_fr_network)</span><br><span>@@ -2098,6 +2195,9 @@</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(120, 100%, 40%);">+ install_lib_element(L_NS_NODE, &cfg_ns_ip_sns_default_bind_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_lib_element(L_NS_NODE, &cfg_no_ns_ip_sns_default_bind_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> 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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23415">change 23415</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/+/23415"/><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: Id01c29b07e9203c9305f2129361a4f5aaefa2c52 </div>
<div style="display:none"> Gerrit-Change-Number: 23415 </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>