<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-netif/+/20749">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use osmo_fd_setup() wherever applicable<br><br>Change-Id: Ifb90e00036cc51ef02f3cf4dda1ff7dcd1f8a5b5<br>---<br>M examples/rs232-write.c<br>M examples/stream-client.c<br>M examples/stream-server.c<br>M src/datagram.c<br>M src/rs232.c<br>M src/stream.c<br>6 files changed, 10 insertions(+), 36 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/examples/rs232-write.c b/examples/rs232-write.c</span><br><span>index 508c64a..8639c49 100644</span><br><span>--- a/examples/rs232-write.c</span><br><span>+++ b/examples/rs232-write.c</span><br><span>@@ -376,10 +376,7 @@</span><br><span>                 LOGP(DRS232TEST, LOGL_ERROR, "OOM\n");</span><br><span>                 exit(EXIT_FAILURE);</span><br><span>         }</span><br><span style="color: hsl(0, 100%, 40%);">-        kbd_ofd->fd = STDIN_FILENO;</span><br><span style="color: hsl(0, 100%, 40%);">-        kbd_ofd->when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-        kbd_ofd->data = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-        kbd_ofd->cb = kbd_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+        osmo_fd_setup(kbd_ofd, STDIN_FILENO, OSMO_FD_READ, kbd_cb, NULL, 0);</span><br><span>         rc = osmo_fd_register(kbd_ofd);</span><br><span>      if (rc < 0) {</span><br><span>             LOGP(DRS232TEST, LOGL_ERROR, "FD Register\n");</span><br><span>diff --git a/examples/stream-client.c b/examples/stream-client.c</span><br><span>index fd1a517..428402e 100644</span><br><span>--- a/examples/stream-client.c</span><br><span>+++ b/examples/stream-client.c</span><br><span>@@ -141,10 +141,7 @@</span><br><span>                 LOGP(DSTREAMTEST, LOGL_ERROR, "OOM\n");</span><br><span>            exit(EXIT_FAILURE);</span><br><span>  }</span><br><span style="color: hsl(0, 100%, 40%);">-       kbd_ofd->fd = STDIN_FILENO;</span><br><span style="color: hsl(0, 100%, 40%);">-  kbd_ofd->when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-        kbd_ofd->data = conn;</span><br><span style="color: hsl(0, 100%, 40%);">-        kbd_ofd->cb = kbd_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+      osmo_fd_setup(kbd_ofd, STDIN_FILENO, OSMO_FD_READ, kbd_cb, conn, 0);</span><br><span>         rc = osmo_fd_register(kbd_ofd);</span><br><span>      if (rc < 0) {</span><br><span>             LOGP(DSTREAMTEST, LOGL_ERROR, "FD Register\n");</span><br><span>diff --git a/examples/stream-server.c b/examples/stream-server.c</span><br><span>index 4946e13..e4ca480 100644</span><br><span>--- a/examples/stream-server.c</span><br><span>+++ b/examples/stream-server.c</span><br><span>@@ -165,10 +165,7 @@</span><br><span>                LOGP(DSTREAMTEST, LOGL_ERROR, "OOM\n");</span><br><span>            exit(EXIT_FAILURE);</span><br><span>  }</span><br><span style="color: hsl(0, 100%, 40%);">-       kbd_ofd->fd = STDIN_FILENO;</span><br><span style="color: hsl(0, 100%, 40%);">-  kbd_ofd->when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-        kbd_ofd->data = srv;</span><br><span style="color: hsl(0, 100%, 40%);">- kbd_ofd->cb = kbd_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+      osmo_fd_setup(kbd_ofd, STDIN_FILENO, OSMO_FD_READ, kbd_cb, srv, 0);</span><br><span>  osmo_fd_register(kbd_ofd);</span><br><span> </span><br><span>       LOGP(DSTREAMTEST, LOGL_NOTICE, "Entering main loop on %s\n", osmo_stream_srv_link_get_sockname(srv));</span><br><span>diff --git a/src/datagram.c b/src/datagram.c</span><br><span>index d2233d5..4bc7bed 100644</span><br><span>--- a/src/datagram.c</span><br><span>+++ b/src/datagram.c</span><br><span>@@ -135,11 +135,7 @@</span><br><span>  if (!conn)</span><br><span>           return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        conn->ofd.fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-   conn->ofd.when |= OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-      conn->ofd.priv_nr = 0;       /* XXX */</span><br><span style="color: hsl(0, 100%, 40%);">-       conn->ofd.cb = osmo_dgram_tx_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-  conn->ofd.data = conn;</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_fd_setup(&conn->ofd, -1, OSMO_FD_READ, osmo_dgram_tx_fd_cb, conn, 0);</span><br><span>    INIT_LLIST_HEAD(&conn->tx_queue);</span><br><span> </span><br><span>         return conn;</span><br><span>@@ -309,10 +305,7 @@</span><br><span>  if (!conn)</span><br><span>           return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        conn->ofd.fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-   conn->ofd.when |= OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-      conn->ofd.cb = osmo_dgram_rx_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-     conn->ofd.data = conn;</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_fd_setup(&conn->ofd, -1, OSMO_FD_READ, osmo_dgram_rx_cb, conn, 0);</span><br><span> </span><br><span>   return conn;</span><br><span> }</span><br><span>diff --git a/src/rs232.c b/src/rs232.c</span><br><span>index 4ebc7b9..8ee658a 100644</span><br><span>--- a/src/rs232.c</span><br><span>+++ b/src/rs232.c</span><br><span>@@ -223,9 +223,7 @@</span><br><span>             return rc;</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 = serial_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-      bfd->data = r;</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_fd_setup(bfd, bfd->fd, OSMO_FD_READ, serial_fd_cb, r, 0);</span><br><span> </span><br><span>        rc = osmo_fd_register(bfd);</span><br><span>  if (rc < 0) {</span><br><span>diff --git a/src/stream.c b/src/stream.c</span><br><span>index fc51a49..2bb3e75 100644</span><br><span>--- a/src/stream.c</span><br><span>+++ b/src/stream.c</span><br><span>@@ -680,8 +680,7 @@</span><br><span>                  osmo_stream_cli_reconnect(cli);</span><br><span>              return ret;</span><br><span>  }</span><br><span style="color: hsl(0, 100%, 40%);">-       cli->ofd.fd = ret;</span><br><span style="color: hsl(0, 100%, 40%);">-   cli->ofd.when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+      osmo_fd_setup(&cli->ofd, ret, OSMO_FD_READ | OSMO_FD_WRITE, cli->ofd.cb, cli->ofd.data, cli->ofd.priv_nr);</span><br><span> </span><br><span>       if (cli->flags & OSMO_STREAM_CLI_F_NODELAY) {</span><br><span>                 ret = setsockopt_nodelay(cli->ofd.fd, cli->proto, 1);</span><br><span>@@ -753,8 +752,7 @@</span><br><span>            osmo_stream_cli_reconnect(cli);</span><br><span>              return ret;</span><br><span>  }</span><br><span style="color: hsl(0, 100%, 40%);">-       cli->ofd.fd = ret;</span><br><span style="color: hsl(0, 100%, 40%);">-   cli->ofd.when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+      osmo_fd_setup(&cli->ofd, ret, OSMO_FD_READ | OSMO_FD_WRITE, cli->ofd.cb, cli->ofd.data, cli->ofd.priv_nr);</span><br><span> </span><br><span>       if (cli->flags & OSMO_STREAM_CLI_F_NODELAY) {</span><br><span>                 ret = setsockopt_nodelay(cli->ofd.fd, cli->proto, 1);</span><br><span>@@ -902,10 +900,7 @@</span><br><span>           return NULL;</span><br><span> </span><br><span>     link->proto = IPPROTO_TCP;</span><br><span style="color: hsl(0, 100%, 40%);">-   link->ofd.fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-   link->ofd.when |= OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span style="color: hsl(0, 100%, 40%);">-      link->ofd.cb = osmo_stream_srv_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-        link->ofd.data = link;</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_fd_setup(&link->ofd, -1, OSMO_FD_READ | OSMO_FD_WRITE, osmo_stream_srv_fd_cb, link, 0);</span><br><span> </span><br><span>      return link;</span><br><span> }</span><br><span>@@ -1206,10 +1201,7 @@</span><br><span>           return NULL;</span><br><span>         }</span><br><span>    conn->srv = link;</span><br><span style="color: hsl(0, 100%, 40%);">-    conn->ofd.fd = fd;</span><br><span style="color: hsl(0, 100%, 40%);">-   conn->ofd.data = conn;</span><br><span style="color: hsl(0, 100%, 40%);">-       conn->ofd.cb = osmo_stream_srv_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-   conn->ofd.when = OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_fd_setup(&conn->ofd, fd, OSMO_FD_READ, osmo_stream_srv_cb, conn, 0);</span><br><span>     conn->cb = cb;</span><br><span>    conn->closed_cb = closed_cb;</span><br><span>      conn->data = data;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-netif/+/20749">change 20749</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/libosmo-netif/+/20749"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ifb90e00036cc51ef02f3cf4dda1ff7dcd1f8a5b5 </div>
<div style="display:none"> Gerrit-Change-Number: 20749 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>