<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10289">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">socket: do not set SO_REUSEADDR for IPPROTO_UDP<br><br>When UDP is used as protocol (proto=IPPROTO_DUP), then we should not set<br>SO_REUSEADDR in the socket option. Because if we do, we allow two<br>processes to bind on the same UDP port. The errornous situation will be<br>undetectable to both applications. So lets only set SO_REUSEADDR when we<br>do not use UDP.<br><br>- Add check if we use UDP, if yes do not set SO_REUSEADDR<br><br>Change-Id: I4a8ffb8d598aca88801a4a0322944d7cdd8d4047<br>Related: OS#3441<br>---<br>M src/socket.c<br>1 file changed, 33 insertions(+), 25 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 0a4e34c..210dbf9 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -209,16 +209,20 @@</span><br><span> if (sfd < 0)</span><br><span> continue;</span><br><span> </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%);">- 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%);">- local_host, local_port, strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- close(sfd);</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (proto != IPPROTO_UDP) {</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%);">+ 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%);">+ local_host, local_port,</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%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (bind(sfd, rp->ai_addr, rp->ai_addrlen) == -1) {</span><br><span> LOGP(DLGLOBAL, LOGL_ERROR, "unable to bind socket: %s:%u: %s\n",</span><br><span> local_host, local_port, strerror(errno));</span><br><span>@@ -345,15 +349,17 @@</span><br><span> continue;</span><br><span> }</span><br><span> } else {</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%);">- 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%);">- host, port, strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- close(sfd);</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (proto != IPPROTO_UDP) {</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%);">+ 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%);">+ host, port, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ close(sfd);</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> if (bind(sfd, rp->ai_addr, rp->ai_addrlen) == -1) {</span><br><span> LOGP(DLGLOBAL, LOGL_ERROR, "unable to bind socket:"</span><br><span>@@ -373,13 +379,15 @@</span><br><span> return -ENODEV;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</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: %s:%u: %s\n", host, port,</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 = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (proto != IPPROTO_UDP) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</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: %s:%u: %s\n", host,</span><br><span style="color: hsl(120, 100%, 40%);">+ port, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ close(sfd);</span><br><span style="color: hsl(120, 100%, 40%);">+ sfd = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> rc = osmo_sock_init_tail(sfd, type, flags);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10289">change 10289</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/10289"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I4a8ffb8d598aca88801a4a0322944d7cdd8d4047 </div>
<div style="display:none"> Gerrit-Change-Number: 10289 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>