<p>lynxis lazus <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24856">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, but someone else must approve
  daniel: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: use gprs_ns2_free_bind() to clean up a bind<br><br>gprs_ns2_free_bind() takes care of all required steps to clean up a bind.<br>The driver->free_bind() operation only cleans up the driver internal state<br>but not NSVCs and other generic things.<br>Fixes a crash when free'ing a bind from the vty which has active NSVCs.<br><br>Related: OS#5195<br>Change-Id: I0a2ad22905bcacb929b9b5f5b034af0da3081826<br>---<br>M src/gb/gprs_ns2_vty.c<br>M tests/gb/gprs_ns2_vty.vty<br>2 files changed, 7 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c</span><br><span>index 705b60e..2f540c2 100644</span><br><span>--- a/src/gb/gprs_ns2_vty.c</span><br><span>+++ b/src/gb/gprs_ns2_vty.c</span><br><span>@@ -423,7 +423,7 @@</span><br><span>       vty_bind_free(vbind);</span><br><span>        bind = gprs_ns2_bind_by_name(vty_nsi, name);</span><br><span>         if (bind)</span><br><span style="color: hsl(0, 100%, 40%);">-               bind->driver->free_bind(bind);</span><br><span style="color: hsl(120, 100%, 40%);">+          gprs_ns2_free_bind(bind);</span><br><span>    return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -678,7 +678,7 @@</span><br><span>           return CMD_ERR_NOTHING_TODO;</span><br><span> </span><br><span>     OSMO_ASSERT(bind->ll == GPRS_NS2_LL_UDP);</span><br><span style="color: hsl(0, 100%, 40%);">-    bind->driver->free_bind(bind);</span><br><span style="color: hsl(120, 100%, 40%);">+  gprs_ns2_free_bind(bind);</span><br><span>    return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -939,7 +939,7 @@</span><br><span>           return CMD_WARNING;</span><br><span>  }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   bind->driver->free_bind(bind);</span><br><span style="color: hsl(120, 100%, 40%);">+  gprs_ns2_free_bind(bind);</span><br><span>    return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/gb/gprs_ns2_vty.vty b/tests/gb/gprs_ns2_vty.vty</span><br><span>index 4589f96..458e2c8 100644</span><br><span>--- a/tests/gb/gprs_ns2_vty.vty</span><br><span>+++ b/tests/gb/gprs_ns2_vty.vty</span><br><span>@@ -83,3 +83,7 @@</span><br><span> OsmoNSdummy(config-ns-nse)# ip-sns-remote 127.0.0.1 22222</span><br><span> Specified SNS endpoint already part of the NSE.</span><br><span> OsmoNSdummy(config-ns-nse)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config-ns)# no bind abc</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config-ns)# no bind abc77</span><br><span style="color: hsl(120, 100%, 40%);">+bind abc77 does not exist!</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoNSdummy(config-ns)# exit</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24856">change 24856</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/+/24856"/><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: I0a2ad22905bcacb929b9b5f5b034af0da3081826 </div>
<div style="display:none"> Gerrit-Change-Number: 24856 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>