<p>daniel has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/22808">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy_vty: Fix NRI overlap behaviour to match osmo-bsc<br><br>The MSC-pooling chapter in OsmoBSC mentions that overlapping NRI ranges will<br>warn if configured though the VTY interface, but fail when started with<br>such a config.<br><br>The manual for OsmoGbProxy promises a similar behaviour, this patch implements<br>it.<br><br>Change-Id: Id3815ed8d1736ea3ba1e498b2bc3cf30b772551d<br>---<br>M src/gb_proxy_vty.c<br>1 file changed, 6 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/08/22808/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb_proxy_vty.c b/src/gb_proxy_vty.c</span><br><span>index 9240d2d..f069e88 100644</span><br><span>--- a/src/gb_proxy_vty.c</span><br><span>+++ b/src/gb_proxy_vty.c</span><br><span>@@ -283,6 +283,7 @@</span><br><span>     struct gbproxy_sgsn *sgsn = vty->index;</span><br><span>   struct gbproxy_sgsn *other_sgsn;</span><br><span>     bool before;</span><br><span style="color: hsl(120, 100%, 40%);">+  bool overlaps = false;</span><br><span>       int rc;</span><br><span>      const char *message;</span><br><span>         struct osmo_nri_range add_range;</span><br><span>@@ -307,13 +308,17 @@</span><br><span>             if (osmo_nri_range_overlaps_ranges(&add_range, other_sgsn->pool.nri_ranges)) {</span><br><span>                        uint16_t nsei = sgsn->nse->nsei;</span><br><span>                       uint16_t other_nsei = other_sgsn->nse->nsei;</span><br><span style="color: hsl(120, 100%, 40%);">+                    overlaps = true;</span><br><span>                     NRI_WARN(sgsn, "NRI range [%d..%d] overlaps between NSE %05d and NSE %05d."</span><br><span>                                 " For overlaps, NSE %05d has higher priority than NSE %05d",</span><br><span>                               add_range.first, add_range.last, nsei, other_nsei,</span><br><span>                           before ? other_nsei : nsei, before ? nsei : other_nsei);</span><br><span>            }</span><br><span>    }</span><br><span style="color: hsl(0, 100%, 40%);">-       return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+   if (overlaps)</span><br><span style="color: hsl(120, 100%, 40%);">+         return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+   else</span><br><span style="color: hsl(120, 100%, 40%);">+          return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span> DEFUN_ATTR(cfg_sgsn_nri_del, cfg_sgsn_nri_del_cmd,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/22808">change 22808</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/osmo-gbproxy/+/22808"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gbproxy </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id3815ed8d1736ea3ba1e498b2bc3cf30b772551d </div>
<div style="display:none"> Gerrit-Change-Number: 22808 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>