Iodine: IPv6

This commit is contained in:
Julian Kranz 2012-01-27 17:09:32 +01:00 committed by Barak A. Pearlmutter
parent 27d8481f9c
commit 168998ec7f

View file

@ -190,7 +190,9 @@ client_set_nameserver(const char *cp, int port)
struct in_addr addr;
struct in6_addr ipv6addr;
if(_v6_connect) {
#ifdef LINUX
if (_v6_connect) {
if (inet_pton(AF_INET6, cp, &ipv6addr) != 1) {
struct addrinfo hints, *servinfo, *p;
int rv;
@ -202,8 +204,8 @@ client_set_nameserver(const char *cp, int port)
errx(1, "error resolving nameserver '%s'...", cp);
}
for(p = servinfo; p != NULL; p = p->ai_next) {
if(p->ai_family == AF_INET6)
for (p = servinfo; p != NULL; p = p->ai_next) {
if (p->ai_family == AF_INET6)
break;
}
@ -212,13 +214,17 @@ client_set_nameserver(const char *cp, int port)
if (p == NULL)
errx(1, "error resolving nameserver '%s'...", cp);
memcpy(&ipv6addr, &((struct sockaddr_in6*)p->ai_addr)->sin6_addr, sizeof(ipv6addr));
memcpy(&ipv6addr, &((struct sockaddr_in6*) p->ai_addr)->sin6_addr,
sizeof(ipv6addr));
fprintf(stderr, "Resolved %s to ", cp);
ipv6_print(&ipv6addr, 0);
freeaddrinfo(servinfo);
} else if (inet_aton(cp, &addr) != 1) {
}
} else
#endif
if (inet_aton(cp, &addr) != 1) {
/* try resolving if a domain is given */
struct hostent *host;
const char *err;