[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 02/21] io: use bind() to check for IPv4/6 availab
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v1 02/21] io: use bind() to check for IPv4/6 availability |
Date: |
Wed, 9 Mar 2016 17:28:05 +0000 |
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.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
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
- [Qemu-devel] [PATCH v1 00/21] Multiple fixes & improves to QIOChannel & Win32, Daniel P. Berrange, 2016/03/09
- [Qemu-devel] [PATCH v1 02/21] io: use bind() to check for IPv4/6 availability,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v1 03/21] io: initialize sockets in test program, Daniel P. Berrange, 2016/03/09
- [Qemu-devel] [PATCH v1 01/21] osdep: fix socket_error() to work with Mingw64, Daniel P. Berrange, 2016/03/09
- [Qemu-devel] [PATCH v1 04/21] io: bind to socket before creating QIOChannelSocket, Daniel P. Berrange, 2016/03/09
- [Qemu-devel] [PATCH v1 05/21] io: wait for incoming client in socket test, Daniel P. Berrange, 2016/03/09
- [Qemu-devel] [PATCH v1 06/21] io: set correct error object in background reader test thread, Daniel P. Berrange, 2016/03/09
- [Qemu-devel] [PATCH v1 07/21] io: assert errors before asserting content in I/O test, Daniel P. Berrange, 2016/03/09
- [Qemu-devel] [PATCH v1 08/21] io: fix copy+paste mistake in socket error message, Daniel P. Berrange, 2016/03/09
- [Qemu-devel] [PATCH v1 09/21] io: add missing EWOULDBLOCK checks in Win32 I/O code paths, Daniel P. Berrange, 2016/03/09