Changeset 10924 in vbox

Timestamp:

Jul 29, 2008 3:48:35 AM (16 years ago)

Author:

vboxsync

Message:

intnet: INTNET_OPEN_FLAGS_SECURITY_XOR_MASK -> INTNET_OPEN_FLAGS_COMPATIBILITY_XOR_MASK, added INTNET_OPEN_FLAGS_SHARED_MAC_ON_WIRE to it.

Location:

trunk

Files:

• include/VBox/intnet.h (modified) (1 diff)
• src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (1 diff)

trunk/include/VBox/intnet.h

@@ -623 +623 @@
 /** Ignore any requests for promiscuous mode on the trunk host connection, quietly applied/ignored on open. */
 #define INTNET_OPEN_FLAGS_QUIETLY_IGNORE_PROMISC_TRUNK_HOST     RT_BIT_32(7)
-/** The mask of flags which causes security incompatibilities. */
-#define INTNET_OPEN_FLAGS_SECURITY_XOR_MASK                     (RT_BIT_32(1) | RT_BIT_32(2) | RT_BIT_32(4) | RT_BIT_32(6))
+/** The mask of flags which causes flag incompatibilities. */
+#define INTNET_OPEN_FLAGS_COMPATIBILITY_XOR_MASK                (RT_BIT_32(0) | RT_BIT_32(1) | RT_BIT_32(2) | RT_BIT_32(4) | RT_BIT_32(6))
 /** The mask of flags is always ORed in, even on open. (the quiet stuff) */
 #define INTNET_OPEN_FLAGS_SECURITY_OR_MASK                      (RT_BIT_32(3) | RT_BIT_32(5) | RT_BIT_32(7))

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

@@ -3122 +3122 @@
                      && !strcmp(pCur->szTrunk, pszTrunk)))
             {
-                if (!((pCur->fFlags ^ fFlags) & INTNET_OPEN_FLAGS_SECURITY_XOR_MASK))
+                if (!((pCur->fFlags ^ fFlags) & INTNET_OPEN_FLAGS_COMPATIBILITY_XOR_MASK))
                 {