<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15304">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gtp: make echo_interval unsigned<br><br>There's no real need to use -1 to indicate echo timer as disabled, since<br>0 can also be used (it doesn't make sense to have a timer timeout of 0).<br>This way code is simplified.<br><br>Change-Id: I689034887188a53590eddeffda781629694eb5ed<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, 5 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/04/15304/1</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 336155c..48c063d 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>@@ -392,7 +392,7 @@</span><br><span>        struct gsn_t *gsn;</span><br><span>   struct llist_head pdp_list;     /* list of associated pdp ctx (struct sgsn_pdp_ctx*) */</span><br><span>      struct osmo_timer_list echo_timer;</span><br><span style="color: hsl(0, 100%, 40%);">-      int echo_interval;</span><br><span style="color: hsl(120, 100%, 40%);">+    unsigned int echo_interval;</span><br><span> };</span><br><span> struct sgsn_ggsn_ctx *sgsn_ggsn_ctx_alloc(uint32_t id);</span><br><span> void sgsn_ggsn_ctx_free(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 9f02d54..7174bd5 100644</span><br><span>--- a/src/gprs/gprs_sgsn.c</span><br><span>+++ b/src/gprs/gprs_sgsn.c</span><br><span>@@ -500,7 +500,7 @@</span><br><span>       bool pending = osmo_timer_pending(&ggc->echo_timer);</span><br><span> </span><br><span>      /* Only enable if allowed by policy and at least 1 pdp ctx exists against ggsn */</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(120, 100%, 40%);">+    if (!llist_empty(&ggc->pdp_list) && ggc->echo_interval) {</span><br><span>          if (!pending)</span><br><span>                        osmo_timer_schedule(&ggc->echo_timer, ggc->echo_interval, 0);</span><br><span>      } else {</span><br><span>@@ -528,7 +528,6 @@</span><br><span>       ggc->id = id;</span><br><span>     ggc->gtp_version = 1;</span><br><span>     ggc->remote_restart_ctr = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-        ggc->echo_interval = -1;</span><br><span>  /* if we are called from config file parse, this gsn doesn't exist yet */</span><br><span>        ggc->gsn = sgsn->gsn;</span><br><span>  INIT_LLIST_HEAD(&ggc->pdp_list);</span><br><span>diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c</span><br><span>index 68d3a77..42b5121 100644</span><br><span>--- a/src/gprs/sgsn_vty.c</span><br><span>+++ b/src/gprs/sgsn_vty.c</span><br><span>@@ -190,8 +190,8 @@</span><br><span>                       inet_ntoa(gctx->remote_addr), VTY_NEWLINE);</span><br><span>               vty_out(vty, " ggsn %u gtp-version %u%s", gctx->id,</span><br><span>                     gctx->gtp_version, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">-             if (gctx->echo_interval != -1)</span><br><span style="color: hsl(0, 100%, 40%);">-                       vty_out(vty, " ggsn %u echo-interval %"PRId32"%s",</span><br><span style="color: hsl(120, 100%, 40%);">+                if (gctx->echo_interval)</span><br><span style="color: hsl(120, 100%, 40%);">+                   vty_out(vty, " ggsn %u echo-interval %u%s",</span><br><span>                                gctx->id, gctx->echo_interval, VTY_NEWLINE);</span><br><span>           else</span><br><span>                         vty_out(vty, " ggsn %u no echo-interval%s",</span><br><span>@@ -395,7 +395,7 @@</span><br><span>  uint32_t id = atoi(argv[0]);</span><br><span>         struct sgsn_ggsn_ctx *ggc = sgsn_ggsn_ctx_find_alloc(id);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   ggc->echo_interval = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+   ggc->echo_interval = 0;</span><br><span>   sgsn_ggsn_ctx_check_echo_timer(ggc);</span><br><span> </span><br><span>     return CMD_SUCCESS;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15304">change 15304</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/+/15304"/><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: I689034887188a53590eddeffda781629694eb5ed </div>
<div style="display:none"> Gerrit-Change-Number: 15304 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>