Changeset 160

Timestamp:

Sep 5, 2009, 2:57:17 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

network: Ported QHostInfo and QNetworkInterface to OS/2.

Location:

trunk/src/network

Files:

• kernel/kernel.pri (modified) (1 diff)
• kernel/qhostinfo_os2.cpp (copied) (copied from trunk/src/network/kernel/qhostinfo_unix.cpp ) (9 diffs)
• kernel/qnetworkinterface_os2.cpp (copied) (copied from trunk/src/network/kernel/qnetworkinterface_unix.cpp ) (9 diffs)
• network.pro (modified) (1 diff)

trunk/src/network/kernel/kernel.pri ¶

@@ -23 +23 @@
 unix:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp
 win32:SOURCES += kernel/qhostinfo_win.cpp kernel/qnetworkinterface_win.cpp
+os2:SOURCES += kernel/qhostinfo_os2.cpp kernel/qnetworkinterface_os2.cpp
 
 mac:LIBS+= -framework SystemConfiguration

trunk/src/network/kernel/qhostinfo_os2.cpp ¶

@@ -3 +3 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** Copyright (C) 2009 netlabs.org. OS/2 parts.
 **
 ** This file is part of the QtNetwork module of the Qt Toolkit.
@@ -44 +46 @@
 static const int RESOLVER_TIMEOUT = 2000;
 
+#include "qt_os2.h"
 #include "qplatformdefs.h"
 
@@ -52 +55 @@
 #include <qurl.h>
 #include <qfile.h>
-#include <private/qmutexpool_p.h>
 
 extern "C" {
@@ -61 +63 @@
 }
 
-#if defined (QT_NO_GETADDRINFO)
 #include <qmutex.h>
 QT_BEGIN_NAMESPACE
 Q_GLOBAL_STATIC(QMutex, getHostByNameMutex)
 QT_END_NAMESPACE
-#endif
 
 QT_BEGIN_NAMESPACE
@@ -75 +75 @@
 #endif
 
-// HP-UXi has a bug in getaddrinfo(3) that makes it thread-unsafe
-// with this flag. So disable it in that platform.
-#if defined(AI_ADDRCONFIG) && !defined(Q_OS_HPUX)
-#  define Q_ADDRCONFIG          AI_ADDRCONFIG
-#endif
-
-typedef struct __res_state *res_state_ptr;
-
-typedef int (*res_init_proto)(void);
-static res_init_proto local_res_init = 0;
-typedef int (*res_ninit_proto)(res_state_ptr);
-static res_ninit_proto local_res_ninit = 0;
-typedef void (*res_nclose_proto)(res_state_ptr);
-static res_nclose_proto local_res_nclose = 0;
-static res_state_ptr local_res = 0;
-
-static void resolveLibrary()
-{
-#ifndef QT_NO_LIBRARY
-    QLibrary lib(QLatin1String("resolv"));
-    if (!lib.load())
-        return;
-
-    local_res_init = res_init_proto(lib.resolve("__res_init"));
-    if (!local_res_init)
-        local_res_init = res_init_proto(lib.resolve("res_init"));
-
-    local_res_ninit = res_ninit_proto(lib.resolve("__res_ninit"));
-    if (!local_res_ninit)
-        local_res_ninit = res_ninit_proto(lib.resolve("res_ninit"));
-
-    if (!local_res_ninit) {
-        // if we can't get a thread-safe context, we have to use the global _res state
-        local_res = res_state_ptr(lib.resolve("_res"));
-    } else {
-        local_res_nclose = res_nclose_proto(lib.resolve("res_nclose"));
-        if (!local_res_nclose)
-            local_res_nclose = res_nclose_proto(lib.resolve("__res_nclose"));
-        if (!local_res_nclose)
-            local_res_ninit = 0;
-    }
-#endif
-}
-
 QHostInfo QHostInfoAgent::fromName(const QString &hostName)
 {
@@ -129 +85 @@
 #endif
 
-    // Load res_init on demand.
-    static volatile bool triedResolve = false;
-    if (!triedResolve) {
-#ifndef QT_NO_THREAD
-        QMutexLocker locker(QMutexPool::globalInstanceGet(&local_res_init));
-#endif
-        if (!triedResolve) {
-            resolveLibrary();
-            triedResolve = true;
-        }
-    }
-
-    // If res_init is available, poll it.
-    if (local_res_init)
-        local_res_init();
-
     QHostAddress address;
     if (address.setAddress(hostName)) {
         // Reverse lookup
-// 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) {
-            sa = (sockaddr *)&sa4;
-            saSize = sizeof(sa4);
-            memset(&sa4, 0, sizeof(sa4));
-            sa4.sin_family = AF_INET;
-            sa4.sin_addr.s_addr = htonl(address.toIPv4Address());
-        }
-#ifndef QT_NO_IPV6
-        else {
-            sa = (sockaddr *)&sa6;
-            saSize = sizeof(sa6);
-            memset(&sa6, 0, sizeof(sa6));
-            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) {
-            results.setError(QHostInfo::HostNotFound);
-            results.setErrorString(tr("Host not found"));
-            return results;
-        }
-        results.setHostName(QString::fromLatin1(hbuf));
-#else
         in_addr_t inetaddr = inet_addr(hostName.toLatin1().constData());
         struct hostent *ent = gethostbyaddr((const char *)&inetaddr, sizeof(inetaddr), AF_INET);
@@ -189 +96 @@
         }
         results.setHostName(QString::fromLatin1(ent->h_name));
