Changeset 16854 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 17, 2009 3:50:47 PM (16 years ago)

Author:

vboxsync

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

42961

Message:

TAP/win: host only networking for windows

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvIntNet.cpp (modified) (3 diffs)
• SrvIntNetR0.cpp (modified) (1 diff)

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

@@ -745 +745 @@
     bool f;
 
+    __asm {int 3};
+
     /*
      * Init the static parts.
@@ -1026 +1028 @@
 
 #elif defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
-    if (OpenReq.enmTrunkType == kIntNetTrunkType_NetFlt)
+    if (OpenReq.enmTrunkType == kIntNetTrunkType_NetFlt
+            || OpenReq.enmTrunkType == kIntNetTrunkType_NetTap)
     {
 # ifndef VBOX_NETFLT_ONDEMAND_BIND
@@ -1033 +1036 @@
          * tell the filter driver to init VBoxNetFlt functionality.
          */
-        rc = drvIntNetWinConstruct(pDrvIns, pCfgHandle);
+        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);
+        if (OpenReq.enmTrunkType == kIntNetTrunkType_NetFlt)
+        {
+            /*
+             * <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);
+        }
+        else
+        {
+            strcpy(OpenReq.szTrunk, "dummy name");
+        }
     }
 #endif /* WINDOWS && NETFLT */

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

@@ -4123 +4123 @@
 
         case kIntNetTrunkType_NetFlt:
+        case kIntNetTrunkType_NetTap:
             AssertReturn(pszTrunk, VERR_INVALID_PARAMETER);
             break;