<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcap/+/23874">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">client: Ensure the "file" header is sent on connect<br><br>A non-blocking STREAM socket connect() will mark the socket as<br>write-able once the connection succeeds.  However, as we first<br>call osmo_fd_setup() and then osmo_sock_init2_ofd(), the latter<br>will force the 'when' to OSMO_FD_READ and hence the write callback<br>will not be called.<br><br>Change-Id: I44c484b48966a985a9b85fb16122a17df5666bc1<br>---<br>M src/osmo_client_network.c<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c</span><br><span>index c6de579..e5616af 100644</span><br><span>--- a/src/osmo_client_network.c</span><br><span>+++ b/src/osmo_client_network.c</span><br><span>@@ -293,10 +293,8 @@</span><br><span>                break;</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   osmo_fd_setup(&conn->wqueue.bfd, -1, when, conn_cb, conn, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-    rc = osmo_sock_init2_ofd(&conn->wqueue.bfd, AF_INET, sock_type, sock_proto,</span><br><span style="color: hsl(0, 100%, 40%);">-                              conn->source_ip, 0, conn->srv_ip, srv_port,</span><br><span style="color: hsl(0, 100%, 40%);">-                               OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_NONBLOCK);</span><br><span style="color: hsl(120, 100%, 40%);">+       rc = osmo_sock_init2(AF_INET, sock_type, sock_proto, conn->source_ip, 0, conn->srv_ip, srv_port,</span><br><span style="color: hsl(120, 100%, 40%);">+                             OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_NONBLOCK);</span><br><span>         if (rc < 0) {</span><br><span>             LOGP(DCLIENT, LOGL_ERROR,</span><br><span>                 "Failed to connect conn=%s to %s:%d\n",</span><br><span>@@ -304,6 +302,8 @@</span><br><span>                 lost_connection(conn);</span><br><span>               return;</span><br><span>      }</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_fd_setup(&conn->wqueue.bfd, rc, when, conn_cb, conn, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_fd_register(&conn->wqueue.bfd);</span><br><span> </span><br><span>      rate_ctr_inc(&conn->client->ctrg->ctr[CLIENT_CTR_CONNECT]);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcap/+/23874">change 23874</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/+/23874"/><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: I44c484b48966a985a9b85fb16122a17df5666bc1 </div>
<div style="display:none"> Gerrit-Change-Number: 23874 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>