diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2011-07-01 14:09:46 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-04 14:32:41 +0200 |
| commit | 85869920bb9a4ee45cf4a89e74b1bd3d4ce67eaa (patch) | |
| tree | 1dad7fd8061b8b254833873ed8de35b1a2f8f07d /src/network/kernel/qhostinfo_unix.cpp | |
| parent | 3d5d8b6c4ff08806934a07df77f9387edc4243df (diff) | |
Always assume IPv6 support
It's 2011 baby! And until Qt5 is released probably 2012 :-)
Change-Id: I397aabf25e93c8afb5f562636710985cf0c7acfa
Reviewed-on: http://codereview.qt.nokia.com/1008
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
Reviewed-by: Markus Goetz
Diffstat (limited to 'src/network/kernel/qhostinfo_unix.cpp')
| -rw-r--r-- | src/network/kernel/qhostinfo_unix.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp index 0a56bc309a..37444ae2d9 100644 --- a/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp @@ -149,9 +149,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) // Reverse lookups using getnameinfo are broken on darwin, use gethostbyaddr instead. #if !defined (QT_NO_GETADDRINFO) && !defined (Q_OS_DARWIN) sockaddr_in sa4; -#ifndef QT_NO_IPV6 sockaddr_in6 sa6; -#endif sockaddr *sa = 0; QT_SOCKLEN_T saSize = 0; if (address.protocol() == QAbstractSocket::IPv4Protocol) { @@ -161,7 +159,6 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) sa4.sin_family = AF_INET; sa4.sin_addr.s_addr = htonl(address.toIPv4Address()); } -#ifndef QT_NO_IPV6 else { sa = (sockaddr *)&sa6; saSize = sizeof(sa6); @@ -169,7 +166,6 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) sa6.sin6_family = AF_INET6; memcpy(sa6.sin6_addr.s6_addr, address.toIPv6Address().c, sizeof(sa6.sin6_addr.s6_addr)); } -#endif char hbuf[NI_MAXHOST]; if (sa && getnameinfo(sa, saSize, hbuf, sizeof(hbuf), 0, 0, 0) == 0) @@ -231,7 +227,6 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) if (!addresses.contains(addr)) addresses.append(addr); } -#ifndef QT_NO_IPV6 else if (node->ai_family == AF_INET6) { QHostAddress addr; sockaddr_in6 *sa6 = (sockaddr_in6 *) node->ai_addr; @@ -241,7 +236,6 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) if (!addresses.contains(addr)) addresses.append(addr); } -#endif node = node->ai_next; } if (addresses.isEmpty() && node == 0) { |