Changeset 160 for trunk/src/network/kernel/qnetworkinterface_os2.cpp

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

network: Ported QHostInfo and QNetworkInterface to OS/2.

File:

• trunk/src/network/kernel/qnetworkinterface_os2.cpp (copied) (copied from trunk/src/network/kernel/qnetworkinterface_unix.cpp ) (9 diffs)

trunk/src/network/kernel/qnetworkinterface_os2.cpp

@@ -3 +3 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information ([email protected])
+
+
 **
 ** 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()
 {