<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/15818">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">socket: Remove unneeded condition check in osmo_sock_init2_multiaddr()<br><br>Since we return error at the start of the function if proto !=<br>IPPROTO_SCTP, it makes no sense to check for proto != IPPROTO_UDP later<br>on.<br><br>Fixes: CID#205088<br>Change-Id: Ibba7eacaa9debb77d536d47dc85170c5ee79e479<br>---<br>M src/socket.c<br>1 file changed, 15 insertions(+), 15 deletions(-)<br><br></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 542c76e..4752881 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -467,21 +467,21 @@</span><br><span> return sfd;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (proto != IPPROTO_UDP || flags & OSMO_SOCK_F_UDP_REUSEADDR) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR,</span><br><span style="color: hsl(0, 100%, 40%);">- &on, sizeof(on));</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts, local_hosts_cnt);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLGLOBAL, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "cannot setsockopt socket:"</span><br><span style="color: hsl(0, 100%, 40%);">- " %s:%u: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- strbuf, local_port,</span><br><span style="color: hsl(0, 100%, 40%);">- strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < local_hosts_cnt; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- freeaddrinfo(result[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- close(sfd);</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Since so far we only allow IPPROTO_SCTP in this function,</span><br><span style="color: hsl(120, 100%, 40%);">+ no need to check below for "proto != IPPROTO_UDP || flags & OSMO_SOCK_F_UDP_REUSEADDR" */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR,</span><br><span style="color: hsl(120, 100%, 40%);">+ &on, sizeof(on));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts, local_hosts_cnt);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "cannot setsockopt socket:"</span><br><span style="color: hsl(120, 100%, 40%);">+ " %s:%u: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ strbuf, local_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < local_hosts_cnt; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ freeaddrinfo(result[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ close(sfd);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span> }</span><br><span> </span><br><span> /* Build array of addresses taking first of same family for each host.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/15818">change 15818</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/+/15818"/><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: Ibba7eacaa9debb77d536d47dc85170c5ee79e479 </div>
<div style="display:none"> Gerrit-Change-Number: 15818 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </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-MessageType: merged </div>