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

Timestamp:

Oct 13, 2008 8:48:44 PM (16 years ago)

Author:

vboxsync

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

37817

Message:

UI/config part of win NetFlt

File:

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

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

@@ -41 +41 @@
 #include "../Builtins.h"
 
-#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT) && !defined(VBOX_NETFLT_ONDEMAND_BIND)
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
 # include "win/DrvIntNet-win.h"
 #endif
@@ -925 +925 @@
     }
 # endif
-    /* 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]);
-    }
-
+
+    if(OpenReq.enmTrunkType == kIntNetTrunkType_NetFlt)
+    {
+        char szBindName[INTNET_MAX_TRUNK_NAME];
+        size_t cBindName = INTNET_MAX_TRUNK_NAME;
+
+        rc = drvIntNetWinIfNameToBindName(OpenReq.szTrunk, szBindName, cBindName);
+        if (RT_FAILURE(rc))
+        {
+            return rc;
+        }
+
+        strcpy(OpenReq.szTrunk, szBindName);
+    }
 #endif