<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-el2tpd/+/20765">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use osmo_fd_setup() whenever applicable<br><br>Change-Id: Id6cbb0058b9eb400d69f556232bbe112f257775b<br>---<br>M src/l2tpd.c<br>M src/l2tpd_socket.c<br>2 files changed, 3 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-el2tpd refs/changes/65/20765/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/l2tpd.c b/src/l2tpd.c</span><br><span>index 635394d..f56d5d9 100644</span><br><span>--- a/src/l2tpd.c</span><br><span>+++ b/src/l2tpd.c</span><br><span>@@ -88,10 +88,7 @@</span><br><span> </span><br><span>      INIT_LLIST_HEAD(&li->connections);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   li->l2tp_ofd.when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-    li->l2tp_ofd.cb = l2tp_ip_read_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-   li->l2tp_ofd.data = li;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_fd_setup(&li->l2tp_ofd, -1, OSMO_FD_READ, l2tp_ip_read_cb, li, 0);</span><br><span>       rc = osmo_sock_init_ofd(&li->l2tp_ofd, AF_INET, SOCK_RAW,</span><br><span>                             IPPROTO_L2TP, li->cfg.bind_ip, 0, 0);</span><br><span>     if (rc < 0)</span><br><span>diff --git a/src/l2tpd_socket.c b/src/l2tpd_socket.c</span><br><span>index efdb482..209a6fa 100644</span><br><span>--- a/src/l2tpd_socket.c</span><br><span>+++ b/src/l2tpd_socket.c</span><br><span>@@ -83,9 +83,7 @@</span><br><span>              return 0;</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   conn_bfd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">-   conn_bfd->when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_fd_setup(conn_bfd, rc, OSMO_FD_READ, conn_bfd->cb, conn_bfd->data, conn_bfd->priv_nr);</span><br><span>         if (osmo_fd_register(conn_bfd) != 0) {</span><br><span>               LOGP(state->log_class, LOGL_ERROR, "Failed to register new connection fd\n");</span><br><span>           close(conn_bfd->fd);</span><br><span>@@ -142,9 +140,7 @@</span><br><span>                return -1;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   bfd->when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-    bfd->cb = l2tp_sock_accept;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+        osmo_fd_setup(bfd, bfd->fd, OSMO_FD_READ, l2tp_sock_accept, NULL, 0);</span><br><span>     rc = osmo_fd_register(bfd);</span><br><span>  if (rc < 0) {</span><br><span>             LOGP(state->log_class, LOGL_ERROR, "Could not register listen fd: %d\n", rc);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-el2tpd/+/20765">change 20765</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-el2tpd/+/20765"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-el2tpd </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id6cbb0058b9eb400d69f556232bbe112f257775b </div>
<div style="display:none"> Gerrit-Change-Number: 20765 </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>