<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10006">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Neels Hofmeyr: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gtp: Add new API to avoid freeing pdp contexts during DEL CTX REQ<br><br>With this API, user is expectd to free the PDP ctx when the confirmation<br>for the release has been received (cb_conf time). This way user can<br>maintain the pdp ctx alive during all this time. Extra code is added to<br>gtp_delete_pdp_resp() since it's now possible to match it and push it up<br>to the user cb_conf.<br><br>This way, cb_conf() can be used for locally-initiated DEL CTX REQ, while<br>delete_context() cb is left for remotely-initiated DEL CTX REQ. In this<br>later case, when the DEL CTX RESP is sent the ctx is deleted and the<br>delete_context() is called, where the user can do related actions or<br>trigger consequence events (in the case of SGSN, it will drop all<br>related GGSN bits for that PDP ctx and forward the DEACT PDP CTX to the<br>MS).<br><br>Change-Id: I29d366253bb98dcba328c7ce8aa3e4daf8f75e6c<br>---<br>M gtp/gtp.c<br>M gtp/gtp.h<br>2 files changed, 74 insertions(+), 38 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 1309cb5..95abbef 100644</span><br><span>--- a/gtp/gtp.c</span><br><span>+++ b/gtp/gtp.c</span><br><span>@@ -2337,16 +2337,66 @@</span><br><span> return EOF;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* API: Send Delete PDP Context Request */</span><br><span style="color: hsl(120, 100%, 40%);">+/* API: Deprecated. Send Delete PDP Context Request And free pdp ctx. */</span><br><span> int gtp_delete_context_req(struct gsn_t *gsn, struct pdp_t *pdp, void *cbp,</span><br><span> int teardown)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct pdp_t *linked_pdp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct pdp_t *secondary_pdp;</span><br><span style="color: hsl(120, 100%, 40%);">+ int n;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdp_getgtp1(&linked_pdp, pdp->teic_own)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGTP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unknown linked PDP context: %u\n", pdp->teic_own);</span><br><span style="color: hsl(120, 100%, 40%);">+ return EOF;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_delete_context_req2(gsn, pdp, cbp, teardown) == EOF)</span><br><span style="color: hsl(120, 100%, 40%);">+ return EOF;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (teardown) { /* Remove all contexts */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (n = 0; n < PDP_MAXNSAPI; n++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (linked_pdp->secondary_tei[n]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdp_getgtp1</span><br><span style="color: hsl(120, 100%, 40%);">+ (&secondary_pdp,</span><br><span style="color: hsl(120, 100%, 40%);">+ linked_pdp->secondary_tei[n])) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGTP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unknown secondary PDP context\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return EOF;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (linked_pdp != secondary_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</span><br><span style="color: hsl(120, 100%, 40%);">+ (secondary_pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp_freepdp(secondary_pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</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(linked_pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp_freepdp(linked_pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</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%);">+ if (pdp == linked_pdp) {</span><br><span style="color: hsl(120, 100%, 40%);">+ linked_pdp->secondary_tei[pdp->nsapi & 0xf0] = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ linked_pdp->nodata = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp_freepdp(pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* API: Send Delete PDP Context Request. PDP CTX shall be free'd by user at cb_conf(GTP_DELETE_PDP_RSP) */</span><br><span style="color: hsl(120, 100%, 40%);">+int gtp_delete_context_req2(struct gsn_t *gsn, struct pdp_t *pdp, void *cbp,</span><br><span style="color: hsl(120, 100%, 40%);">+ int teardown)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> union gtp_packet packet;</span><br><span> unsigned int length =</span><br><span> get_default_gtp(pdp->version, GTP_DELETE_PDP_REQ, &packet);</span><br><span> struct in_addr addr;</span><br><span> struct pdp_t *linked_pdp;</span><br><span style="color: hsl(0, 100%, 40%);">- struct pdp_t *secondary_pdp;</span><br><span> int n;</span><br><span> int count = 0;</span><br><span> </span><br><span>@@ -2383,37 +2433,6 @@</span><br><span> </span><br><span> gtp_req(gsn, pdp->version, pdp, &packet, length, &addr, cbp);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (teardown) { /* Remove all contexts */</span><br><span style="color: hsl(0, 100%, 40%);">- for (n = 0; n < PDP_MAXNSAPI; n++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (linked_pdp->secondary_tei[n]) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getgtp1</span><br><span style="color: hsl(0, 100%, 40%);">- (&secondary_pdp,</span><br><span style="color: hsl(0, 100%, 40%);">- linked_pdp->secondary_tei[n])) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLGTP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Unknown secondary PDP context\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return EOF;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (linked_pdp != secondary_pdp) {</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</span><br><span style="color: hsl(0, 100%, 40%);">- (secondary_pdp);</span><br><span style="color: hsl(0, 100%, 40%);">- pdp_freepdp(secondary_pdp);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</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(linked_pdp);</span><br><span style="color: hsl(0, 100%, 40%);">- pdp_freepdp(linked_pdp);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</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 style="color: hsl(0, 100%, 40%);">- 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(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -2573,19 +2592,32 @@</span><br><span> uint8_t cause;</span><br><span> void *cbp = NULL;</span><br><span> uint8_t type = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct pdp_t *pdp = NULL;</span><br><span> int hlen = get_hlen(pack);</span><br><span> </span><br><span> /* Remove packet from queue */</span><br><span> if (gtp_conf(gsn, version, peer, pack, len, &type, &cbp))</span><br><span> return EOF;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Find the context in question. It may not be available if gtp_delete_context_req</span><br><span style="color: hsl(120, 100%, 40%);">+ * was used and as a result the PDP ctx was already freed */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdp_getgtp1(&pdp, get_tei(pack))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ gsn->err_unknownpdp++;</span><br><span style="color: hsl(120, 100%, 40%);">+ GTP_LOGPKG(LOGL_NOTICE, peer, pack, len,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unknown PDP context: %u (expected if gtp_delete_context_req is used)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_tei(pack));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsn->cb_conf)</span><br><span style="color: hsl(120, 100%, 40%);">+ gsn->cb_conf(type, EOF, NULL, cbp);</span><br><span style="color: hsl(120, 100%, 40%);">+ return EOF;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Decode information elements */</span><br><span> if (gtpie_decaps(ie, version, pack + hlen, len - hlen)) {</span><br><span> gsn->invalid++;</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer, pack, len,</span><br><span> "Invalid message format\n");</span><br><span> if (gsn->cb_conf)</span><br><span style="color: hsl(0, 100%, 40%);">- gsn->cb_conf(type, EOF, NULL, cbp);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsn->cb_conf(type, EOF, pdp, cbp);</span><br><span> return EOF;</span><br><span> }</span><br><span> </span><br><span>@@ -2595,7 +2627,7 @@</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer, pack, len,</span><br><span> "Missing mandatory information field\n");</span><br><span> if (gsn->cb_conf)</span><br><span style="color: hsl(0, 100%, 40%);">- gsn->cb_conf(type, EOF, NULL, cbp);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsn->cb_conf(type, EOF, pdp, cbp);</span><br><span> return EOF;</span><br><span> }</span><br><span> </span><br><span>@@ -2605,13 +2637,13 @@</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer, pack, len,</span><br><span> "Unexpected cause value received: %d\n", cause);</span><br><span> if (gsn->cb_conf)</span><br><span style="color: hsl(0, 100%, 40%);">- gsn->cb_conf(type, cause, NULL, cbp);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsn->cb_conf(type, cause, pdp, cbp);</span><br><span> return EOF;</span><br><span> }</span><br><span> </span><br><span> /* Callback function to notify application */</span><br><span> if (gsn->cb_conf)</span><br><span style="color: hsl(0, 100%, 40%);">- gsn->cb_conf(type, cause, NULL, cbp);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsn->cb_conf(type, cause, pdp, cbp);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/gtp/gtp.h b/gtp/gtp.h</span><br><span>index 8f8e293..f185424 100644</span><br><span>--- a/gtp/gtp.h</span><br><span>+++ b/gtp/gtp.h</span><br><span>@@ -13,6 +13,7 @@</span><br><span> #define _GTP_H</span><br><span> </span><br><span> #include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/defs.h></span><br><span> </span><br><span> #define GTP_MODE_GGSN 1</span><br><span> #define GTP_MODE_SGSN 2</span><br><span>@@ -323,7 +324,10 @@</span><br><span> void *cbp, struct in_addr *inetaddr);</span><br><span> </span><br><span> extern int gtp_delete_context_req(struct gsn_t *gsn, struct pdp_t *pdp,</span><br><span style="color: hsl(0, 100%, 40%);">- void *cbp, int teardown);</span><br><span style="color: hsl(120, 100%, 40%);">+ void *cbp, int teardown)</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_DEPRECATED("Use gtp_delete_context_req2() instead, to avoid freeing pdp ctx before reply");</span><br><span style="color: hsl(120, 100%, 40%);">+extern int gtp_delete_context_req2(struct gsn_t *gsn, struct pdp_t *pdp,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *cbp, int teardown);</span><br><span> </span><br><span> extern int gtp_data_req(struct gsn_t *gsn, struct pdp_t *pdp,</span><br><span> void *pack, unsigned len);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10006">change 10006</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/10006"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I29d366253bb98dcba328c7ce8aa3e4daf8f75e6c </div>
<div style="display:none"> Gerrit-Change-Number: 10006 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <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-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>