Changeset 12785 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 29, 2008 10:47:19 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

37130

Message:

Main: Solaris/vboxnetflt: Hostif NIC Uuid fix.

File:

• trunk/src/VBox/Main/HostImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -573 +573 @@
      * Try picking up description from our NIC map.
      */
+    char szNICInstance[128];
+    RTStrPrintf(szNICInstance, sizeof(szNICInstance), "%s%d", pszIface, Instance);
     char szNICDesc[256];
     std::string Description = SolarisNICMap[pszIface];
     if (Description != "")
-        RTStrPrintf(szNICDesc, sizeof(szNICDesc), "%s%d - %s", pszIface, Instance, Description.c_str());
+        RTStrPrintf(szNICDesc, sizeof(szNICDesc), "%s - %s", szNICInstance, Description.c_str());
     else
-        RTStrPrintf(szNICDesc, sizeof(szNICDesc), "%s%d - Ethernet", pszIface, Instance);
+        RTStrPrintf(szNICDesc, sizeof(szNICDesc), "%s - Ethernet", szNICInstance);
 
     /*
@@ -585 +587 @@
     RTUUID Uuid;
     RTUuidClear(&Uuid);
-    memcpy(&Uuid, pszIface, RT_MIN(strlen(pszIface), sizeof(Uuid)));
+    memcpy(&Uuid, szNICInstance, RT_MIN(strlen(szNICInstance), sizeof(Uuid)));
     Uuid.Gen.u8ClockSeqHiAndReserved = (Uuid.Gen.u8ClockSeqHiAndReserved & 0x3f) | 0x80;
     Uuid.Gen.u16TimeHiAndVersion = (Uuid.Gen.u16TimeHiAndVersion & 0x0fff) | 0x4000;