<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/19737">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">socket: Log proper getaddrinfo() error<br><br>Drop one of the two log lines since it would be a duplicated and anyway<br>it misses context (return code).<br><br>Change-Id: I4620bf86f4bcda58ae85209278ac9ae9a0f3012a<br>---<br>M src/socket.c<br>M tests/socket/socket_test.err<br>2 files changed, 5 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/19737/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 4d6f389..03c932c 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -85,8 +85,8 @@</span><br><span> </span><br><span>      rc = getaddrinfo(host, portbuf, &hints, &result);</span><br><span>    if (rc != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-          LOGP(DLGLOBAL, LOGL_ERROR, "getaddrinfo returned NULL: %s:%u: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                  host, port, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGP(DLGLOBAL, LOGL_ERROR, "getaddrinfo(%s, %u) failed: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                      host, port, gai_strerror(rc));</span><br><span>               return NULL;</span><br><span>         }</span><br><span> </span><br><span>@@ -695,11 +695,8 @@</span><br><span>         }</span><br><span> </span><br><span>        result = addrinfo_helper(family, type, proto, host, port, flags & OSMO_SOCK_F_BIND);</span><br><span style="color: hsl(0, 100%, 40%);">-        if (!result) {</span><br><span style="color: hsl(0, 100%, 40%);">-          LOGP(DLGLOBAL, LOGL_ERROR, "getaddrinfo returned NULL: %s:%u: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                  host, port, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!result)</span><br><span>                 return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span>        for (rp = result; rp != NULL; rp = rp->ai_next) {</span><br><span>                 sfd = socket_helper(rp, flags);</span><br><span>diff --git a/tests/socket/socket_test.err b/tests/socket/socket_test.err</span><br><span>index 3c5dac5..e3d3903 100644</span><br><span>--- a/tests/socket/socket_test.err</span><br><span>+++ b/tests/socket/socket_test.err</span><br><span>@@ -8,5 +8,5 @@</span><br><span> invalid: you have to specify either BIND or CONNECT flags</span><br><span> Invalid v4 vs v6 in local vs remote addresses</span><br><span> Invalid v4 vs v6 in local vs remote addresses</span><br><span style="color: hsl(0, 100%, 40%);">-getaddrinfo returned NULL: ::1:0: Transport endpoint is not connected</span><br><span style="color: hsl(0, 100%, 40%);">-getaddrinfo returned NULL: 127.0.0.1:0: Transport endpoint is not connected</span><br><span style="color: hsl(120, 100%, 40%);">+getaddrinfo(::1, 0) failed: Address family for hostname not supported</span><br><span style="color: hsl(120, 100%, 40%);">+getaddrinfo(127.0.0.1, 0) failed: Address family for hostname not supported</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/19737">change 19737</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/+/19737"/><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: I4620bf86f4bcda58ae85209278ac9ae9a0f3012a </div>
<div style="display:none"> Gerrit-Change-Number: 19737 </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>