Changeset 36075 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Feb 24, 2011 4:36:48 PM (14 years ago)

Author:

vboxsync

Message:

More flexible internal network promisc mode (++) policy management.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -3479 +3479 @@
         H();
 
+        hrc = pMachine->GetExtraData(Bstr("AllowPromiscousGuests").raw(), bstr.asOutParam());
+        if (SUCCEEDED(hrc) && bstr.isEmpty())
+            hrc = virtualBox->GetExtraData(Bstr("AllowPromiscousGuests").raw(), bstr.asOutParam());
+        H();
+        const char * const pszPromiscuousGuestPolicy = bstr.isNotEmpty() ? "allow" : "deny";
+
         if (fAttachDetach && fSniffer)
         {
@@ -3642 +3648 @@
         ppos = pos + 1; \
     } while (0)
-                ITERATE_TO_NEXT_TERM(strName, utf, pos, ppos);
-                ITERATE_TO_NEXT_TERM(strProto, utf, pos, ppos);
-                ITERATE_TO_NEXT_TERM(strHostIP, utf, pos, ppos);
-                ITERATE_TO_NEXT_TERM(strHostPort, utf, pos, ppos);
-                ITERATE_TO_NEXT_TERM(strGuestIP, utf, pos, ppos);
-                strGuestPort = utf.substr(ppos, utf.length() - ppos);
+                    ITERATE_TO_NEXT_TERM(strName, utf, pos, ppos);
+                    ITERATE_TO_NEXT_TERM(strProto, utf, pos, ppos);
+                    ITERATE_TO_NEXT_TERM(strHostIP, utf, pos, ppos);
+                    ITERATE_TO_NEXT_TERM(strHostPort, utf, pos, ppos);
+                    ITERATE_TO_NEXT_TERM(strGuestIP, utf, pos, ppos);
+                    strGuestPort = utf.substr(ppos, utf.length() - ppos);
 #undef ITERATE_TO_NEXT_TERM
 
@@ -3966 +3972 @@
                 InsertConfigInteger(pCfg, "TrunkType", kIntNetTrunkType_NetFlt);
                 InsertConfigInteger(pCfg, "IgnoreConnectFailure", (uint64_t)fIgnoreConnectFailure);
+                InsertConfigString(pCfg, "IfPolicyPromisc", pszPromiscuousGuestPolicy);
                 char szNetwork[INTNET_MAX_NETWORK_NAME];
                 RTStrPrintf(szNetwork, sizeof(szNetwork), "HostInterfaceNetworking-%s", pszHifName);
@@ -4103 +4110 @@
 # if defined(RT_OS_SOLARIS)
 #  if 0 /* bird: this is a bit questionable and might cause more trouble than its worth.  */
-            /* Zone access restriction, don't allow snooping the global zone. */
-            zoneid_t ZoneId = getzoneid();
-            if (ZoneId != GLOBAL_ZONEID)
-            {
-                InsertConfigInteger(pCfg, "IgnoreAllPromisc", true);
-            }
+                /* Zone access restriction, don't allow snooping the global zone. */
+                zoneid_t ZoneId = getzoneid();
+                if (ZoneId != GLOBAL_ZONEID)
+                {
+                    InsertConfigInteger(pCfg, "IgnoreAllPromisc", true);
+                }
 #  endif
 # endif
@@ -4137 +4144 @@
                     InsertConfigString(pCfg, "Network", bstr);
                     InsertConfigInteger(pCfg, "TrunkType", kIntNetTrunkType_WhateverNone);
+                    InsertConfigString(pCfg, "IfPolicyPromisc", pszPromiscuousGuestPolicy);
                     networkName = bstr;
                     trunkType = Bstr(TRUNKTYPE_WHATEVER);
@@ -4229 +4237 @@
                     H();
                 }
-#define VBOX_WIN_BINDNAME_PREFIX "\\DEVICE\\"
+#  define VBOX_WIN_BINDNAME_PREFIX "\\DEVICE\\"
                 char szTrunkName[INTNET_MAX_TRUNK_NAME];
                 char *pszTrunkName = szTrunkName;
@@ -4285 +4293 @@
                 InsertConfigString(pCfg, "Trunk", pszTrunk);
                 InsertConfigString(pCfg, "Network", szNetwork);
-                InsertConfigInteger(pCfg, "IgnoreConnectFailure", (uint64_t)fIgnoreConnectFailure);
+                InsertConfigInteger(pCfg, "IgnoreConnectFailure", (uint64_t)fIgnoreConnectFailure); /** @todo why is this windows only?? */
                 networkName = Bstr(szNetwork);
                 trunkName   = Bstr(pszTrunk);
@@ -4305 +4313 @@
                 trunkType   = TRUNKTYPE_NETFLT;
 #endif
+                InsertConfigString(pCfg, "IfPolicyPromisc", pszPromiscuousGuestPolicy);
+
 #if !defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)