<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22944">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: ensure no duplicate UDP NSVC can be created<br><br>Change-Id: I58a95817e2730bbbaa851a43a5b072d1de2db037<br>---<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>3 files changed, 33 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/44/22944/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c</span><br><span>index 36f6a97..3081680 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -402,6 +402,10 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* duplicate */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gprs_ns2_nsvc_by_sockaddr_bind(bind, remote))</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> sockaddr_str = (char *)osmo_sockaddr_to_str(remote);</span><br><span> osmo_identifier_sanitize_buf(sockaddr_str, NULL, '_');</span><br><span> snprintf(idbuf, sizeof(idbuf), "%s-NSE%05u-remote-%s", gprs_ns2_lltype_str(nse->ll),</span><br><span>diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c</span><br><span>index 4bd7cde..6214907 100644</span><br><span>--- a/src/gb/gprs_ns2_vty.c</span><br><span>+++ b/src/gb/gprs_ns2_vty.c</span><br><span>@@ -1093,6 +1093,15 @@</span><br><span> goto err;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc = gprs_ns2_nsvc_by_sockaddr_bind(bind, &remote);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc->nse == nse)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "Specified NSVC is already present in this NSE.%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "Specified NSVC is already present in another NSE%05u.%s", nsvc->nse->nsei, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ goto err;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> nsvc = gprs_ns2_ip_connect(bind, &remote, nse, 0);</span><br><span> if (!nsvc) {</span><br><span> vty_out(vty, "Can not create NS-VC.%s", VTY_NEWLINE);</span><br><span>diff --git a/tests/gb/gprs_ns2_vty.vty b/tests/gb/gprs_ns2_vty.vty</span><br><span>index a969881..f0253fc 100644</span><br><span>--- a/tests/gb/gprs_ns2_vty.vty</span><br><span>+++ b/tests/gb/gprs_ns2_vty.vty</span><br><span>@@ -61,3 +61,23 @@</span><br><span> NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.17]:9496</span><br><span> NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.16]:9496</span><br><span> NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.15]:9496</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy# configure terminal</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config)# ns</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config-ns)# nse 1234</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config-ns-nse)# nsvc udp abc 127.0.0.16 9496 signalling-weight 2 data-weight 2</span><br><span style="color: hsl(120, 100%, 40%);">+Specified NSVC is already present in this NSE.</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config-ns-nse)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config-ns)# nse 1235</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config-ns-nse)# nsvc udp abc 127.0.0.16 9496 signalling-weight 2 data-weight 2</span><br><span style="color: hsl(120, 100%, 40%);">+Specified NSVC is already present in another NSE01234.</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config-ns-nse)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config-ns)# nse 2342</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config-ns-nse)# ip-sns-bind abc</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config-ns-nse)# ip-sns-bind abc</span><br><span style="color: hsl(120, 100%, 40%);">+Failed to add ip-sns-bind abc already present</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config-ns-nse)# ip-sns-bind abc2</span><br><span style="color: hsl(120, 100%, 40%);">+Can not find the given bind 'abc2'</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config-ns-nse)# ip-sns-remote 127.0.0.1 22222</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config-ns-nse)# ip-sns-remote 127.0.0.1 22222</span><br><span style="color: hsl(120, 100%, 40%);">+Specified SNS endpoint already part of the NSE.</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config-ns-nse)# exit</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22944">change 22944</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/+/22944"/><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: I58a95817e2730bbbaa851a43a5b072d1de2db037 </div>
<div style="display:none"> Gerrit-Change-Number: 22944 </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>