-#endif
-    }
-
-#if !defined (QT_NO_GETADDRINFO)
-    // Call getaddrinfo, and place all IPv4 addresses at the start and
-    // the IPv6 addresses at the end of the address list in results.
-    addrinfo *res = 0;
-    struct addrinfo hints;
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = PF_UNSPEC;
-#ifdef Q_ADDRCONFIG
-    hints.ai_flags = Q_ADDRCONFIG;
-#endif
-
-    int result = getaddrinfo(hostName.toLatin1().constData(), 0, &hints, &res);
-# ifdef Q_ADDRCONFIG
-    if (result == EAI_BADFLAGS) {
-        // if the lookup failed with AI_ADDRCONFIG set, try again without it
-        hints.ai_flags = 0;
-        result = getaddrinfo(hostName.toLatin1().constData(), 0, &hints, &res);
-    }
-# endif
-
-    if (result == 0) {
-        addrinfo *node = res;
-        QList<QHostAddress> addresses;
-        while (node) {
-            if (node->ai_family == AF_INET) {
-                QHostAddress addr;
-                addr.setAddress(ntohl(((sockaddr_in *) node->ai_addr)->sin_addr.s_addr));
-                if (!addresses.contains(addr))
-                    addresses.append(addr);
-            }
-#ifndef QT_NO_IPV6
-            else if (node->ai_family == AF_INET6) {
-                QHostAddress addr;
-                addr.setAddress(((sockaddr_in6 *) node->ai_addr)->sin6_addr.s6_addr);
-                if (!addresses.contains(addr))
-                    addresses.append(addr);
-            }
-#endif
-            node = node->ai_next;
-        }
-        if (addresses.isEmpty() && node == 0) {
-            // Reached the end of the list, but no addresses were found; this
-            // means the list contains one or more unknown address types.
-            results.setError(QHostInfo::UnknownError);
-            results.setErrorString(tr("Unknown address type"));
-        }
-
-        results.setAddresses(addresses);
-        freeaddrinfo(res);
-    } else if (result == EAI_NONAME
-               || result ==  EAI_FAIL
-#ifdef EAI_NODATA
-               // EAI_NODATA is deprecated in RFC 3493
-               || result == EAI_NODATA
-#endif
-               ) {
-        results.setError(QHostInfo::HostNotFound);
-        results.setErrorString(tr("Host not found"));
-    } else {
-        results.setError(QHostInfo::UnknownError);
-        results.setErrorString(QString::fromLocal8Bit(gai_strerror(result)));
-    }
-
-#else
+    }
+
     // Fall back to gethostbyname for platforms that don't define
     // getaddrinfo. gethostbyname does not support IPv6, and it's not
@@ -285 +127 @@
         results.setErrorString(tr("Unknown error"));
     }
-#endif //  !defined (QT_NO_GETADDRINFO)
 
 #if defined(QHOSTINFO_DEBUG)
