Changeset 35809 in vbox for trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin

Timestamp:

Feb 1, 2011 12:31:15 PM (14 years ago)

Author:

vboxsync

Message:

netadp: Re-create configured vboxnetX interfaces (#4213) on Darwin and FreeBSD

File:

• trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp (modified) (5 diffs)

trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp

@@ -136 +136 @@
     pUuid->Gen.u8ClockSeqHiAndReserved = (pUuid->Gen.u8ClockSeqHiAndReserved & 0x3f) | 0x80;
     pUuid->Gen.u16TimeHiAndVersion = (pUuid->Gen.u16TimeHiAndVersion & 0x0fff) | 0x4000;
-    pUuid->Gen.u8ClockSeqLow = pThis->uUnit;
+    pUuid->Gen.u8ClockSeqLow = pThis->nUnit;
     vboxNetAdpComposeMACAddress(pThis, (PRTMAC)pUuid->Gen.au8Node);
 }
@@ -193 +193 @@
 
 
-int vboxNetAdpOsCreate(PVBOXNETADP pThis, PCRTMAC pMACAddress, const char *pcszName)
-{
-    /* TODO: Use pcszName */
+
+int vboxNetAdpOsCreate(PVBOXNETADP pThis, PCRTMAC pMACAddress)
+{
     int rc;
     struct ifnet_init_params Params;
@@ -216 +216 @@
     memcpy(LLADDR(&mac), pMACAddress->au8, mac.sdl_alen);
 
-    RTStrPrintf(pThis->szName, VBOXNETADP_MAX_NAME_LEN, "%s%d", VBOXNETADP_NAME, pThis->uUnit);
+    RTStrPrintf(pThis->szName, VBOXNETADP_MAX_NAME_LEN, "%s%d", VBOXNETADP_NAME, pThis->nUnit);
     vboxNetAdpDarwinComposeUUID(pThis, &uuid);
     Params.uniqueid = uuid.au8;
     Params.uniqueid_len = sizeof(uuid);
     Params.name = VBOXNETADP_NAME;
-    Params.unit = pThis->uUnit;
+    Params.unit = pThis->nUnit;
     Params.family = IFNET_FAMILY_ETHERNET;
     Params.type = IFT_ETHER;
@@ -294 +294 @@
     if (rc == VERR_TIMEOUT)
         LogRel(("VBoxAdpDrv: Failed to detach interface %s%d\n.",
-                VBOXNETADP_NAME, pThis->uUnit));
+                VBOXNETADP_NAME, pThis->nUnit));
     err = ifnet_release(pThis->u.s.pIface);
     if (err)
@@ -348 +348 @@
         case IOCBASECMD(VBOXNETADP_CTL_ADD):
         {
-            if (   (IOC_DIRMASK & iCmd) != IOC_OUT
+            if (   (IOC_DIRMASK & iCmd) != IOC_INOUT
                 || cbReq < sizeof(VBOXNETADPREQ))
                 return EINVAL;
 
             PVBOXNETADP pNew;
-            rc = vboxNetAdpCreate(&pNew, NULL);
+            Log(("VBoxNetAdpDarwinIOCtl: szName=%s\n", pReq->szName));
+            rc = vboxNetAdpCreate(&pNew, 
+                                  pReq->szName[0] && RTStrEnd(pReq->szName, RT_MIN(cbReq, sizeof(pReq->szName))) ?
+                                  pReq->szName : NULL);
             if (RT_FAILURE(rc))
                 return EINVAL;