<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/14293">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gtp: Re-arrange free pdp ctx code in non-teardown scenario<br><br>Code modified actually behaves the same, since gtp_freepdp() also calls<br>delete cb, and this way it's more consistent with rest of the code base.<br><br>Change-Id: I299765816e9d885497110d2e834f7ccdc943052c<br>---<br>M gtp/gtp.c<br>1 file changed, 14 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/gtp/gtp.c b/gtp/gtp.c</span><br><span>index 5dde6b5..9ae208a 100644</span><br><span>--- a/gtp/gtp.c</span><br><span>+++ b/gtp/gtp.c</span><br><span>@@ -2421,13 +2421,14 @@</span><br><span> because we don't want user to release its related</span><br><span> data and not use it anymore.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsn->cb_delete_context)</span><br><span style="color: hsl(0, 100%, 40%);">- gsn->cb_delete_context(pdp);</span><br><span> if (pdp == linked_pdp) {</span><br><span style="color: hsl(0, 100%, 40%);">- linked_pdp->secondary_tei[pdp->nsapi & 0xf0] = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- linked_pdp->nodata = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(0, 100%, 40%);">- pdp_freepdp(pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsn->cb_delete_context)</span><br><span style="color: hsl(120, 100%, 40%);">+ gsn->cb_delete_context(pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp->secondary_tei[pdp->nsapi & 0xf0] = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp->nodata = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp_freepdp(gsn, pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span>@@ -2510,14 +2511,14 @@</span><br><span> because we don't want user to release its related</span><br><span> data and not use it anymore.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsn->cb_delete_context)</span><br><span style="color: hsl(0, 100%, 40%);">- gsn->cb_delete_context(pdp);</span><br><span> if (pdp == linked_pdp) {</span><br><span style="color: hsl(0, 100%, 40%);">- linked_pdp->secondary_tei[pdp->nsapi & 0xf0] =</span><br><span style="color: hsl(0, 100%, 40%);">- 0;</span><br><span style="color: hsl(0, 100%, 40%);">- linked_pdp->nodata = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(0, 100%, 40%);">- pdp_freepdp(pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsn->cb_delete_context)</span><br><span style="color: hsl(120, 100%, 40%);">+ gsn->cb_delete_context(pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp->secondary_tei[pdp->nsapi & 0xf0] = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp->nodata = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp_freepdp(gsn, pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span> /* if (cause == GTPCAUSE_ACC_REQ) */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/14293">change 14293</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-ggsn/+/14293"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ggsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I299765816e9d885497110d2e834f7ccdc943052c </div>
<div style="display:none"> Gerrit-Change-Number: 14293 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-MessageType: merged </div>