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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-gbproxy: Free msgb in ns2 prim callback<br><br>Commit cce88282388f in libosmocore changed the msg ownership model - the<br>callback that the user registers is now responsible for freeing the msg.<br><br>Change-Id: Iee940aba7d94afefb5957dbe5f0b04dcf951b31c<br>Related: SYS#4998<br>---<br>M src/gbproxy/gb_proxy.c<br>M tests/gbproxy/gbproxy_test.c<br>2 files changed, 2 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c</span><br><span>index ccf3f73..fb58284 100644</span><br><span>--- a/src/gbproxy/gb_proxy.c</span><br><span>+++ b/src/gbproxy/gb_proxy.c</span><br><span>@@ -1470,6 +1470,7 @@</span><br><span>                 msgb_nsei(oph->msg) = nsp->nsei;</span><br><span> </span><br><span>           rc = gbprox_rcvmsg(cfg, oph->msg);</span><br><span style="color: hsl(120, 100%, 40%);">+         msgb_free(oph->msg);</span><br><span>              break;</span><br><span>       case PRIM_NS_STATUS:</span><br><span>                 gprs_ns_prim_status_cb(cfg, nsp);</span><br><span>diff --git a/tests/gbproxy/gbproxy_test.c b/tests/gbproxy/gbproxy_test.c</span><br><span>index 1662980..76fc000 100644</span><br><span>--- a/tests/gbproxy/gbproxy_test.c</span><br><span>+++ b/tests/gbproxy/gbproxy_test.c</span><br><span>@@ -505,7 +505,6 @@</span><br><span>                         PRIM_OP_INDICATION, msg);</span><br><span> </span><br><span>        gprs_ns2_callback(&nsp.oph, &gbcfg);</span><br><span style="color: hsl(0, 100%, 40%);">-    talloc_free(msg);</span><br><span> }</span><br><span> static int gbprox_test_bssgp_send_cb(void *ctx, struct msgb *msg);</span><br><span> </span><br><span>@@ -1037,9 +1036,8 @@</span><br><span>             break;</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /* Hand off to gbproxy */</span><br><span style="color: hsl(120, 100%, 40%);">+     /* Hand off to gbproxy which will free the msg */</span><br><span>    return gprs_ns2_prim_cb(oph, ctx);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> }</span><br><span> </span><br><span> /* Get the next message from the receive FIFO</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21059">change 21059</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-sgsn/+/21059"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iee940aba7d94afefb5957dbe5f0b04dcf951b31c </div>
<div style="display:none"> Gerrit-Change-Number: 21059 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>