<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcap/+/20782">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use osmo_fd_setup() whenever applicable<br><br>Change-Id: I02097760e7c6a5694290f4b877013aee9d92fd0e<br>---<br>M src/osmo_client_core.c<br>M src/osmo_client_network.c<br>M src/osmo_tls.c<br>3 files changed, 7 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/82/20782/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c</span><br><span>index c49bc1b..025e3a4 100644</span><br><span>--- a/src/osmo_client_core.c</span><br><span>+++ b/src/osmo_client_core.c</span><br><span>@@ -305,10 +305,7 @@</span><br><span>            return 3;</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   client->fd.fd = fd;</span><br><span style="color: hsl(0, 100%, 40%);">-  client->fd.when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-      client->fd.cb = pcap_read_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-        client->fd.data = client;</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_fd_setup(&client->fd, fd, OSMO_FD_READ, pcap_read_cb, client, 0);</span><br><span>        if (osmo_fd_register(&client->fd) != 0) {</span><br><span>             LOGP(DCLIENT, LOGL_ERROR,</span><br><span>                 "Failed to register the fd.\n");</span><br><span>diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c</span><br><span>index c89847d..32d450f 100644</span><br><span>--- a/src/osmo_client_network.c</span><br><span>+++ b/src/osmo_client_network.c</span><br><span>@@ -267,6 +267,7 @@</span><br><span>       int rc;</span><br><span>      uint16_t srv_port;</span><br><span>   int sock_type, sock_proto;</span><br><span style="color: hsl(120, 100%, 40%);">+    unsigned int when;</span><br><span> </span><br><span>       osmo_client_disconnect(conn);</span><br><span> </span><br><span>@@ -279,18 +280,20 @@</span><br><span>            srv_port = conn->srv_port;</span><br><span>                sock_type = SOCK_STREAM;</span><br><span>             sock_proto = IPPROTO_TCP;</span><br><span style="color: hsl(120, 100%, 40%);">+             when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span>                 break;</span><br><span>       case PROTOCOL_IPIP:</span><br><span>          srv_port = 0;</span><br><span>                sock_type = SOCK_RAW;</span><br><span>                sock_proto = IPPROTO_IPIP;</span><br><span style="color: hsl(0, 100%, 40%);">-              conn->wqueue.bfd.when = OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+             when = OSMO_FD_WRITE;</span><br><span>                break;</span><br><span>       default:</span><br><span>             OSMO_ASSERT(0);</span><br><span>              break;</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&conn->wqueue.bfd, -1, when, conn_cb, conn, 0);</span><br><span>         rc = osmo_sock_init2_ofd(&conn->wqueue.bfd, AF_INET, sock_type, sock_proto,</span><br><span>                           conn->source_ip, 0, conn->srv_ip, srv_port,</span><br><span>                            OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_NONBLOCK);</span><br><span>@@ -303,12 +306,6 @@</span><br><span>       }</span><br><span> </span><br><span>        rate_ctr_inc(&conn->client->ctrg->ctr[CLIENT_CTR_CONNECT]);</span><br><span style="color: hsl(0, 100%, 40%);">-        conn->wqueue.bfd.cb = conn_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-       conn->wqueue.bfd.data = conn;</span><br><span style="color: hsl(0, 100%, 40%);">-        if (conn->protocol == PROTOCOL_IPIP)</span><br><span style="color: hsl(0, 100%, 40%);">-         conn->wqueue.bfd.when = OSMO_FD_WRITE;</span><br><span style="color: hsl(0, 100%, 40%);">-       else</span><br><span style="color: hsl(0, 100%, 40%);">-            conn->wqueue.bfd.when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span> }</span><br><span> </span><br><span> void osmo_client_reconnect(struct osmo_pcap_client_conn *conn)</span><br><span>diff --git a/src/osmo_tls.c b/src/osmo_tls.c</span><br><span>index 56fedbb..f1671e9 100644</span><br><span>--- a/src/osmo_tls.c</span><br><span>+++ b/src/osmo_tls.c</span><br><span>@@ -435,9 +435,7 @@</span><br><span>       gnutls_transport_set_int(sess->session, wq->bfd.fd);</span><br><span>   gnutls_handshake_set_timeout(sess->session,</span><br><span>                                       GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);</span><br><span style="color: hsl(0, 100%, 40%);">-      wq->bfd.cb = osmo_tls_client_bfd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- wq->bfd.data = sess;</span><br><span style="color: hsl(0, 100%, 40%);">- wq->bfd.when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_fd_setup(&wq->bfd, wq->bfd.fd, OSMO_FD_READ | OSMO_FD_WRITE, osmo_tls_client_bfd_cb, sess, 0);</span><br><span>        sess->need_handshake = true;</span><br><span>      sess->wqueue = wq;</span><br><span>        return true;</span><br><span>@@ -531,9 +529,7 @@</span><br><span>   gnutls_transport_set_int(sess->session, wq->bfd.fd);</span><br><span>   gnutls_handshake_set_timeout(sess->session,</span><br><span>                                       GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);</span><br><span style="color: hsl(0, 100%, 40%);">-      wq->bfd.cb = osmo_tls_client_bfd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- wq->bfd.data = sess;</span><br><span style="color: hsl(0, 100%, 40%);">- wq->bfd.when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_fd_setup(&wq->bfd, wq->bfd.fd, OSMO_FD_READ | OSMO_FD_WRITE, osmo_tls_client_bfd_cb, sess, 0);</span><br><span>        sess->need_handshake = true;</span><br><span>      sess->wqueue = wq;</span><br><span>        return true;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcap/+/20782">change 20782</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-pcap/+/20782"/><meta itemprop="name" content="View Change"/></div></div>

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