Changeset 783

Timestamp:

Aug 11, 2010, 8:15:33 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

network: Filter out garbage entries returned by ioctl(SIOCGIFCONF) on OS/2 so they don't appear in the QNetworkInteface::allInterfaces() list.

File:

• trunk/src/network/kernel/qnetworkinterface_os2.cpp (modified) (1 diff)

trunk/src/network/kernel/qnetworkinterface_os2.cpp

@@ -121 +121 @@
     int interfaceCount = interfaceList.ifc_len / sizeof(ifreq);
     for (int i = 0; i < interfaceCount; ++i) {
-        QByteArray name = QByteArray(interfaceList.ifc_req[i].ifr_name);
-        if (!name.isEmpty())
-            result << name;
+        // 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);
     }