@@ -317 +158 @@
 QString QHostInfo::localDomainName()
 {
-    resolveLibrary();
-    if (local_res_ninit) {
-        // using thread-safe version
-        res_state_ptr state = res_state_ptr(qMalloc(sizeof(*state)));
-        memset(state, 0, sizeof(*state));
-        local_res_ninit(state);
-        QString domainName = QUrl::fromAce(state->defdname);
-        if (domainName.isEmpty())
-            domainName = QUrl::fromAce(state->dnsrch[0]);
-        local_res_nclose(state);
-        qFree(state);
-
-        return domainName;
-    }
-
-    if (local_res_init && local_res) {
-        // using thread-unsafe version
-
-#if defined(QT_NO_GETADDRINFO)
-        // We have to call res_init to be sure that _res was initialized
-        // So, for systems without getaddrinfo (which is thread-safe), we lock the mutex too
+    // We have to call res_init to be sure that _res was initialized
+    // So, for systems without getaddrinfo (which is thread-safe), we lock the mutex too
+    {
         QMutexLocker locker(::getHostByNameMutex());
-#endif
-        local_res_init();
-        QString domainName = QUrl::fromAce(local_res->defdname);
-        if (domainName.isEmpty())
-            domainName = QUrl::fromAce(local_res->dnsrch[0]);
-        return domainName;
+        if ((_res.options & RES_INIT) || res_init() == 0) {
+            QString domainName = QUrl::fromAce(_res.defdname);
+            if (domainName.isEmpty())
+                domainName = QUrl::fromAce(_res.dnsrch[0]);
+            return domainName;
+        }
     }
 
     // nothing worked, try doing it by ourselves:
     QFile resolvconf;
-#if defined(_PATH_RESCONF)
-    resolvconf.setFileName(QFile::decodeName(_PATH_RESCONF));
-#else
-    resolvconf.setFileName(QLatin1String("/etc/resolv.conf"));
-#endif
+    QByteArray etc = qgetenv("ETC");
+    if (etc.isEmpty()) {
+        etc = "x:\\MPTN\\ETC";
+        ULONG boot = 0;
+        DosQuerySysInfo(QSV_BOOT_DRIVE, QSV_BOOT_DRIVE, (PVOID)boot, sizeof(boot));
+        etc[0] = (char)(boot + 'A' - 1);
+    }
+    // currently, resolv takes precedence over resolv2 assuming that resolv
+    // is created for PPP connections and therefore should override resolv2
+    // which is created for permanent LAN connections.
+    resolvconf.setFileName(QFile::decodeName(etc) + QLatin1String("\\resolv"));
+    if (!resolvconf.exists())
+        resolvconf.setFileName(QFile::decodeName(etc)+ QLatin1String("\\resolv2"));
+
     if (!resolvconf.open(QIODevice::ReadOnly))
         return QString();       // failure

trunk/src/network/kernel/qnetworkinterface_os2.cpp ¶

@@ -3 +3 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** Copyright (C) 2009 netlabs.org. OS/2 parts.
 **
 ** This file is part of the QtNetwork module of the Qt Toolkit.
@@ -47 +49 @@
 #ifndef QT_NO_NETWORKINTERFACE
 
-#define IP_MULTICAST    // make AIX happy and define IFF_MULTICAST
-
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#ifdef Q_OS_SOLARIS
-# include <sys/sockio.h>
-#endif
+#include <sys/sockio.h>
 #include <net/if.h>
-
-#ifndef QT_NO_GETIFADDRS
-# include <ifaddrs.h>
-#endif
-
-#ifdef QT_LINUXBASE
-#  include <arpa/inet.h>
-#  ifndef SIOCGIFBRDADDR
-#    define SIOCGIFBRDADDR 0x8919
-#  endif
-#endif // QT_LINUXBASE
 
 #include <qplatformdefs.h>
@@ -80 +67 @@
     if (sa->sa_family == AF_INET)
         address.setAddress(htonl(((sockaddr_in *)sa)->sin_addr.s_addr));
-#ifndef QT_NO_IPV6
-    else if (sa->sa_family == AF_INET6)
-        address.setAddress(((sockaddr_in6 *)sa)->sin6_addr.s6_addr);
-#endif
     return address;
 
@@ -105 +88 @@
 }
 
-#ifdef QT_NO_GETIFADDRS
-// getifaddrs not available
-
 static const int STORAGEBUFFER_GROWTH = 256;
 
@@ -113 +93 @@
 {
     QSet<QByteArray> result;
-#ifdef QT_NO_IPV6IFNAME
     QByteArray storageBuffer;
     struct ifconf interfaceList;
@@ -148 +127 @@
 
     return result;
-#else
-    Q_UNUSED(socket);
-
-    // use if_nameindex
-    struct if_nameindex *interfaceList = ::if_nameindex();
-    for (struct if_nameindex *ptr = interfaceList; ptr && ptr->if_name; ++ptr)
-        result << ptr->if_name;
-
-    if_freenameindex(interfaceList);
-    return result;
-#endif
 }
 
@@ -167 +135 @@
     int ifindex = 0;
 
-#ifndef QT_NO_IPV6IFNAME
-    // Get the interface index
-    ifindex = if_nametoindex(req.ifr_name);
-
-    // find the interface data
-    QList<QNetworkInterfacePrivate *>::Iterator if_it = interfaces.begin();
-    for ( ; if_it != interfaces.end(); ++if_it)
-        if ((*if_it)->index == ifindex) {
-            // existing interface
-            iface = *if_it;
-            break;
-        }
-#else
     // Search by name
     QList<QNetworkInterfacePrivate *>::Iterator if_it = interfaces.begin();
@@ -188 +143 @@
             break;
         }
