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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sgsn: gtp: Drop related pdp contexts on echo timeout against GGSN<br><br>Change-Id: I7e97bac1c13a2c26203eb64e590fd75d77eb44bd<br>---<br>M include/osmocom/sgsn/gprs_sgsn.h<br>M src/gprs/gprs_sgsn.c<br>M src/gprs/sgsn_libgtp.c<br>3 files changed, 16 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>index 17cafa3..eea9fb0 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>@@ -402,6 +402,7 @@</span><br><span> struct sgsn_ggsn_ctx *sgsn_ggsn_ctx_find_alloc(uint32_t id);</span><br><span> void sgsn_ggsn_ctx_drop_pdp(struct sgsn_pdp_ctx *pctx);</span><br><span> int sgsn_ggsn_ctx_drop_all_pdp_except(struct sgsn_ggsn_ctx *ggsn, struct sgsn_pdp_ctx *except);</span><br><span style="color: hsl(120, 100%, 40%);">+int sgsn_ggsn_ctx_drop_all_pdp(struct sgsn_ggsn_ctx *ggsn);</span><br><span> void sgsn_ggsn_ctx_add_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp);</span><br><span> void sgsn_ggsn_ctx_remove_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp);</span><br><span> void sgsn_ggsn_ctx_check_echo_timer(struct sgsn_ggsn_ctx *ggc);</span><br><span>diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c</span><br><span>index 7174bd5..829204e 100644</span><br><span>--- a/src/gprs/gprs_sgsn.c</span><br><span>+++ b/src/gprs/gprs_sgsn.c</span><br><span>@@ -759,6 +759,11 @@</span><br><span>     return num;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int sgsn_ggsn_ctx_drop_all_pdp(struct sgsn_ggsn_ctx *ggsn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+   return sgsn_ggsn_ctx_drop_all_pdp_except(ggsn, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void sgsn_ggsn_ctx_add_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp)</span><br><span> {</span><br><span>   llist_add(&pdp->ggsn_list, &ggc->pdp_list);</span><br><span>diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c</span><br><span>index 79d5543..a8ad527 100644</span><br><span>--- a/src/gprs/sgsn_libgtp.c</span><br><span>+++ b/src/gprs/sgsn_libgtp.c</span><br><span>@@ -469,7 +469,8 @@</span><br><span> </span><br><span> void sgsn_ggsn_echo_req(struct sgsn_ggsn_ctx *ggc)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     gtp_echo_req(ggc->gsn, ggc->gtp_version, NULL, &ggc->remote_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+       LOGGGSN(ggc, LOGL_INFO, "GTP Tx Echo Request\n");</span><br><span style="color: hsl(120, 100%, 40%);">+   gtp_echo_req(ggc->gsn, ggc->gtp_version, ggc, &ggc->remote_addr);</span><br><span> }</span><br><span> </span><br><span> #ifdef BUILD_IU</span><br><span>@@ -579,13 +580,15 @@</span><br><span> }</span><br><span> </span><br><span> /* Confirmation of an GTP ECHO request */</span><br><span style="color: hsl(0, 100%, 40%);">-static int echo_conf(struct pdp_t *pdp, void *cbp, int recovery)</span><br><span style="color: hsl(120, 100%, 40%);">+static int echo_conf(void *cbp, bool timeout)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-    if (recovery < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-          LOGP(DGPRS, LOGL_NOTICE, "GTP Echo Request timed out\n");</span><br><span style="color: hsl(120, 100%, 40%);">+   struct sgsn_ggsn_ctx *ggc = (struct sgsn_ggsn_ctx *)cbp;</span><br><span style="color: hsl(120, 100%, 40%);">+      if (timeout) {</span><br><span style="color: hsl(120, 100%, 40%);">+                LOGGGSN(ggc, LOGL_NOTICE, "GTP Echo Request timed out\n");</span><br><span>                 /* FIXME: if version == 1, retry with version 0 */</span><br><span style="color: hsl(120, 100%, 40%);">+            sgsn_ggsn_ctx_drop_all_pdp(ggc);</span><br><span>     } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                DEBUGP(DGPRS, "GTP Rx Echo Response\n");</span><br><span style="color: hsl(120, 100%, 40%);">+            LOGGGSN(ggc, LOGL_INFO, "GTP Rx Echo Response\n");</span><br><span>         }</span><br><span>    return 0;</span><br><span> }</span><br><span>@@ -630,8 +633,8 @@</span><br><span> </span><br><span>     switch (type) {</span><br><span>      case GTP_ECHO_REQ:</span><br><span style="color: hsl(0, 100%, 40%);">-              /* libgtp hands us the RECOVERY number instead of a cause */</span><br><span style="color: hsl(0, 100%, 40%);">-            return echo_conf(pdp, cbp, cause);</span><br><span style="color: hsl(120, 100%, 40%);">+            /* libgtp hands us the RECOVERY number instead of a cause (EOF on timeout) */</span><br><span style="color: hsl(120, 100%, 40%);">+         return echo_conf(cbp, cause == EOF);</span><br><span>         case GTP_CREATE_PDP_REQ:</span><br><span>             return create_pdp_conf(pdp, cbp, cause);</span><br><span>     case GTP_DELETE_PDP_REQ:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15308">change 15308</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/+/15308"/><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: I7e97bac1c13a2c26203eb64e590fd75d77eb44bd </div>
<div style="display:none"> Gerrit-Change-Number: 15308 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>