<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/14283">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;">pdp: Introduce new API pdp_count_secondary<br><br>Change-Id: Id2d84ad1cdb0f3b500efeda4cc0fbccb24ae0c61<br>---<br>M gtp/gtp.c<br>M gtp/pdp.c<br>M gtp/pdp.h<br>3 files changed, 20 insertions(+), 10 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 eec8daf..b05eed6 100644</span><br><span>--- a/gtp/gtp.c</span><br><span>+++ b/gtp/gtp.c</span><br><span>@@ -2454,8 +2454,7 @@</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%);">- int n;</span><br><span style="color: hsl(0, 100%, 40%);">- int count = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ int count;</span><br><span> </span><br><span> if (gsna2in_addr(&addr, &pdp->gsnrc)) {</span><br><span> gsn->err_address++;</span><br><span>@@ -2470,9 +2469,7 @@</span><br><span> }</span><br><span> </span><br><span> if (!teardown) {</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%);">- count++;</span><br><span style="color: hsl(120, 100%, 40%);">+ count = pdp_count_secondary(linked_pdp);</span><br><span> if (count <= 1) {</span><br><span> LOGP(DLGTP, LOGL_ERROR,</span><br><span> "Must use teardown for last context: %d\n", count);</span><br><span>@@ -2562,8 +2559,7 @@</span><br><span> </span><br><span> uint8_t nsapi;</span><br><span> uint8_t teardown = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- int n;</span><br><span style="color: hsl(0, 100%, 40%);">- int count = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ int count;</span><br><span> </span><br><span> /* Is this a duplicate ? */</span><br><span> if (!gtp_duplicate(gsn, version, peer, seq)) {</span><br><span>@@ -2633,9 +2629,7 @@</span><br><span> * signalling messages will eventually lead to a consistent</span><br><span> * situation, allowing the teardown of the PDP context.)</span><br><span> */</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%);">- count++;</span><br><span style="color: hsl(120, 100%, 40%);">+ count = pdp_count_secondary(linked_pdp);</span><br><span> if (count <= 1) {</span><br><span> GTP_LOGPKG(LOGL_NOTICE, peer, pack, len,</span><br><span> "Ignoring CTX DEL without teardown and count=%d\n",</span><br><span>diff --git a/gtp/pdp.c b/gtp/pdp.c</span><br><span>index a630ee9..92fe5ec 100644</span><br><span>--- a/gtp/pdp.c</span><br><span>+++ b/gtp/pdp.c</span><br><span>@@ -374,3 +374,17 @@</span><br><span> pdp->imsi = teid & 0x0fffffffffffffffull;</span><br><span> pdp->nsapi = (teid & 0xf000000000000000ull) >> 60;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Count amount of secondary PDP contexts linked to this primary PDP context</span><br><span style="color: hsl(120, 100%, 40%);">+ * (itself included). Must be called on a primary PDP context. */</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned int pdp_count_secondary(struct pdp_t *pdp)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int n;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int count = 0;</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%);">+ count++;</span><br><span style="color: hsl(120, 100%, 40%);">+ return count;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/gtp/pdp.h b/gtp/pdp.h</span><br><span>index 81a38f4..e48f1a1 100644</span><br><span>--- a/gtp/pdp.h</span><br><span>+++ b/gtp/pdp.h</span><br><span>@@ -260,6 +260,8 @@</span><br><span> </span><br><span> void pdp_set_imsi_nsapi(struct pdp_t *pdp, uint64_t teid);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+unsigned int pdp_count_secondary(struct pdp_t *pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*</span><br><span> int pdp_iphash(void* ipif, struct ul66_t *eua);</span><br><span> int pdp_ipset(struct pdp_t *pdp, void* ipif, struct ul66_t *eua);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/14283">change 14283</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/+/14283"/><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: Id2d84ad1cdb0f3b500efeda4cc0fbccb24ae0c61 </div>
<div style="display:none"> Gerrit-Change-Number: 14283 </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>