Changeset 18323 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Mar 26, 2009 3:29:16 PM (16 years ago)

Author:

vboxsync

Message:

DHCP server/win: make it work again; NetFlt,Adp/win: IDC init polling

File:

• trunk/src/VBox/Devices/Network/DrvIntNet.cpp (modified) (2 diffs)

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

@@ -40 +40 @@
 
 #include "../Builtins.h"
-
-#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
-# include "win/DrvIntNet-win.h"
-#endif
 
 
@@ -1024 +1020 @@
         strcpy(OpenReq.szTrunk, &pThis->szNetwork[sizeof("wif=") - 1]);
     }
-
-#elif defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
-    if (OpenReq.enmTrunkType == kIntNetTrunkType_NetFlt
-            || OpenReq.enmTrunkType == kIntNetTrunkType_NetAdp)
-    {
-# ifndef VBOX_NETFLT_ONDEMAND_BIND
-        /*
-         * We have a ndis filter driver started on system boot before the VBoxDrv,
-         * tell the filter driver to init VBoxNetFlt functionality.
-         */
-        rc = drvIntNetWinConstruct(pDrvIns, pCfgHandle, OpenReq.enmTrunkType);
-        AssertLogRelMsgRCReturn(rc, ("drvIntNetWinConstruct failed, rc=%Rrc", rc), rc);
-# endif
-
-        /*
-         * <Describe what this does here or/and in the function docs of drvIntNetWinIfGuidToBindName>.
-         */
-        char szBindName[INTNET_MAX_TRUNK_NAME];
-        rc = drvIntNetWinIfGuidToBindName(OpenReq.szTrunk, szBindName, INTNET_MAX_TRUNK_NAME);
-        AssertLogRelMsgRCReturn(rc, ("drvIntNetWinIfGuidToBindName failed, rc=%Rrc", rc), rc);
-        strcpy(OpenReq.szTrunk, szBindName);
-    }
-#endif /* WINDOWS && NETFLT */
+#endif /* DARWIN */
 
     /*