Changeset 801

Timestamp:

Oct 20, 2010, 1:09:45 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

network: QNetworkInterface: Fixed: hardwareAddress() returned null instead of a real MAC; netmask() returned null; allInterfaces() could sometimes return non-existent interfaces. Closes #63.

File:

• trunk/src/network/kernel/qnetworkinterface_os2.cpp (modified) (3 diffs)

trunk/src/network/kernel/qnetworkinterface_os2.cpp

@@ -54 +54 @@
 #include <sys/sockio.h>
 #include <net/if.h>
+
 
 #include <qplatformdefs.h>
 
 QT_BEGIN_NAMESPACE
-
-static QHostAddress addressFromSockaddr(sockaddr *sa)
-{
-    QHostAddress address;
-    if (!sa)
-        return address;
-
-    if (sa->sa_family == AF_INET)
-        address.setAddress(htonl(((sockaddr_in *)sa)->sin_addr.s_addr));
-    return address;
-
-}
 
 static QNetworkInterface::InterfaceFlags convertFlags(uint rawFlags)
@@ -78 +67 @@
     flags |= (rawFlags & IFF_BROADCAST) ? QNetworkInterface::CanBroadcast : QNetworkInterface::InterfaceFlag(0);
     flags |= (rawFlags & IFF_LOOPBACK) ? QNetworkInterface::IsLoopBack : QNetworkInterface::InterfaceFlag(0);
-#ifdef IFF_POINTOPOINT //cygwin doesn't define IFF_POINTOPOINT
     flags |= (rawFlags & IFF_POINTOPOINT) ? QNetworkInterface::IsPointToPoint : QNetworkInterface::InterfaceFlag(0);
-#endif
-
-#ifdef IFF_MULTICAST
     flags |= (rawFlags & IFF_MULTICAST) ? QNetworkInterface::CanMulticast : QNetworkInterface::InterfaceFlag(0);
-#endif
     return flags;
