Changeset 11814

Timestamp:

08/29/08 14:47:44 (3 months ago)

Author:

vboxsync

Message:

Initial commit of the NetFlt? driver for Windows

Files:

• trunk/Config.kmk (modified) (1 diff)
• trunk/include/VBox/cdefs.h (modified) (1 diff)
• trunk/src/VBox/Additions/WINNT/Graphics/Display/debug.c (modified) (1 diff)
• trunk/src/VBox/Devices/Network/DrvIntNet.cpp (modified) (2 diffs)
• trunk/src/VBox/HostDrivers/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/HostDrivers/Support/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp (modified) (2 diffs)
• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (1 diff)
• trunk/src/VBox/Runtime/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -960 +960 @@
-DEFS += VBOX_WITH_INTERNAL_NETWORKING
-endif
+
+ifdef VBOX_WITH_NETFLT_WINDOWS
+DEFS.win += VBOX_WITH_NETFLT_WINDOWS
+endif
+
-
-#

trunk/include/VBox/cdefs.h

@@ -324 +324 @@
- */
-#ifdef IN_SUP_R0
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-#endif
-

trunk/src/VBox/Additions/WINNT/Graphics/Display/debug.c

@@ -71 +71 @@
-}
-
+#endif
+
-ULONG __cdecl DbgPrint(PCH pszFormat, ...)
-{
+#ifdef LOG_ENABLED
-    va_list args;
-    va_start(args, pszFormat);
-
+ 
-    RTLogBackdoorPrintfV(pszFormat, args);
-
+ 
-    EngDebugPrint(STANDARD_DEBUG_PREFIX, pszFormat, args);
-endif 
+ endif
-    va_end(args);
+#endif
-    return 0;
-}
-
-#endif
-

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

@@ -38 +38 @@
-#include <iprt/string.h>
-#include <iprt/time.h>
-def RT_OS_DARWIN
+ defined(RT_OS_DARWIN) || (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT_WINDOWS))
-# include <iprt/ctype.h>
-#endif
@@ -914 +914 @@
-        strcpy(OpenReq.szTrunk, &pThis->szNetwork[sizeof("wif=") - 1]);
-    }
+#elif defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT_WINDOWS)
+    /* Temporary hack: attach to a network with the name 'if=en0' and you're hitting the wire. */
+    if (    !OpenReq.szTrunk[0]
+        &&   OpenReq.enmTrunkType == kIntNetTrunkType_None
+        &&  !strncmp(pThis->szNetwork, "if=en", sizeof("if=en") - 1)
+        &&  RT_C_IS_DIGIT(pThis->szNetwork[sizeof("if=en") - 1])
+        &&  !pThis->szNetwork[sizeof("if=en")])
+    {
+        OpenReq.enmTrunkType = kIntNetTrunkType_NetFlt;
+        strcpy(OpenReq.szTrunk, &pThis->szNetwork[sizeof("if=") - 1]);
+    }
+    /* Temporary hack: attach to a network with the name 'wif=en0' and you're on the air. */
+    if (    !OpenReq.szTrunk[0]
+        &&   OpenReq.enmTrunkType == kIntNetTrunkType_None
+        &&  !strncmp(pThis->szNetwork, "wif=en", sizeof("wif=en") - 1)
+        &&  RT_C_IS_DIGIT(pThis->szNetwork[sizeof("wif=en") - 1])
+        &&  !pThis->szNetwork[sizeof("wif=en")])
+    {
+        OpenReq.enmTrunkType = kIntNetTrunkType_NetFlt;
+        OpenReq.fFlags |= INTNET_OPEN_FLAGS_SHARED_MAC_ON_WIRE;
+        strcpy(OpenReq.szTrunk, &pThis->szNetwork[sizeof("wif=") - 1]);
+    }
+
+    //TODO: temporary hack, remove this
+    if(OpenReq.enmTrunkType == kIntNetTrunkType_None)
+    {
+        OpenReq.enmTrunkType = kIntNetTrunkType_NetFlt;
+        strcpy(OpenReq.szTrunk, &pThis->szNetwork[sizeof("if=") - 1]);
+    }
+
+
-#endif
-

trunk/src/VBox/HostDrivers/Makefile.kmk

@@ -37 +37 @@
-  include $(PATH_SUB_CURRENT)/VBoxUSB/Makefile.kmk
- endif
-
+ win
-  ifndef VBOX_OSE
-
+
+
+
+
+
-  endif
- endif

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

@@ -186 +186 @@
-#
-SUPR0IdcClient_TEMPLATE = VBOXR0DRV
-
+ IN_SUP_STATIC
-SUPR0IdcClient_SDKS.win = W2K3DDK WINPSDKINCS
-SUPR0IdcClient_SOURCES.$(KBUILD_TARGET) = \

trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp

@@ -137 +137 @@
-                    pDrvObj->MajorFunction[IRP_MJ_CLOSE]                    = VBoxDrvNtClose;
-                    pDrvObj->MajorFunction[IRP_MJ_DEVICE_CONTROL]           = VBoxDrvNtDeviceControl;
-
+//
-                    pDrvObj->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL]  = VBoxDrvNtInternalDeviceControl;
-
+//
-                    pDrvObj->MajorFunction[IRP_MJ_READ]                     = VBoxDrvNtNotSupportedStub;
-                    pDrvObj->MajorFunction[IRP_MJ_WRITE]                    = VBoxDrvNtNotSupportedStub;
@@ -232 +232 @@
-    pFileObj->FsContext = NULL;
-    PSUPDRVSESSION pSession;
-
+//
-    bool fUser = pIrp->RequestorMode != KernelMode;
-
-
-
+//
+//
+//
-    int rc = supdrvCreateSession(pDevExt, fUser, &pSession);
-    if (!rc)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1253 +1253 @@
-                    else
-                    {
+#ifndef VBOX_WITH_NETFLT_WINDOWS
-                        rc = CFGMR3InsertString(pLunL0, "Driver", "HostInterface");     RC_CHECK();
-                        rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg);                 RC_CHECK();
-                        rc = CFGMR3InsertString(pCfg, "HostInterfaceName", Utf8Str(hostInterfaceName)); RC_CHECK();
+#else
+                        rc = CFGMR3InsertString(pLunL0, "Driver", "IntNet");            RC_CHECK();
+                        rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg);                 RC_CHECK();
+                        rc = CFGMR3InsertString(pCfg, "Trunk", Utf8Str(hostInterfaceName));                RC_CHECK();
+                        rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_NetFlt); RC_CHECK();
+#endif
-                        Guid hostIFGuid;
-                        hrc = hostInterface->COMGETTER(Id)(hostIFGuid.asOutParam());    H();

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1003 +1003 @@
-        r0drv/nt/thread2-r0drv-nt.cpp \
-        r0drv/nt/time-r0drv-nt.cpp \
-
-
+
+
+
-
-RuntimeR0Drv_SOURCES.win.amd64 = $(RuntimeWin64ASM_SOURCES)