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

Timestamp:

Sep 5, 2011 10:06:32 AM (14 years ago)

Author:

vboxsync

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

73835

Message:

SrvIntNetR0.cpp,ConsoleImpl2.cpp: Better if SrvIntNetR0.cpp sets the default policies instead of Main.

File:

• trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (1 diff)

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

@@ -5625 +5625 @@
                 | INTNET_OPEN_FLAGS_REQUIRE_AS_RESTRICTIVE_POLICIES
                 | INTNET_OPEN_FLAGS_REQUIRE_EXACT);
-    uint32_t const  fDefFlags = INTNET_OPEN_FLAGS_ACCESS_RESTRICTED
-                              | INTNET_OPEN_FLAGS_PROMISC_ALLOW_CLIENTS
-                              | INTNET_OPEN_FLAGS_PROMISC_ALLOW_TRUNK_HOST
-                              | INTNET_OPEN_FLAGS_PROMISC_ALLOW_TRUNK_WIRE
-                              | INTNET_OPEN_FLAGS_TRUNK_HOST_ENABLED
-                              | INTNET_OPEN_FLAGS_TRUNK_HOST_CHASTE_MODE
-                              | INTNET_OPEN_FLAGS_TRUNK_WIRE_ENABLED
-                              | INTNET_OPEN_FLAGS_TRUNK_WIRE_CHASTE_MODE
-                              ;
+    uint32_t fDefFlags = INTNET_OPEN_FLAGS_PROMISC_ALLOW_CLIENTS
+                       | INTNET_OPEN_FLAGS_PROMISC_ALLOW_TRUNK_HOST
+                       | INTNET_OPEN_FLAGS_PROMISC_ALLOW_TRUNK_WIRE
+                       | INTNET_OPEN_FLAGS_TRUNK_HOST_ENABLED
+                       | INTNET_OPEN_FLAGS_TRUNK_HOST_CHASTE_MODE
+                       | INTNET_OPEN_FLAGS_TRUNK_WIRE_ENABLED
+                       | INTNET_OPEN_FLAGS_TRUNK_WIRE_CHASTE_MODE;
+    if (   enmTrunkType == kIntNetTrunkType_WhateverNone
+        || enmTrunkType == kIntNetTrunkType_None)
+        fDefFlags |= INTNET_OPEN_FLAGS_ACCESS_RESTRICTED;
+    else
+        fDefFlags |= INTNET_OPEN_FLAGS_ACCESS_PUBLIC;
     for (uint32_t i = 0; i < RT_ELEMENTS(g_afIntNetOpenNetworkNetFlags); i++)
         if (!(fFlags & g_afIntNetOpenNetworkNetFlags[i].fPair))