Changeset 17256 in vbox for trunk

Timestamp:

Mar 2, 2009 4:23:00 PM (16 years ago)

Author:

vboxsync

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

43595

Message:

#2957: vboxnetadp is now a dummy device attached to intnet via vboxnetflt.

Location:

trunk/src/VBox

Files:

• Devices/Network/SrvIntNetR0.cpp (modified) (1 diff)
• HostDrivers/VBoxNetAdp/Makefile.kmk (modified) (1 diff)
• HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h (modified) (5 diffs)
• HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

@@ -3703 +3703 @@
             break;
         case kIntNetTrunkType_NetAdp:
+#if defined(RT_OS_DARWIN) && !defined(VBOXNETADP_DO_NOT_USE_NETFLT)
+            pszName = "VBoxNetFlt";
+#else /* VBOXNETADP_DO_NOT_USE_NETFLT */
             pszName = "VBoxNetAdp";
+#endif /* VBOXNETADP_DO_NOT_USE_NETFLT */
             break;
         case kIntNetTrunkType_SrvNat:

trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk

@@ -44 +44 @@
 VBoxNetAdp_SOURCES.solaris  = \
         solaris/VBoxNetAdp-solaris.c
-VBoxNetAdp_SOURCES          = \
-        VBoxNetAdp.c
+VBoxNetAdp_SOURCES          =
+#VBoxNetAdp_SOURCES          = \
+#       VBoxNetAdp.c
 VBoxNetAdp_LIBS.solaris    += \
         $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)

trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h

@@ -65 +65 @@
 */
 
+#ifdef VBOXANETADP_DO_NOT_USE_NETFLT
 enum VBoxNetAdpState
 {
@@ -74 +75 @@
 };
 typedef enum VBoxNetAdpState VBOXNETADPSTATE;
+#endif /* VBOXANETADP_DO_NOT_USE_NETFLT */
 
 struct VBoxNetAdapter
 {
+#ifdef VBOXANETADP_DO_NOT_USE_NETFLT
     /** The spinlock protecting the state variables and host interface handle. */
     RTSPINLOCK        hSpinlock;
@@ -103 +106 @@
     /** Pointer to the globals. */
     PVBOXNETADPGLOBALS pGlobals;
+    /** The event that is signaled when we go idle and that pfnWaitForIdle blocks on. */
+    RTSEMEVENT        hEventIdle;
+#endif /* !VBOXANETADP_DO_NOT_USE_NETFLT */
     /** Corresponds to the digit at the end of device name. */
     uint8_t           uUnit;
-    /** The event that is signaled when we go idle and that pfnWaitForIdle blocks on. */
-    RTSEMEVENT        hEventIdle;
 
     union
@@ -148 +152 @@
 typedef VBOXNETADP *PVBOXNETADP;
 
+#ifdef VBOXANETADP_DO_NOT_USE_NETFLT
 /**
  * The global data of the VBox filter driver.
@@ -303 +308 @@
 
 /** @} */
+#endif /* !VBOXANETADP_DO_NOT_USE_NETFLT */
 
 

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

@@ -101 +101 @@
  * The (common) global data.
  */
+#ifdef VBOXANETADP_DO_NOT_USE_NETFLT
 static VBOXNETADPGLOBALS g_VBoxNetAdpGlobals;
+
+#else /* !VBOXANETADP_DO_NOT_USE_NETFLT */
+
+/**
+ * Generate a suitable MAC address.
+ *
+ * @param   pThis       The instance.
+ * @param   pMac        Where to return the MAC address.
+ */
+DECLHIDDEN(void) vboxNetAdpComposeMACAddress(PVBOXNETADP pThis, PRTMAC pMac)
+{
+#if 0 /* Use a locally administered version of the OUI we use for the guest NICs. */
+    pMac->au8[0] = 0x08 | 2;
+    pMac->au8[1] = 0x00;
+    pMac->au8[2] = 0x27;
+#else /* this is what \0vb comes down to. It seems to be unassigned atm. */
+    pMac->au8[0] = 0;
+    pMac->au8[1] = 0x76;
+    pMac->au8[2] = 0x62;
+#endif
+
+    pMac->au8[3] = 0; /* pThis->uUnit >> 16; */
+    pMac->au8[4] = 0; /* pThis->uUnit >> 8; */
+    pMac->au8[5] = pThis->uUnit;
+}
+#endif /* !VBOXANETADP_DO_NOT_USE_NETFLT */
 
 
@@ -117 +144 @@
 }
 
