<p>lynxis lazus <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11023">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Pau Espin Pedrol: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">GTP: refactor the echo timer<br><br>Move the check of the echo timer into an own function.<br>The gtp echo timer must be re-check everytime the<br>echo-timer has been modified or deactivated via vty.<br><br>Fixes the TTCN3 SGSN_Tests.TC_attach_restart_ctr_echo<br><br>Change-Id: Ia33471a9a9cfc3887facb665c82094b99932052a<br>---<br>M include/osmocom/sgsn/gprs_sgsn.h<br>M src/gprs/gprs_sgsn.c<br>M src/gprs/sgsn_vty.c<br>3 files changed, 17 insertions(+), 4 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 2fbc0b6..1913591 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>@@ -375,6 +375,7 @@</span><br><span> int sgsn_ggsn_ctx_drop_all_pdp_except(struct sgsn_ggsn_ctx *ggsn, struct sgsn_pdp_ctx *except);</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 style="color: hsl(120, 100%, 40%);">+void sgsn_ggsn_ctx_check_echo_timer(struct sgsn_ggsn_ctx *ggc);</span><br><span> </span><br><span> struct apn_ctx {</span><br><span>       struct llist_head list;</span><br><span>diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c</span><br><span>index dc0e7c0..efbae22 100644</span><br><span>--- a/src/gprs/gprs_sgsn.c</span><br><span>+++ b/src/gprs/gprs_sgsn.c</span><br><span>@@ -489,6 +489,17 @@</span><br><span>  talloc_free(pdp);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void sgsn_ggsn_ctx_check_echo_timer(struct sgsn_ggsn_ctx *ggc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (llist_empty(&ggc->pdp_list) || ggc->echo_interval <= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+            if (osmo_timer_pending(&ggc->echo_timer))</span><br><span style="color: hsl(120, 100%, 40%);">+                      osmo_timer_del(&ggc->echo_timer);</span><br><span style="color: hsl(120, 100%, 40%);">+      } else {</span><br><span style="color: hsl(120, 100%, 40%);">+              if (!osmo_timer_pending(&ggc->echo_timer))</span><br><span style="color: hsl(120, 100%, 40%);">+                     osmo_timer_schedule(&ggc->echo_timer, ggc->echo_interval, 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%);">+</span><br><span> /* GGSN contexts */</span><br><span> static void echo_timer_cb(void *data)</span><br><span> {</span><br><span>@@ -742,15 +753,14 @@</span><br><span> </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 style="color: hsl(0, 100%, 40%);">- if (llist_empty(&ggc->pdp_list) && ggc->echo_interval > 0)</span><br><span style="color: hsl(0, 100%, 40%);">-         osmo_timer_schedule(&ggc->echo_timer, ggc->echo_interval, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+       sgsn_ggsn_ctx_check_echo_timer(ggc);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       llist_add(&pdp->ggsn_list, &ggc->pdp_list);</span><br><span> }</span><br><span> void sgsn_ggsn_ctx_remove_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp)</span><br><span> {</span><br><span>    llist_del(&pdp->ggsn_list);</span><br><span style="color: hsl(0, 100%, 40%);">-      if (llist_empty(&ggc->pdp_list) && osmo_timer_pending(&ggc->echo_timer))</span><br><span style="color: hsl(0, 100%, 40%);">-          osmo_timer_del(&ggc->echo_timer);</span><br><span style="color: hsl(120, 100%, 40%);">+      sgsn_ggsn_ctx_check_echo_timer(ggc);</span><br><span>         if (pdp->destroy_ggsn)</span><br><span>            sgsn_ggsn_ctx_free(pdp->ggsn);</span><br><span>    pdp->ggsn = NULL;</span><br><span>diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c</span><br><span>index de193f0..63985bc 100644</span><br><span>--- a/src/gprs/sgsn_vty.c</span><br><span>+++ b/src/gprs/sgsn_vty.c</span><br><span>@@ -383,6 +383,7 @@</span><br><span>                       "not be lower than 60 seconds, use this value for " \</span><br><span>                              "testing purposes only!%s", VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+  sgsn_ggsn_ctx_check_echo_timer(ggc);</span><br><span>         return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -395,6 +396,7 @@</span><br><span>   struct sgsn_ggsn_ctx *ggc = sgsn_ggsn_ctx_find_alloc(id);</span><br><span> </span><br><span>        ggc->echo_interval = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+   sgsn_ggsn_ctx_check_echo_timer(ggc);</span><br><span> </span><br><span>     return CMD_SUCCESS;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11023">change 11023</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/11023"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia33471a9a9cfc3887facb665c82094b99932052a </div>
<div style="display:none"> Gerrit-Change-Number: 11023 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>