Changeset 50555 in vbox for trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

Timestamp:

Feb 24, 2014 12:30:01 PM (11 years ago)

Author:

vboxsync

Message:

VBoxServiceVMInfo.cpp: IP Address comment updates and some cleanup of previous change.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -1124 +1124 @@
     for (int i = 0; i < cIfacesSystem; ++i)
     {
-# ifdef RT_OS_OS2
-        ifreq IfReqCopy = ifrequest[i];
-# endif
-        /* Get the interface flags. */
+        /* Get the interface flags - ASSUMES the address isn't really overwritten (ugly). */
         if (ioctl(sd, SIOCGIFFLAGS, &ifrequest[i]) < 0)
         {
@@ -1143 +1140 @@
         bool const fIfUp = !!(ifrequest[i].ifr_flags & IFF_UP);
 
-# ifdef RT_OS_OS2 /* I think this should be done everywhere. */
-        /* Get the address. */
-        ifrequest[i] = IfReqCopy;
+# ifdef RT_OS_OS2
+        /* Don't know what OS/2 returns in SIOCGIFCONF, but it isn't the address.  Get it. */
         if (ioctl(sd, SIOCGIFADDR, &ifrequest[i]) < 0)
         {