1 files changed, 3 insertions, 108 deletions

diff --git a/src/network/kernel/qhostinfo_win.cpp b/src/network/kernel/qhostinfo_win.cpp
index ef7cff46f1..0b5cc98970 100644
--- a/src/network/kernel/qhostinfo_win.cpp
+++ b/src/network/kernel/qhostinfo_win.cpp
@@ -51,27 +51,10 @@ QT_BEGIN_NAMESPACE
 //#define QHOSTINFO_DEBUG
 
 //###
-#define QT_SOCKLEN_T int
 #ifndef NI_MAXHOST // already defined to 1025 in ws2tcpip.h?
 #define NI_MAXHOST 1024
 #endif
 
-static void translateWSAError(int error, QHostInfo *results)
-{
-    switch (error) {
-    case WSAHOST_NOT_FOUND: //authoritative not found
-    case WSATRY_AGAIN: //non authoritative not found
-    case WSANO_DATA: //valid name, no associated address
-        results->setError(QHostInfo::HostNotFound);
-        results->setErrorString(QHostInfoAgent::tr("Host not found"));
-        return;
-    default:
-        results->setError(QHostInfo::UnknownError);
-        results->setErrorString(QHostInfoAgent::tr("Unknown error (%1)").arg(error));
-        return;
-    }
-}
-
 QHostInfo QHostInfoAgent::fromName(const QString &hostName)
 {
     QSysInfo::machineHostName();        // this initializes ws2_32.dll
@@ -84,98 +67,10 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
 #endif
 
     QHostAddress address;
-    if (address.setAddress(hostName)) {
-        // Reverse lookup
-        sockaddr_in sa4;
-        sockaddr_in6 sa6;
-        sockaddr *sa;
-        QT_SOCKLEN_T saSize;
-        if (address.protocol() == QAbstractSocket::IPv4Protocol) {
-            sa = reinterpret_cast<sockaddr *>(&sa4);
-            saSize = sizeof(sa4);
-            memset(&sa4, 0, sizeof(sa4));
-            sa4.sin_family = AF_INET;
-            sa4.sin_addr.s_addr = htonl(address.toIPv4Address());
-        } else {
-            sa = reinterpret_cast<sockaddr *>(&sa6);
-            saSize = sizeof(sa6);
-            memset(&sa6, 0, sizeof(sa6));
-            sa6.sin6_family = AF_INET6;
-            memcpy(&sa6.sin6_addr, address.toIPv6Address().c, sizeof(sa6.sin6_addr));
-        }
-
-        char hbuf[NI_MAXHOST];
-        if (getnameinfo(sa, saSize, hbuf, sizeof(hbuf), 0, 0, 0) == 0)
-            results.setHostName(QString::fromLatin1(hbuf));
-
-        if (results.hostName().isEmpty())
-            results.setHostName(address.toString());
-        results.setAddresses(QList<QHostAddress>() << address);
-        return results;
-    }
-
-    // IDN support
-    QByteArray aceHostname = QUrl::toAce(hostName);
-    results.setHostName(hostName);
-    if (aceHostname.isEmpty()) {
-        results.setError(QHostInfo::HostNotFound);
-        results.setErrorString(hostName.isEmpty() ? tr("No host name given") : tr("Invalid hostname"));
-        return results;
-    }
+    if (address.setAddress(hostName))
+        return reverseLookup(address);
 
-    addrinfo *res;
-    int err = getaddrinfo(aceHostname.constData(), 0, 0, &res);
-    if (err == 0) {
-        QList<QHostAddress> addresses;
-        for (addrinfo *p = res; p != 0; p = p->ai_next) {
-#ifdef QHOSTINFO_DEBUG
-            qDebug() << "getaddrinfo node: flags:" << p->ai_flags << "family:" << p->ai_family
-                     << "ai_socktype:" << p->ai_socktype << "ai_protocol:" << p->ai_protocol
-                     << "ai_addrlen:" << p->ai_addrlen;
-#endif
-
-            switch (p->ai_family) {
-            case AF_INET: {
-                QHostAddress addr;
-                addr.setAddress(ntohl(reinterpret_cast<sockaddr_in *>(p->ai_addr)->sin_addr.s_addr));
-                if (!addresses.contains(addr))
-                    addresses.append(addr);
-            }
-                break;
-            case AF_INET6: {
-                QHostAddress addr;
-                addr.setAddress(reinterpret_cast<const sockaddr_in6 *>(p->ai_addr)->sin6_addr.s6_addr);
-                if (!addresses.contains(addr))
-                    addresses.append(addr);
-            }
-                break;
-            default:
-                results.setError(QHostInfo::UnknownError);
-                results.setErrorString(tr("Unknown address type"));
-            }
-        }
-        results.setAddresses(addresses);
-        freeaddrinfo(res);
-    } else {
-        translateWSAError(WSAGetLastError(), &results);
-    }
-
-#if defined(QHOSTINFO_DEBUG)
-    if (results.error() != QHostInfo::NoError) {
-        qDebug("QHostInfoAgent::run(): error (%s)",
-               results.errorString().toLatin1().constData());
-    } else {
-        QString tmp;
-        QList<QHostAddress> addresses = results.addresses();
-        for (int i = 0; i < addresses.count(); ++i) {
-            if (i != 0) tmp += QLatin1String(", ");
-            tmp += addresses.at(i).toString();
-        }
-        qDebug("QHostInfoAgent::run(): found %i entries: {%s}",
-               addresses.count(), tmp.toLatin1().constData());
-    }
-#endif
-    return results;
+    return lookup(hostName);
 }
 
 // QString QHostInfo::localDomainName() defined in qnetworkinterface_win.cpp