<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23933">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">socket: reduce code duplication, introduce socket_helper_tail()<br><br>Common bits shared by various functions (currently setting<br>non-blocking) should not be copy+pasted around.<br><br>Change-Id: I95056940ddc26b65f63eedaeaab6882edaef6317<br>---<br>M src/socket.c<br>1 file changed, 39 insertions(+), 40 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/23933/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 6b8c34a..b44bbc6 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -132,9 +132,26 @@</span><br><span> }</span><br><span> #endif /* HAVE_LIBSCTP*/</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int socket_helper_tail(int sfd, unsigned int flags)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int on = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_SOCK_F_NONBLOCK) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ioctl(sfd, FIONBIO, (unsigned char *)&on) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "cannot set this socket unblocking: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ close(sfd);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int socket_helper(const struct addrinfo *rp, unsigned int flags)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int sfd, on = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int sfd, rc;</span><br><span> </span><br><span> sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);</span><br><span> if (sfd == -1) {</span><br><span>@@ -142,21 +159,17 @@</span><br><span> "unable to create socket: %s\n", strerror(errno));</span><br><span> return sfd;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & OSMO_SOCK_F_NONBLOCK) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ioctl(sfd, FIONBIO, (unsigned char *)&on) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLGLOBAL, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "cannot set this socket unblocking: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- close(sfd);</span><br><span style="color: hsl(0, 100%, 40%);">- sfd = -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = socket_helper_tail(sfd, flags);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return sfd;</span><br><span> }</span><br><span> </span><br><span> static int socket_helper_osa(const struct osmo_sockaddr *addr, uint16_t type, uint8_t proto, unsigned int flags)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int sfd, on = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int sfd, rc;</span><br><span> </span><br><span> sfd = socket(addr->u.sa.sa_family, type, proto);</span><br><span> if (sfd == -1) {</span><br><span>@@ -164,15 +177,11 @@</span><br><span> "unable to create socket: %s\n", strerror(errno));</span><br><span> return sfd;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & OSMO_SOCK_F_NONBLOCK) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ioctl(sfd, FIONBIO, (unsigned char *)&on) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLGLOBAL, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "cannot set this socket unblocking: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- close(sfd);</span><br><span style="color: hsl(0, 100%, 40%);">- sfd = -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = socket_helper_tail(sfd, flags);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return sfd;</span><br><span> }</span><br><span> </span><br><span>@@ -621,7 +630,7 @@</span><br><span> </span><br><span> static int socket_helper_multiaddr(uint16_t family, uint16_t type, uint8_t proto, unsigned int flags)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int sfd, on = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int sfd, rc;</span><br><span> </span><br><span> sfd = socket(family, type, proto);</span><br><span> if (sfd == -1) {</span><br><span>@@ -629,15 +638,11 @@</span><br><span> "Unable to create socket: %s\n", strerror(errno));</span><br><span> return sfd;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & OSMO_SOCK_F_NONBLOCK) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ioctl(sfd, FIONBIO, (unsigned char *)&on) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLGLOBAL, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Cannot set this socket unblocking: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- close(sfd);</span><br><span style="color: hsl(0, 100%, 40%);">- sfd = -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = socket_helper_tail(sfd, flags);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return sfd;</span><br><span> }</span><br><span> </span><br><span>@@ -1218,7 +1223,7 @@</span><br><span> const char *socket_path, unsigned int flags)</span><br><span> {</span><br><span> struct sockaddr_un local;</span><br><span style="color: hsl(0, 100%, 40%);">- int sfd, rc, on = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int sfd, rc;</span><br><span> unsigned int namelen;</span><br><span> </span><br><span> if ((flags & (OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT)) ==</span><br><span>@@ -1258,15 +1263,9 @@</span><br><span> goto err;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & OSMO_SOCK_F_NONBLOCK) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ioctl(sfd, FIONBIO, (unsigned char *)&on) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLGLOBAL, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "cannot set this socket unblocking: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- close(sfd);</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = socket_helper_tail(sfd, flags);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span> </span><br><span> rc = osmo_sock_init_tail(sfd, type, flags);</span><br><span> if (rc < 0) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23933">change 23933</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/+/23933"/><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: I95056940ddc26b65f63eedaeaab6882edaef6317 </div>
<div style="display:none"> Gerrit-Change-Number: 23933 </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>