<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/20773">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use osmo_fd_setup() whenever applicable<br><br>Change-Id: I68d14b1c19dd8f1764fdf65afe1a957278255e40<br>---<br>M src/gtphub/gtphub.c<br>M src/sgsn/sgsn_libgtp.c<br>2 files changed, 4 insertions(+), 19 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/73/20773/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gtphub/gtphub.c b/src/gtphub/gtphub.c</span><br><span>index 699499f..c24652e 100644</span><br><span>--- a/src/gtphub/gtphub.c</span><br><span>+++ b/src/gtphub/gtphub.c</span><br><span>@@ -853,10 +853,7 @@</span><br><span>                return -1;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   ofd->when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-    ofd->cb = cb;</span><br><span style="color: hsl(0, 100%, 40%);">-        ofd->data = data;</span><br><span style="color: hsl(0, 100%, 40%);">-    ofd->priv_nr = ofd_id;</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_fd_setup(ofd, -1, OSMO_FD_READ, cb, data, ofd_id);</span><br><span> </span><br><span>  int rc;</span><br><span>      rc = osmo_sock_init_ofd(ofd,</span><br><span>diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c</span><br><span>index 45a4a07..8081492 100644</span><br><span>--- a/src/sgsn/sgsn_libgtp.c</span><br><span>+++ b/src/sgsn/sgsn_libgtp.c</span><br><span>@@ -776,31 +776,19 @@</span><br><span>    if (gsn->mode != GTP_MODE_SGSN)</span><br><span>           return -EINVAL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     sgi->gtp_fd0.fd = gsn->fd0;</span><br><span style="color: hsl(0, 100%, 40%);">-       sgi->gtp_fd0.priv_nr = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-    sgi->gtp_fd0.data = sgi;</span><br><span style="color: hsl(0, 100%, 40%);">-     sgi->gtp_fd0.when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-    sgi->gtp_fd0.cb = sgsn_gtp_fd_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_fd_setup(&sgi->gtp_fd0, gsn->fd0, OSMO_FD_READ, sgsn_gtp_fd_cb, sgi, 0);</span><br><span>      rc = osmo_fd_register(&sgi->gtp_fd0);</span><br><span>         if (rc < 0)</span><br><span>               return rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  sgi->gtp_fd1c.fd = gsn->fd1c;</span><br><span style="color: hsl(0, 100%, 40%);">-     sgi->gtp_fd1c.priv_nr = 1;</span><br><span style="color: hsl(0, 100%, 40%);">-   sgi->gtp_fd1c.data = sgi;</span><br><span style="color: hsl(0, 100%, 40%);">-    sgi->gtp_fd1c.when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-   sgi->gtp_fd1c.cb = sgsn_gtp_fd_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&sgi->gtp_fd1c, gsn->fd1c, OSMO_FD_READ, sgsn_gtp_fd_cb, sgi, 1);</span><br><span>    rc = osmo_fd_register(&sgi->gtp_fd1c);</span><br><span>        if (rc < 0) {</span><br><span>             osmo_fd_unregister(&sgi->gtp_fd0);</span><br><span>            return rc;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   sgi->gtp_fd1u.fd = gsn->fd1u;</span><br><span style="color: hsl(0, 100%, 40%);">-     sgi->gtp_fd1u.priv_nr = 2;</span><br><span style="color: hsl(0, 100%, 40%);">-   sgi->gtp_fd1u.data = sgi;</span><br><span style="color: hsl(0, 100%, 40%);">-    sgi->gtp_fd1u.when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-   sgi->gtp_fd1u.cb = sgsn_gtp_fd_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&sgi->gtp_fd1u, gsn->fd1u, OSMO_FD_READ, sgsn_gtp_fd_cb, sgi, 2);</span><br><span>    rc = osmo_fd_register(&sgi->gtp_fd1u);</span><br><span>        if (rc < 0) {</span><br><span>             osmo_fd_unregister(&sgi->gtp_fd0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/20773">change 20773</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/+/20773"/><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: I68d14b1c19dd8f1764fdf65afe1a957278255e40 </div>
<div style="display:none"> Gerrit-Change-Number: 20773 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>