<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/14285">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: Refactor code to use gtp_freepdp(_teardown) APIs<br><br>* API gtp_freepdp was already there but was not really being used by<br>anyone currently, so we can change its behaviour to call cb_delete_ctx.<br>It makes sense to call the cb in there too to be consistent with rest of<br>APIs.<br>* Add API gtp_freepdp_teardown, which calls gtp_freepdp on pdp and its<br>secondary contexts. It will also be used later on by osmo-ggsn.<br>* Use new APIs in internal code to simplify it.<br><br>Change-Id: I9f0b774e9385a7a8d81ec9702f158e2f9a50d571<br>---<br>M gtp/gtp.c<br>M gtp/gtp.h<br>2 files changed, 32 insertions(+), 50 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 6e834cc..57c19a2 100644</span><br><span>--- a/gtp/gtp.c</span><br><span>+++ b/gtp/gtp.c</span><br><span>@@ -146,9 +146,36 @@</span><br><span> </span><br><span> int gtp_freepdp(struct gsn_t *gsn, struct pdp_t *pdp)</span><br><span> {</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> return pdp_freepdp(pdp);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Free pdp and all its secondary PDP contexts. Must be called on the primary PDP context. */</span><br><span style="color: hsl(120, 100%, 40%);">+int gtp_freepdp_teardown(struct gsn_t *gsn, struct pdp_t *pdp)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int n;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct pdp_t *secondary_pdp;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(!pdp->secondary);</span><br><span style="color: hsl(120, 100%, 40%);">+</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 (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%);">+ 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%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdp != secondary_pdp) {</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp_freepdp(gsn, 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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return gtp_freepdp(gsn, pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* gtp_gpdu */</span><br><span> </span><br><span> extern int gtp_fd(struct gsn_t *gsn)</span><br><span>@@ -1648,9 +1675,7 @@</span><br><span> </span><br><span> DEBUGP(DLGTP, "gtp_create_pdp_ind: Deleting old context\n");</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_old);</span><br><span style="color: hsl(0, 100%, 40%);">- pdp_freepdp(pdp_old);</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp_freepdp(gsn, pdp_old);</span><br><span> </span><br><span> DEBUGP(DLGTP, "gtp_create_pdp_ind: Deleted...\n");</span><br><span> }</span><br><span>@@ -2371,8 +2396,6 @@</span><br><span> int teardown)</span><br><span> {</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 style="color: hsl(0, 100%, 40%);">- int n;</span><br><span> </span><br><span> if (pdp_getgtp1(&linked_pdp, pdp->teic_own)) {</span><br><span> LOGP(DLGTP, LOGL_ERROR,</span><br><span>@@ -2384,26 +2407,7 @@</span><br><span> return EOF;</span><br><span> </span><br><span> 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(120, 100%, 40%);">+ gtp_freepdp_teardown(gsn, linked_pdp);</span><br><span> } else {</span><br><span> if (gsn->cb_delete_context)</span><br><span> gsn->cb_delete_context(pdp);</span><br><span>@@ -2470,10 +2474,8 @@</span><br><span> uint8_t cause, int teardown)</span><br><span> {</span><br><span> union gtp_packet packet;</span><br><span style="color: hsl(0, 100%, 40%);">- struct pdp_t *secondary_pdp;</span><br><span> unsigned int length =</span><br><span> get_default_gtp(version, GTP_DELETE_PDP_RSP, &packet);</span><br><span style="color: hsl(0, 100%, 40%);">- int n;</span><br><span> </span><br><span> gtpie_tv1(&packet, &length, GTP_MAX, GTPIE_CAUSE, cause);</span><br><span> </span><br><span>@@ -2482,26 +2484,7 @@</span><br><span> </span><br><span> if (cause == GTPCAUSE_ACC_REQ) {</span><br><span> if ((teardown) || (version == 0)) { /* 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(120, 100%, 40%);">+ gtp_freepdp_teardown(gsn, linked_pdp);</span><br><span> } else { /* Remove only current context */</span><br><span> if (gsn->cb_delete_context)</span><br><span> gsn->cb_delete_context(pdp);</span><br><span>@@ -2752,9 +2735,7 @@</span><br><span> * code should ever change. */</span><br><span> OSMO_ASSERT(pdp);</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 style="color: hsl(0, 100%, 40%);">- pdp_freepdp(pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp_freepdp(gsn, pdp);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/gtp/gtp.h b/gtp/gtp.h</span><br><span>index 5f35ab5..6582319 100644</span><br><span>--- a/gtp/gtp.h</span><br><span>+++ b/gtp/gtp.h</span><br><span>@@ -309,6 +309,7 @@</span><br><span> extern int gtp_newpdp(struct gsn_t *gsn, struct pdp_t **pdp,</span><br><span> uint64_t imsi, uint8_t nsapi);</span><br><span> extern int gtp_freepdp(struct gsn_t *gsn, struct pdp_t *pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+extern int gtp_freepdp_teardown(struct gsn_t *gsn, struct pdp_t *pdp);</span><br><span> </span><br><span> extern int gtp_create_context_req(struct gsn_t *gsn, struct pdp_t *pdp,</span><br><span> void *cbp);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/14285">change 14285</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/+/14285"/><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: I9f0b774e9385a7a8d81ec9702f158e2f9a50d571 </div>
<div style="display:none"> Gerrit-Change-Number: 14285 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>