diff options
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qdnslookup_unix.cpp | 6 | ||||
| -rw-r--r-- | src/network/kernel/qhostaddress.h | 4 | ||||
| -rw-r--r-- | src/network/kernel/qnetworkinterface_win_p.h | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp index 26834dff57..8c5a0ebdba 100644 --- a/src/network/kernel/qdnslookup_unix.cpp +++ b/src/network/kernel/qdnslookup_unix.cpp @@ -160,9 +160,11 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN Q_CHECK_PTR(ns); state._u._ext.nsaddrs[0] = ns; } +#ifndef __UCLIBC__ // Set nsmap[] to indicate that nsaddrs[0] is an IPv6 address // See: https://sourceware.org/ml/libc-hacker/2002-05/msg00035.html state._u._ext.nsmap[0] = MAXNS + 1; +#endif state._u._ext.nscount6 = 1; ns->sin6_family = AF_INET6; ns->sin6_port = htons(53); @@ -370,11 +372,11 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN } #else - -void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestName, QDnsLookupReply *reply) +void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestName, const QHostAddress &nameserver, QDnsLookupReply *reply) { Q_UNUSED(requestType) Q_UNUSED(requestName) + Q_UNUSED(nameserver) reply->error = QDnsLookup::ResolverError; reply->errorString = tr("Resolver library can't be loaded: No runtime library loading support"); return; diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h index 49032850be..d27a326fb9 100644 --- a/src/network/kernel/qhostaddress.h +++ b/src/network/kernel/qhostaddress.h @@ -85,7 +85,7 @@ public: explicit QHostAddress(quint32 ip4Addr); explicit QHostAddress(quint8 *ip6Addr); explicit QHostAddress(const Q_IPV6ADDR &ip6Addr); - explicit QHostAddress(const sockaddr *sockaddr); + explicit QHostAddress(const sockaddr *address); explicit QHostAddress(const QString &address); QHostAddress(const QHostAddress ©); QHostAddress(SpecialAddress address); @@ -97,7 +97,7 @@ public: void setAddress(quint32 ip4Addr); void setAddress(quint8 *ip6Addr); void setAddress(const Q_IPV6ADDR &ip6Addr); - void setAddress(const sockaddr *sockaddr); + void setAddress(const sockaddr *address); bool setAddress(const QString &address); QAbstractSocket::NetworkLayerProtocol protocol() const; diff --git a/src/network/kernel/qnetworkinterface_win_p.h b/src/network/kernel/qnetworkinterface_win_p.h index d6a3366316..23664647cf 100644 --- a/src/network/kernel/qnetworkinterface_win_p.h +++ b/src/network/kernel/qnetworkinterface_win_p.h @@ -53,6 +53,7 @@ // We mean it. // +#include <QtCore/qglobal.h> #include <winsock2.h> #include <qt_windows.h> #include <time.h> |