Changeset 29391 in vbox

Timestamp:

May 11, 2010 8:38:39 PM (15 years ago)

Author:

vboxsync

Message:

VBoxServiceVMInfo: Solaris build fix

File:

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

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

@@ -458 +458 @@
         VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", inet_ntoa(pAddress->sin_addr));
 
+ #if defined(RT_OS_SOLARIS)
+        if (ioctl(sd, SIOCGENADDR, &ifrequest[i]) < 0)
+ #else
         if (ioctl(sd, SIOCGIFHWADDR, &ifrequest[i]) < 0)
+ #endif
         {
             VBoxServiceError("Failed to ioctl(SIOCGIFHWADDR) on socket: Error %d\n", errno);
@@ -466 +470 @@
 
         char szMac[32];
-        char *pu8Mac = ifrequest[i].ifr_hwaddr.sa_data;
+ #if defined(RT_OS_SOLARIS)
+        char *pu8Mac = &ifrequest[i].ifr_enaddr[0];
+ #else
+        char *pu8Mac = &ifrequest[i].ifr_hwaddr.sa_data[0];
+ #endif
         RTStrPrintf(szMac, sizeof(szMac), "%02x:%02x:%02x:%02x:%02x:%02x",
                     pu8Mac[0], pu8Mac[1], pu8Mac[2], pu8Mac[3],  pu8Mac[4], pu8Mac[5]);