All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	Andrew Baumann <Andrew.Baumann@microsoft.com>,
	Stefan Weil <sw@weilnetz.de>
Subject: [Qemu-devel] [PATCH v2 02/18] io: use bind() to check for IPv4/6 availability
Date: Thu, 10 Mar 2016 17:26:49 +0000	[thread overview]
Message-ID: <1457630825-26638-3-git-send-email-berrange@redhat.com> (raw)
In-Reply-To: <1457630825-26638-1-git-send-email-berrange@redhat.com>

Currently the test-io-channel-socket.c test uses getifaddrs
to see if an IPv4/6 address is present on any host NIC, as
a way to determine if IPv4/6 sockets can be used. This is
problematic because getifaddrs is not available on Win32.

Rather than testing indirectly via getifaddrs, just create
a socket and try to bind() to the loopback address instead.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 tests/test-io-channel-socket.c | 79 +++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 48 deletions(-)

diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c
index 8a34056..6098fee 100644
--- a/tests/test-io-channel-socket.c
+++ b/tests/test-io-channel-socket.c
@@ -22,66 +22,49 @@
 #include "io/channel-socket.h"
 #include "io/channel-util.h"
 #include "io-channel-helpers.h"
-#ifdef HAVE_IFADDRS_H
-#include <ifaddrs.h>
-#endif
 
-static int check_protocol_support(bool *has_ipv4, bool *has_ipv6)
+static int check_bind(struct sockaddr *sa, socklen_t salen, bool *has_proto)
 {
-#ifdef HAVE_IFADDRS_H
-    struct ifaddrs *ifaddr = NULL, *ifa;
-    struct addrinfo hints = { 0 };
-    struct addrinfo *ai = NULL;
-    int gaierr;
-
-    *has_ipv4 = *has_ipv6 = false;
+    int fd;
 
-    if (getifaddrs(&ifaddr) < 0) {
-        g_printerr("Failed to lookup interface addresses: %s\n",
-                   strerror(errno));
+    fd = socket(sa->sa_family, SOCK_STREAM, 0);
+    if (fd < 0) {
         return -1;
     }
 
-    for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-        if (!ifa->ifa_addr) {
-            continue;
-        }
-
-        if (ifa->ifa_addr->sa_family == AF_INET) {
-            *has_ipv4 = true;
-        }
-        if (ifa->ifa_addr->sa_family == AF_INET6) {
-            *has_ipv6 = true;
+    if (bind(fd, sa, salen) < 0) {
+        close(fd);
+        if (errno == EADDRNOTAVAIL) {
+            *has_proto = false;
+            return 0;
         }
+        return -1;
     }
 
-    freeifaddrs(ifaddr);
-
-    hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
-    hints.ai_family = AF_INET6;
-    hints.ai_socktype = SOCK_STREAM;
-
-    gaierr = getaddrinfo("::1", NULL, &hints, &ai);
-    if (gaierr != 0) {
-        if (gaierr == EAI_ADDRFAMILY ||
-            gaierr == EAI_FAMILY ||
-            gaierr == EAI_NONAME) {
-            *has_ipv6 = false;
-        } else {
-            g_printerr("Failed to resolve ::1 address: %s\n",
-                       gai_strerror(gaierr));
-            return -1;
-        }
-    }
+    close(fd);
+    *has_proto = true;
+    return 0;
+}
 
-    freeaddrinfo(ai);
+static int check_protocol_support(bool *has_ipv4, bool *has_ipv6)
+{
+    struct sockaddr_in sin = {
+        .sin_family = AF_INET,
+        .sin_addr = { .s_addr = htonl(INADDR_LOOPBACK) },
+    };
+    struct sockaddr_in6 sin6 = {
+        .sin6_family = AF_INET6,
+        .sin6_addr = IN6ADDR_LOOPBACK_INIT,
+    };
 
-    return 0;
-#else
-    *has_ipv4 = *has_ipv6 = false;
+    if (check_bind((struct sockaddr *)&sin, sizeof(sin), has_ipv4) < 0) {
+        return -1;
+    }
+    if (check_bind((struct sockaddr *)&sin6, sizeof(sin6), has_ipv6) < 0) {
+        return -1;
+    }
 
-    return -1;
-#endif
+    return 0;
 }
 
 
-- 
2.5.0

  parent reply	other threads:[~2016-03-10 17:27 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-10 17:26 [Qemu-devel] [PATCH v2 00/18] Multiple fixes & improvements to QIOChannel & Win32 Daniel P. Berrange
2016-03-10 17:26 ` [Qemu-devel] [PATCH v2 01/18] osdep: fix socket_error() to work with Mingw64 Daniel P. Berrange
2016-03-10 17:26 ` Daniel P. Berrange [this message]
2016-03-10 17:26 ` [Qemu-devel] [PATCH v2 03/18] io: initialize sockets in test program Daniel P. Berrange
2016-03-10 17:26 ` [Qemu-devel] [PATCH v2 04/18] io: bind to socket before creating QIOChannelSocket Daniel P. Berrange
2016-03-10 17:26 ` [Qemu-devel] [PATCH v2 05/18] io: wait for incoming client in socket test Daniel P. Berrange
2016-03-10 17:26 ` [Qemu-devel] [PATCH v2 06/18] io: set correct error object in background reader test thread Daniel P. Berrange
2016-03-10 17:26 ` [Qemu-devel] [PATCH v2 07/18] io: assert errors before asserting content in I/O test Daniel P. Berrange
2016-03-10 17:26 ` [Qemu-devel] [PATCH v2 08/18] io: fix copy+paste mistake in socket error message Daniel P. Berrange
2016-03-10 17:26 ` [Qemu-devel] [PATCH v2 09/18] io: pass HANDLE to g_source_add_poll on Win32 Daniel P. Berrange
2016-03-10 17:26 ` [Qemu-devel] [PATCH v2 10/18] io: introduce qio_channel_create_socket_watch Daniel P. Berrange
2016-03-10 17:26 ` [Qemu-devel] [PATCH v2 11/18] io: use qemu_accept to ensure SOCK_CLOEXEC is set Daniel P. Berrange
2016-03-10 17:26 ` [Qemu-devel] [PATCH v2 12/18] io: remove checking of EWOULDBLOCK Daniel P. Berrange
2016-03-10 17:27 ` [Qemu-devel] [PATCH v2 13/18] io: implement socket watch for win32 using WSAEventSelect+select Daniel P. Berrange
2016-03-10 17:27 ` [Qemu-devel] [PATCH v2 14/18] char: remove qemu_chr_finish_socket_connection method Daniel P. Berrange
2016-03-10 17:27 ` [Qemu-devel] [PATCH v2 15/18] char: remove socket_try_connect method Daniel P. Berrange
2016-03-10 17:27 ` [Qemu-devel] [PATCH v2 16/18] char: remove qemu_chr_open_socket_fd method Daniel P. Berrange
2016-03-10 17:27 ` [Qemu-devel] [PATCH v2 17/18] osdep: add wrappers for socket functions Daniel P. Berrange
2016-03-10 17:27 ` [Qemu-devel] [PATCH v2 18/18] osdep: remove use of socket_error() from all code Daniel P. Berrange
2016-03-10 17:36 ` [Qemu-devel] [PATCH v2 00/18] Multiple fixes & improvements to QIOChannel & Win32 Paolo Bonzini
2016-03-11 23:51   ` Andrew Baumann
2016-03-14 14:10     ` Daniel P. Berrange

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1457630825-26638-3-git-send-email-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=Andrew.Baumann@microsoft.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=sw@weilnetz.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.