<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/15758">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">socket.c: Move glibc workarounds to same place in addrinfo_helper()<br><br>Change-Id: Ifc3a30881f865f88bcfc1307a3c89c1ab79eecd4<br>---<br>M src/socket.c<br>1 file changed, 10 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/15758/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 c50af55..ef3bb58 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -56,7 +56,7 @@</span><br><span> static struct addrinfo *addrinfo_helper(uint16_t family, uint16_t type, uint8_t proto,</span><br><span> const char *host, uint16_t port, bool passive)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct addrinfo hints, *result;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct addrinfo hints, *result, *rp;</span><br><span> char portbuf[6];</span><br><span> int rc;</span><br><span> </span><br><span>@@ -66,6 +66,7 @@</span><br><span> if (type == SOCK_RAW) {</span><br><span> /* Workaround for glibc, that returns EAI_SERVICE (-8) if</span><br><span> * SOCK_RAW and IPPROTO_GRE is used.</span><br><span style="color: hsl(120, 100%, 40%);">+ * http://sourceware.org/bugzilla/show_bug.cgi?id=15015</span><br><span> */</span><br><span> hints.ai_socktype = SOCK_DGRAM;</span><br><span> hints.ai_protocol = IPPROTO_UDP;</span><br><span>@@ -84,6 +85,14 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ for (rp = result; rp != NULL; rp = rp->ai_next) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Workaround for glibc again */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (type == SOCK_RAW) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rp->ai_socktype = SOCK_RAW;</span><br><span style="color: hsl(120, 100%, 40%);">+ rp->ai_protocol = proto;</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> return result;</span><br><span> }</span><br><span> </span><br><span>@@ -199,12 +208,6 @@</span><br><span> return -EINVAL;</span><br><span> </span><br><span> for (rp = result; rp != NULL; rp = rp->ai_next) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Workaround for glibc again */</span><br><span style="color: hsl(0, 100%, 40%);">- if (type == SOCK_RAW) {</span><br><span style="color: hsl(0, 100%, 40%);">- rp->ai_socktype = SOCK_RAW;</span><br><span style="color: hsl(0, 100%, 40%);">- rp->ai_protocol = proto;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> sfd = socket_helper(rp, flags);</span><br><span> if (sfd < 0)</span><br><span> continue;</span><br><span>@@ -253,12 +256,6 @@</span><br><span> }</span><br><span> </span><br><span> for (rp = result; rp != NULL; rp = rp->ai_next) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Workaround for glibc again */</span><br><span style="color: hsl(0, 100%, 40%);">- if (type == SOCK_RAW) {</span><br><span style="color: hsl(0, 100%, 40%);">- rp->ai_socktype = SOCK_RAW;</span><br><span style="color: hsl(0, 100%, 40%);">- rp->ai_protocol = proto;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (sfd < 0) {</span><br><span> sfd = socket_helper(rp, flags);</span><br><span> if (sfd < 0)</span><br><span>@@ -332,12 +329,6 @@</span><br><span> }</span><br><span> </span><br><span> for (rp = result; rp != NULL; rp = rp->ai_next) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Workaround for glibc again */</span><br><span style="color: hsl(0, 100%, 40%);">- if (type == SOCK_RAW) {</span><br><span style="color: hsl(0, 100%, 40%);">- rp->ai_socktype = SOCK_RAW;</span><br><span style="color: hsl(0, 100%, 40%);">- rp->ai_protocol = proto;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> sfd = socket_helper(rp, flags);</span><br><span> if (sfd == -1)</span><br><span> continue;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/15758">change 15758</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/+/15758"/><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: Ifc3a30881f865f88bcfc1307a3c89c1ab79eecd4 </div>
<div style="display:none"> Gerrit-Change-Number: 15758 </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-MessageType: newchange </div>