Changeset 16870 in vbox for trunk/src

Timestamp:

Feb 17, 2009 5:44:08 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/VBoxNetAdp: random MAC address

Location:

trunk/src/VBox

Files:

• HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c (modified) (5 diffs)
• Runtime/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c

@@ -36 +36 @@
 #include <iprt/assert.h>
 #include <iprt/mem.h>
-#include <iprt/uuid.h>
+#include <iprt/rand.h>
 
 #include <sys/types.h>
@@ -353 +353 @@
                          * When we implement jumbo frames we should probably retry with MTU 1500 for S10.
                          */
-                        LogRel((DEVICE_NAME ":VBoxNetAdpSolarisAttach here.\n"));
                         rc = gld_register(pDip, (char *)ddi_driver_name(pDip), pMacInfo);
                         if (rc == DDI_SUCCESS)
@@ -482 +481 @@
     pMac->au8[1] = 0x08;
     pMac->au8[2] = 0x27;
-    pMac->au8[3] = 0x00;
-    pMac->au8[4] = 0x00;
-    pMac->au8[5] = 0x00;
-
-    LogFlow((DEVICE_NAME ":VBoxNetAdpSolarisGenerateMac Generated %.6Rhxs\n", pMac));
+
+    unsigned char achRand[3];
+    RTRandBytes(&achRand, sizeof(achRand));
+
+    pMac->au8[3] = achRand[0];
+    pMac->au8[4] = achRand[1];
+    pMac->au8[5] = achRand[2];
+
+    LogFlow((DEVICE_NAME ":VBoxNetAdpSolarisGenerateMac Generated %.*Rhxs\n", sizeof(RTMAC), &pMac));
     return VINF_SUCCESS;
 }
@@ -493 +496 @@
 static int vboxNetAdpSolarisSetMacAddress(gld_mac_info_t *pMacInfo, unsigned char *pszMacAddr)
 {
-
+    vboxnetadp_state_t *pState = (vboxnetadp_state_t *)pMacInfo->gldm_private;
+    if (pState)
+    {
+        bcopy(pszMacAddr, &pState->CurrentMac, sizeof(RTMAC));
+        LogFlow((DEVICE_NAME ":vboxNetAdpSolarisSetMacAddress updated MAC %.*Rhxs\n", sizeof(RTMAC), &pState->CurrentMac));
+        return GLD_SUCCESS;
+    }
+    else
+        LogRel((DEVICE_NAME ":vboxNetAdpSolarisSetMacAddress failed to get internal state.\n"));
+    return GLD_FAILURE;
 }
 
@@ -512 +524 @@
 static int vboxNetAdpSolarisSetMulticast(gld_mac_info_t *pMacInfo, unsigned char *pMulticastAddr, int fMulticast)
 {
-
+    NOREF(pMacInfo);
+    NOREF(pMulticastAddr);
+    NOREF(fMulticast);
+    return GLD_SUCCESS;
 }
 

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1234 +1234 @@
         common/err/RTErrConvertToErrno.cpp \
         common/misc/thread.cpp \
+        common/misc/once.cpp \
         common/string/memchr.asm \
+        common/rand/rand.cpp \
+        common/rand/randadv.cpp \
+        common/rand/randparkmiller.cpp \
         generic/RTAssertShouldPanic-generic.cpp \
         generic/RTLogWriteStdOut-stub-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
+        generic/RTRandAdvCreateSystemFaster-generic.cpp \
         generic/mppresent-generic.cpp \
         r0drv/memobj-r0drv.cpp \