<p>pespin <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/15310">View Change</a></p><div style="white-space:pre-wrap">Approvals:
osmith: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ggsn, sgsnemu: Drop use of no-op deprecated gtp_retrans* APIs<br><br>Related: OS#4178<br>Change-Id: I295b89ee493d230c2550d461fca9602c589d38b5<br>---<br>M ggsn/ggsn.c<br>M ggsn/ggsn.h<br>M sgsnemu/sgsnemu.c<br>3 files changed, 2 insertions(+), 34 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c</span><br><span>index ffa508b..c710984 100644</span><br><span>--- a/ggsn/ggsn.c</span><br><span>+++ b/ggsn/ggsn.c</span><br><span>@@ -739,28 +739,6 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void ggsn_gtp_tmr_start(struct ggsn_ctx *ggsn)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct timeval next;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Retrieve next retransmission as timeval */</span><br><span style="color: hsl(0, 100%, 40%);">- gtp_retranstimeout(ggsn->gsn, &next);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* re-schedule the timer */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_schedule(&ggsn->gtp_timer, next.tv_sec, next.tv_usec/1000);</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%);">-/* timer callback for libgtp retransmission and ping */</span><br><span style="color: hsl(0, 100%, 40%);">-static void ggsn_gtp_tmr_cb(void *data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct ggsn_ctx *ggsn = data;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* do all the retransmissions as needed */</span><br><span style="color: hsl(0, 100%, 40%);">- gtp_retrans(ggsn->gsn);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ggsn_gtp_tmr_start(ggsn);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* libgtp callback for confirmations */</span><br><span> static int cb_conf(int type, int cause, struct pdp_t *pdp, void *cbp)</span><br><span> {</span><br><span>@@ -848,10 +826,6 @@</span><br><span> rc = osmo_fd_register(&ggsn->gtp_fd1u);</span><br><span> OSMO_ASSERT(rc == 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Start GTP re-transmission timer */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_setup(&ggsn->gtp_timer, ggsn_gtp_tmr_cb, ggsn);</span><br><span style="color: hsl(0, 100%, 40%);">- ggsn_gtp_tmr_start(ggsn);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> gtp_set_cb_data_ind(ggsn->gsn, encaps_tun);</span><br><span> gtp_set_cb_delete_context(ggsn->gsn, delete_context);</span><br><span> gtp_set_cb_create_context_ind(ggsn->gsn, create_context_ind);</span><br><span>@@ -879,8 +853,6 @@</span><br><span> llist_for_each_entry(apn, &ggsn->apn_list, list)</span><br><span> apn_stop(apn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_del(&ggsn->gtp_timer);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> osmo_fd_unregister(&ggsn->gtp_fd1u);</span><br><span> osmo_fd_unregister(&ggsn->gtp_fd1c);</span><br><span> osmo_fd_unregister(&ggsn->gtp_fd0);</span><br><span>diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h</span><br><span>index f23df54..82984a0 100644</span><br><span>--- a/ggsn/ggsn.h</span><br><span>+++ b/ggsn/ggsn.h</span><br><span>@@ -138,8 +138,6 @@</span><br><span> struct osmo_fd gtp_fd0;</span><br><span> struct osmo_fd gtp_fd1c;</span><br><span> struct osmo_fd gtp_fd1u;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_timer_list gtp_timer;</span><br><span> };</span><br><span> </span><br><span> /* ggsn_vty.c */</span><br><span>diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c</span><br><span>index 4f1f844..863ea51 100644</span><br><span>--- a/sgsnemu/sgsnemu.c</span><br><span>+++ b/sgsnemu/sgsnemu.c</span><br><span>@@ -1801,7 +1801,8 @@</span><br><span> FD_SET(gsn->fd1c, &fds);</span><br><span> FD_SET(gsn->fd1u, &fds);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gtp_retranstimeout(gsn, &idleTime);</span><br><span style="color: hsl(120, 100%, 40%);">+ idleTime.tv_sec = 10;</span><br><span style="color: hsl(120, 100%, 40%);">+ idleTime.tv_usec = 0;</span><br><span> ping_timeout(&idleTime);</span><br><span> </span><br><span> if (options.debug)</span><br><span>@@ -1817,9 +1818,6 @@</span><br><span> SYS_ERR(DSGSN, LOGL_ERROR, 0,</span><br><span> "Select returned -1");</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 0:</span><br><span style="color: hsl(0, 100%, 40%);">- gtp_retrans(gsn); /* Only retransmit if nothing else */</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span> default:</span><br><span> break;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/15310">change 15310</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/+/15310"/><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: I295b89ee493d230c2550d461fca9602c589d38b5 </div>
<div style="display:none"> Gerrit-Change-Number: 15310 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: lynxis lazus <lynxis@fe80.eu> </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-MessageType: merged </div>