Changeset 35965 in vbox for trunk/src/VBox

Timestamp:

Feb 14, 2011 6:09:44 PM (14 years ago)

Author:

vboxsync

Message:

Main/Console: resurrect strange tap/bridge hybrid optimization

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (2 diffs)
• src-client/ConsoleImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -445 +445 @@
     HRESULT powerDown(IProgress *aProgress = NULL);
 
-#if ((defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT))
+/* Note: FreeBSD needs this whether netflt is used or not. */
+#if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD))
     HRESULT attachToTapInterface(INetworkAdapter *networkAdapter);
     HRESULT detachFromTapInterface(INetworkAdapter *networkAdapter);
@@ -697 +698 @@
     PPDMLED      mapSharedFolderLed;
     PPDMLED      mapUSBLed[2];
-#if ((defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT))
+/* Note: FreeBSD needs this whether netflt is used or not. */
+#if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD))
     Utf8Str      maTAPDeviceName[8];
     RTFILE       maTapFD[8];

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -7084 +7084 @@
 #endif /* VBOX_WITH_USB */
 
-#if ((defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT))
+/* Note: FreeBSD needs this whether netflt is used or not. */
+#if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD))
 /**
  * Helper function to handle host interface device creation and attachment.