-}
-
-static const int STORAGEBUFFER_GROWTH = 256;
-
-static QSet<QByteArray> interfaceNames(int socket)
-{
-    QSet<QByteArray> result;
-    QByteArray storageBuffer;
-    struct ifconf interfaceList;
-
-    forever {
-        // grow the storage buffer
-        storageBuffer.resize(storageBuffer.size() + STORAGEBUFFER_GROWTH);
-        interfaceList.ifc_buf = storageBuffer.data();
-        interfaceList.ifc_len = storageBuffer.size();
-
-        // get the interface list
-        if (::ioctl(socket, SIOCGIFCONF, &interfaceList) >= 0) {
-            if (int(interfaceList.ifc_len + sizeof(ifreq) + 64) < storageBuffer.size()) {
-                // if the buffer was big enough, break
-                storageBuffer.resize(interfaceList.ifc_len);
-                break;
-            }
-        } else {
-            // internal error
-            return result;
-        }
-        if (storageBuffer.size() > 100000) {
-            // out of space
-            return result;
-        }
-    }
-
-    int interfaceCount = interfaceList.ifc_len / sizeof(ifreq);
-    for (int i = 0; i < interfaceCount; ++i) {
-        // for some reason, this ioctl returns garbage entries (names starting
-        // with characters like 0x00, 0x06, 0x14 and even 0x22). Filter those
-        // out by requiring the first character to be a latin letter.
-        if (!isalpha(interfaceList.ifc_req[i].ifr_name[0]))
-            continue;
-        result << QByteArray(interfaceList.ifc_req[i].ifr_name);
-    }
-
-    return result;
-}
-
-static QNetworkInterfacePrivate *findInterface(int socket, QList<QNetworkInterfacePrivate *> &interfaces,
-                                               struct ifreq &req)
-{
-    QNetworkInterfacePrivate *iface = 0;
-    int ifindex = 0;
-
-    // Search by name
-    QList<QNetworkInterfacePrivate *>::Iterator if_it = interfaces.begin();
-    for ( ; if_it != interfaces.end(); ++if_it)
-        if ((*if_it)->name == QLatin1String(req.ifr_name)) {
-            // existing interface
-            iface = *if_it;
-            break;
-        }
-
-    if (!iface) {
-        // new interface, create data:
-        iface = new QNetworkInterfacePrivate;
-        iface->index = ifindex;
-        interfaces << iface;
-
-#ifdef SIOCGIFNAME
-        // Get the canonical name
-        QByteArray oldName = req.ifr_name;
-        if (::ioctl(socket, SIOCGIFNAME, &req) >= 0) {
-            iface->name = QString::fromLatin1(req.ifr_name);
-
-            // reset the name:
-            memcpy(req.ifr_name, oldName, qMin<int>(oldName.length() + 1, sizeof(req.ifr_name) - 1));
-        } else
-#endif
-        {
-            // use this name anyways
-            iface->name = QString::fromLatin1(req.ifr_name);
-        }
-
-        // Get interface flags
-        if (::ioctl(socket, SIOCGIFFLAGS, &req) >= 0) {
-            iface->flags = convertFlags(req.ifr_flags);
-        }
-
-#ifdef SIOCGIFHWADDR
-        // Get the HW address
-        if (::ioctl(socket, SIOCGIFHWADDR, &req) >= 0) {
-            uchar *addr = (uchar *)&req.ifr_addr;
-            iface->hardwareAddress = iface->makeHwAddress(6, addr);
-        }
-#endif
-    }
-
-    return iface;
 }
 
 static QList<QNetworkInterfacePrivate *> interfaceListing()
 {
+
+
+
+
+
     QList<QNetworkInterfacePrivate *> interfaces;
 
@@ -193 +85 @@
         return interfaces;      // error
 
-    QSet<QByteArray> names = interfaceNames(socket);
-    QSet<QByteArray>::ConstIterator it = names.constBegin();
-    for ( ; it != names.constEnd(); ++it) {
+    // rumors say that the address buffer should be at least 65536 bytes long
+    char addrBuf[65536];
+    short naddrs;
+    statatreq *addrs;
+
+    ifmib ifmibget;
+    // zero the interface table because garbage will be returned in interface
+    // names otherwise
+    memset(&ifmibget,0, sizeof(ifmib));
+
+    int rc;
+
+    // get available interfaces
+    rc = ::os2_ioctl(socket, SIOSTATIF, (char*)&ifmibget, sizeof(ifmib));
+    if (rc == -1) {
+        ::close(socket);
+        return interfaces;
+    }
+
+    // get IP addresses
+    rc = ::os2_ioctl(socket, SIOSTATAT, addrBuf, sizeof(addrBuf));
+    if (rc == -1) {
+        ::close(socket);
+        return interfaces;
+    }
+    naddrs = *(short *)addrBuf;
+    addrs = (statatreq *)(addrBuf + sizeof(unsigned short));
+
+    // loop over interfaces
+    int idx = 0;
+    for (int i = 0; i < IFMIB_ENTRIES && idx < ifmibget.ifNumber; ++i) {
+        // skip empty interface entries
+        if (ifmibget.iftable[i].iftType == 0)
+            continue;
+
+        QNetworkInterfacePrivate *iface = new QNetworkInterfacePrivate;
+        iface->index = ifmibget.iftable[i].iftIndex;
+
+        // Derive the interface name. Not perfect, but there seems to be no
+        // other documented way (taken from Odin sources)
+        if (iface->index >= 0 && iface->index < 9) {// lanX
+            iface->name = QString(QLatin1String("lan%1")).arg(iface->index);
+        } else if (strstr(ifmibget.iftable[i].iftDescr, "back")) { // loopback
+            iface->name = QLatin1String("lo");
+        }
+        else if (strstr(ifmibget.iftable[i].iftDescr, "ace ppp")) {// pppX
+            iface->name = QLatin1String(strstr(ifmibget.iftable[i].iftDescr, "ppp"));
+        } else if (strstr(ifmibget.iftable[i].iftDescr,"ace sl")) { // slX
+            iface->name = QLatin1String(strstr(ifmibget.iftable[i].iftDescr, "sl"));
+        } else if (strstr(ifmibget.iftable[i].iftDescr,"ace dod")) { // dodX
+            iface->name = QLatin1String(strstr(ifmibget.iftable[i].iftDescr, "dod"));
+        } else { // something else...
+            iface->name = QString(QLatin1String("unk%1")).arg(iface->index);
+        }
+
+        iface->friendlyName = QString::fromLocal8Bit(ifmibget.iftable[i].iftDescr);
+        iface->hardwareAddress =
+            iface->makeHwAddress(sizeof(ifmibget.iftable[i].iftPhysAddr),
+                                 (uchar *)&ifmibget.iftable[i].iftPhysAddr[0]);
+
+        // get interface flags
         ifreq req;
         memset(&req, 0, sizeof(ifreq));
-        memcpy(req.ifr_name, *it, qMin<int>(it->length() + 1, sizeof(req.ifr_name) - 1));
+        strncpy(req.ifr_name, iface->name.toLatin1(), sizeof(req.ifr_name));
+        if (::ioctl(socket, SIOCGIFFLAGS, &req) != -1) {
+            iface->flags = convertFlags(req.ifr_flags);
+        }
 
-        QNetworkInterfacePrivate *iface = findInterface(socket, interfaces, req);
-
-        // Get the interface broadcast address
-        QNetworkAddressEntry entry;
-        if (iface->flags & QNetworkInterface::CanBroadcast) {
-            if (::ioctl(socket, SIOCGIFBRDADDR, &req) >= 0) {
-                sockaddr *sa = &req.ifr_addr;
-                if (sa->sa_family == AF_INET)
-                    entry.setBroadcast(addressFromSockaddr(sa));
+        
+        for (int j = 0; j < naddrs; ++j) {
+        
+        QNetworkAddressEntry entry;
+        
+            
+                ;
+                
+                ;
             }
         }
 
-        // Get the interface netmask
-        if (::ioctl(socket, SIOCGIFNETMASK, &req) >= 0) {
-            sockaddr *sa = &req.ifr_addr;
-            entry.setNetmask(addressFromSockaddr(sa));
-        }
-
-        // Get the address of the interface
-        if (::ioctl(socket, SIOCGIFADDR, &req) >= 0) {
-            sockaddr *sa = &req.ifr_addr;
-            entry.setIp(addressFromSockaddr(sa));
-        }
-
-        iface->addressEntries << entry;
+        // store the interface
+        interfaces << iface;
     }