+#ifdef VBOXANETADP_DO_NOT_USE_NETFLT
 /**
  * Reads and retains the host interface handle.
@@ -440 +468 @@
 }
 
-
+#endif /* VBOXANETADP_DO_NOT_USE_NETFLT */
 static errno_t vboxNetAdpDarwinOutput(ifnet_t pIface, mbuf_t pMBuf)
 {
+#ifdef VBOXANETADP_DO_NOT_USE_NETFLT
     PVBOXNETADP pThis = VBOXNETADP_FROM_IFACE(pIface);
     Assert(pThis);
@@ -457 +486 @@
             vboxNetAdpCancelReceive(pThis);
     }
+#endif /* VBOXANETADP_DO_NOT_USE_NETFLT */
     mbuf_freem_list(pMBuf);
     return 0;
@@ -508 +538 @@
 
 
+#ifdef VBOXANETADP_DO_NOT_USE_NETFLT
 
 int  vboxNetAdpPortOsXmit(PVBOXNETADP pThis, PINTNETSG pSG, uint32_t fDst)
@@ -587 +618 @@
     return VINF_SUCCESS;
 }
+#else /* !VBOXANETADP_DO_NOT_USE_NETFLT */
+VBOXNETADP g_vboxnet0;
+
+#endif /* !VBOXANETADP_DO_NOT_USE_NETFLT */
 
 
@@ -725 +760 @@
          * for establishing the connect to the support driver.
          */
+#ifdef VBOXANETADP_DO_NOT_USE_NETFLT
         memset(&g_VBoxNetAdpGlobals, 0, sizeof(g_VBoxNetAdpGlobals));
         rc = vboxNetAdpInitGlobals(&g_VBoxNetAdpGlobals);
+#else /* !VBOXANETADP_DO_NOT_USE_NETFLT */
+        RTMAC Mac;
+        vboxNetAdpOsInit(&g_vboxnet0);
+        vboxNetAdpComposeMACAddress(&g_vboxnet0, &Mac);
+        rc = vboxNetAdpOsCreate(&g_vboxnet0, &Mac);
+#endif /* !VBOXANETADP_DO_NOT_USE_NETFLT */
         if (RT_SUCCESS(rc))
         {
@@ -739 +781 @@
         printf("VBoxAdpDrv: failed to initialize IPRT (rc=%d)\n", rc);
 
+#ifdef VBOXANETADP_DO_NOT_USE_NETFLT
     memset(&g_VBoxNetAdpGlobals, 0, sizeof(g_VBoxNetAdpGlobals));
+#endif /* VBOXANETADP_DO_NOT_USE_NETFLT */
     return KMOD_RETURN_FAILURE;
 }
@@ -756 +800 @@
      * tracking for us!
      */
+#ifdef VBOXANETADP_DO_NOT_USE_NETFLT
     int rc = vboxNetAdpTryDeleteGlobals(&g_VBoxNetAdpGlobals);
     if (RT_FAILURE(rc))
@@ -767 +812 @@
      */
     memset(&g_VBoxNetAdpGlobals, 0, sizeof(g_VBoxNetAdpGlobals));
+#else /* !VBOXANETADP_DO_NOT_USE_NETFLT */
+    vboxNetAdpOsDestroy(&g_vboxnet0);
+#endif /* !VBOXANETADP_DO_NOT_USE_NETFLT */
 
     RTR0Term();