<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23985">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo_sock_*_ofd(): Mark OSMO_FD_WRITE on non-blocking connect()<br><br>When we perform a non-blocking<br><br>Change-Id: I22964c5d5da849abcd97a900bd86ab5b4ada05da<br>---<br>M src/socket.c<br>1 file changed, 14 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/23985/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/socket.c b/src/socket.c</span><br><span>index 59d0876..34972b8 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -972,11 +972,12 @@</span><br><span> /*! fill \ref osmo_fd for a give sfd</span><br><span> * \param[out] ofd file descriptor (will be filled in)</span><br><span> * \param[in] sfd socket file descriptor</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] flags flags like \ref OSMO_SOCK_F_CONNECT</span><br><span> * \returns socket fd on success; negative on error</span><br><span> *</span><br><span> * This function fills the \a ofd structure.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-static inline int osmo_fd_init_ofd(struct osmo_fd *ofd, int sfd)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline int osmo_fd_init_ofd(struct osmo_fd *ofd, int sfd, unsigned int flags)</span><br><span> {</span><br><span> int rc;</span><br><span> </span><br><span>@@ -986,6 +987,14 @@</span><br><span> ofd->fd = sfd;</span><br><span> ofd->when = OSMO_FD_READ;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* if we're doing a non-blocking connect, the completion will be signaled</span><br><span style="color: hsl(120, 100%, 40%);">+ * by marking the fd as WRITE-able. So in this exceptional case, we're</span><br><span style="color: hsl(120, 100%, 40%);">+ * also interested in when the socket becomes write-able */</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((flags & (OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_NONBLOCK)) ==</span><br><span style="color: hsl(120, 100%, 40%);">+ (OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_NONBLOCK)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ofd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> rc = osmo_fd_register(ofd);</span><br><span> if (rc < 0) {</span><br><span> close(sfd);</span><br><span>@@ -1011,7 +1020,7 @@</span><br><span> int osmo_sock_init_ofd(struct osmo_fd *ofd, int family, int type, int proto,</span><br><span> const char *host, uint16_t port, unsigned int flags)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_fd_init_ofd(ofd, osmo_sock_init(family, type, proto, host, port, flags));</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_fd_init_ofd(ofd, osmo_sock_init(family, type, proto, host, port, flags), flags);</span><br><span> }</span><br><span> </span><br><span> /*! Initialize a socket and fill \ref osmo_fd</span><br><span>@@ -1034,14 +1043,14 @@</span><br><span> const char *remote_host, uint16_t remote_port, unsigned int flags)</span><br><span> {</span><br><span> return osmo_fd_init_ofd(ofd, osmo_sock_init2(family, type, proto, local_host,</span><br><span style="color: hsl(0, 100%, 40%);">- local_port, remote_host, remote_port, flags));</span><br><span style="color: hsl(120, 100%, 40%);">+ local_port, remote_host, remote_port, flags), flags);</span><br><span> }</span><br><span> </span><br><span> int osmo_sock_init_osa_ofd(struct osmo_fd *ofd, int type, int proto,</span><br><span> const struct osmo_sockaddr *local,</span><br><span> const struct osmo_sockaddr *remote, unsigned int flags)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_fd_init_ofd(ofd, osmo_sock_init_osa(type, proto, local, remote, flags));</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_fd_init_ofd(ofd, osmo_sock_init_osa(type, proto, local, remote, flags), flags);</span><br><span> }</span><br><span> </span><br><span> /*! Initialize a socket and fill \ref sockaddr</span><br><span>@@ -1313,7 +1322,7 @@</span><br><span> int osmo_sock_unix_init_ofd(struct osmo_fd *ofd, uint16_t type, uint8_t proto,</span><br><span> const char *socket_path, unsigned int flags)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_fd_init_ofd(ofd, osmo_sock_unix_init(type, proto, socket_path, flags));</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_fd_init_ofd(ofd, osmo_sock_unix_init(type, proto, socket_path, flags), flags);</span><br><span> }</span><br><span> </span><br><span> /*! Get the IP and/or port number on socket in separate string buffers.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23985">change 23985</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/libosmocore/+/23985"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I22964c5d5da849abcd97a900bd86ab5b4ada05da </div>
<div style="display:none"> Gerrit-Change-Number: 23985 </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>