-#endif
 
     if (!iface) {
@@ -274 +228 @@
 }
 
-#else
-// use getifaddrs
-
-// platform-specific defs:
-# ifdef Q_OS_LINUX
-QT_BEGIN_INCLUDE_NAMESPACE
-#  include <features.h>
-QT_END_INCLUDE_NAMESPACE
-# endif
-
-# if defined(Q_OS_LINUX) &&  __GLIBC__ - 0 >= 2 && __GLIBC_MINOR__ - 0 >= 1
-#  include <netpacket/packet.h>
-
-static QList<QNetworkInterfacePrivate *> createInterfaces(ifaddrs *rawList)
-{
-    QList<QNetworkInterfacePrivate *> interfaces;
-
-    for (ifaddrs *ptr = rawList; ptr; ptr = ptr->ifa_next) {
-        if ( !ptr->ifa_addr )
-            continue;
-
-        // Get the interface index
-        int ifindex = if_nametoindex(ptr->ifa_name);
-
-        // on Linux we use AF_PACKET and sockaddr_ll to obtain hHwAddress
-        QList<QNetworkInterfacePrivate *>::Iterator if_it = interfaces.begin();
-        for ( ; if_it != interfaces.end(); ++if_it)
-            if ((*if_it)->index == ifindex) {
-                // this one has been added already
-                if ( ptr->ifa_addr->sa_family == AF_PACKET
-                        && (*if_it)->hardwareAddress.isEmpty()) {
-                    sockaddr_ll *sll = (sockaddr_ll *)ptr->ifa_addr;
-                    (*if_it)->hardwareAddress = (*if_it)->makeHwAddress(sll->sll_halen, (uchar*)sll->sll_addr);
-                }
-                break;
-            }
-        if ( if_it != interfaces.end() ) 
-            continue;
-        
-        QNetworkInterfacePrivate *iface = new QNetworkInterfacePrivate;
-        interfaces << iface;
-        iface->index = ifindex;
-        iface->name = QString::fromLatin1(ptr->ifa_name);
-        iface->flags = convertFlags(ptr->ifa_flags);
-
-        if ( ptr->ifa_addr->sa_family == AF_PACKET ) {
-            sockaddr_ll *sll = (sockaddr_ll *)ptr->ifa_addr;
-            iface->hardwareAddress = iface->makeHwAddress(sll->sll_halen, (uchar*)sll->sll_addr);
-        }
-    }
-
-    return interfaces;
-}
-
-# elif defined(Q_OS_BSD4)
-QT_BEGIN_INCLUDE_NAMESPACE
-#  include <net/if_dl.h>
-QT_END_INCLUDE_NAMESPACE
-
-static QList<QNetworkInterfacePrivate *> createInterfaces(ifaddrs *rawList)
-{
-    QList<QNetworkInterfacePrivate *> interfaces;
-
-    // on NetBSD we use AF_LINK and sockaddr_dl
-    // scan the list for that family
-    for (ifaddrs *ptr = rawList; ptr; ptr = ptr->ifa_next)
-        if (ptr->ifa_addr && ptr->ifa_addr->sa_family == AF_LINK) {
-            QNetworkInterfacePrivate *iface = new QNetworkInterfacePrivate;
-            interfaces << iface;
-
-            sockaddr_dl *sdl = (sockaddr_dl *)ptr->ifa_addr;
-            iface->index = sdl->sdl_index;
-            iface->name = QString::fromLatin1(ptr->ifa_name);
-            iface->flags = convertFlags(ptr->ifa_flags);
-            iface->hardwareAddress = iface->makeHwAddress(sdl->sdl_alen, (uchar*)LLADDR(sdl));
-        }
-
-    return interfaces;
-}
-
-# else  // Generic version
-
-static QList<QNetworkInterfacePrivate *> createInterfaces(ifaddrs *rawList)
-{
-    QList<QNetworkInterfacePrivate *> interfaces;
-
-    // make sure there's one entry for each interface
-    for (ifaddrs *ptr = rawList; ptr; ptr = ptr->ifa_next) {
-        // Get the interface index
-        int ifindex = if_nametoindex(ptr->ifa_name);
-
-        QList<QNetworkInterfacePrivate *>::Iterator if_it = interfaces.begin();
-        for ( ; if_it != interfaces.end(); ++if_it)
-            if ((*if_it)->index == ifindex)
-                // this one has been added already
-                break;
-
-        if (if_it == interfaces.end()) {
-            // none found, create
-            QNetworkInterfacePrivate *iface = new QNetworkInterfacePrivate;
-            interfaces << iface;
-
-            iface->index = ifindex;
-            iface->name = QString::fromLatin1(ptr->ifa_name);
-            iface->flags = convertFlags(ptr->ifa_flags);
-        }
-    }
-
-    return interfaces;
-}
-
-# endif
-
-
-static QList<QNetworkInterfacePrivate *> interfaceListing()
-{
-    QList<QNetworkInterfacePrivate *> interfaces;
-
-    int socket;
-    if ((socket = ::socket(AF_INET, SOCK_STREAM, IPPROTO_IP)) == -1)
-        return interfaces;      // error
-
-    ifaddrs *interfaceListing;
-    if (getifaddrs(&interfaceListing) == -1) {
-        // error
-        ::close(socket);
-        return interfaces;
-    }
-
-    interfaces = createInterfaces(interfaceListing);
-    for (ifaddrs *ptr = interfaceListing; ptr; ptr = ptr->ifa_next) {
-        // Get the interface index
-        int ifindex = if_nametoindex(ptr->ifa_name);
-        QNetworkInterfacePrivate *iface = 0;
-        QList<QNetworkInterfacePrivate *>::Iterator if_it = interfaces.begin();
-        for ( ; if_it != interfaces.end(); ++if_it)
-            if ((*if_it)->index == ifindex) {
-                // found this interface already
-                iface = *if_it;
-                break;
-            }
-        if (!iface) {
-            // skip all non-IP interfaces
-            continue;
-        }
-
-        QNetworkAddressEntry entry;
-        entry.setIp(addressFromSockaddr(ptr->ifa_addr));
-        if (entry.ip().isNull())
-            // could not parse the address
-            continue;
-
-        entry.setNetmask(addressFromSockaddr(ptr->ifa_netmask));
-        if (iface->flags & QNetworkInterface::CanBroadcast)
-            entry.setBroadcast(addressFromSockaddr(ptr->ifa_broadaddr));
-
-        iface->addressEntries << entry;
-    }
-
-    freeifaddrs(interfaceListing);
-    ::close(socket);
-    return interfaces;
-}
-#endif
-
 QList<QNetworkInterfacePrivate *> QNetworkInterfaceManager::scan()
 {

trunk/src/network/network.pro ¶

@@ -2 +2 @@
 
 TARGET   = QtNetwork
+
+os2:TARGET_SHORT = QtNet
+
 QPRO_PWD = $$PWD
 DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE