Changeset 36082 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Feb 25, 2011 12:21:57 PM (14 years ago)

Author:

vboxsync

Message:

Added a promiscModePolicy attribute to INetworkAdapter, three values: deny (default), allow-network (i.e. VMs), allow-all (i.e. include unrelated host traffic).

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageInfo.cpp (modified) (7 diffs)
• VBoxManageModifyVM.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -207 +207 @@
                      "                            [--nicspeed<1-N> <kbps>]\n"
                      "                            [--nicbootprio<1-N> <priority>]\n"
+                     "                            [--nicpromisc<1-N> deny|allow-vms|allow-all]\n"
                      "                            [--bridgeadapter<1-N> none|<devicename>]\n"
 #if defined(VBOX_WITH_NETFLT)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -849 +849 @@
                             strAttachment = "none";
                         break;
+
                     case NetworkAttachmentType_NAT:
                     {
@@ -946 +947 @@
                         break;
                     }
+
                     case NetworkAttachmentType_Bridged:
                     {
@@ -959 +961 @@
                         break;
                     }
+
                     case NetworkAttachmentType_Internal:
                     {
@@ -972 +975 @@
                         break;
                     }
+
 #if defined(VBOX_WITH_NETFLT)
                     case NetworkAttachmentType_HostOnly:
@@ -1011 +1015 @@
                 nic->COMGETTER(CableConnected)(&fConnected);
 
+                /* promisc policy */
+                NetworkAdapterPromiscModePolicy_T enmPromiscModePolicy;
+                CHECK_ERROR2_RET(nic, COMGETTER(PromiscModePolicy)(&enmPromiscModePolicy), hrcCheck);
+                const char *pszPromiscuousGuestPolicy;
+                switch (enmPromiscModePolicy)
+                {
+                    case NetworkAdapterPromiscModePolicy_Deny:          pszPromiscuousGuestPolicy = "deny"; break;
+                    case NetworkAdapterPromiscModePolicy_AllowNetwork:  pszPromiscuousGuestPolicy = "allow-vms"; break;
+                    case NetworkAdapterPromiscModePolicy_AllowAll:      pszPromiscuousGuestPolicy = "allow-all"; break;
+                    default: AssertFailedReturn(VERR_INTERNAL_ERROR_4);
+                }
+
                 /* trace stuff */
                 BOOL fTraceEnabled;
@@ -1018 +1034 @@
 
                 /* NIC type */
-                Utf8Str strNICType;
                 NetworkAdapterType_T NICType;
                 nic->COMGETTER(AdapterType)(&NICType);
-                switch (NICType) {
-                case NetworkAdapterType_Am79C970A:
-                    strNICType = "Am79C970A";
-                    break;
-                case NetworkAdapterType_Am79C973:
-                    strNICType = "Am79C973";
-                    break;
+                const char *pszNICType;
+                switch (NICType)
+                {
+                    case NetworkAdapterType_Am79C970A:  pszNICType = "Am79C970A";   break;
+                    case NetworkAdapterType_Am79C973:   pszNICType = "Am79C973";    break;
 #ifdef VBOX_WITH_E1000
-                case NetworkAdapterType_I82540EM:
-                    strNICType = "82540EM";
-                    break;
-                case NetworkAdapterType_I82543GC:
-                    strNICType = "82543GC";
-                    break;
-                case NetworkAdapterType_I82545EM:
-                    strNICType = "82545EM";
-                    break;
+                    case NetworkAdapterType_I82540EM:   pszNICType = "82540EM";     break;
+                    case NetworkAdapterType_I82543GC:   pszNICType = "82543GC";     break;
+                    case NetworkAdapterType_I82545EM:   pszNICType = "82545EM";     break;
 #endif
 #ifdef VBOX_WITH_VIRTIO
-                case NetworkAdapterType_Virtio:
-                    strNICType = "virtio";
-                    break;
-#endif /* VBOX_WITH_VIRTIO */
-                default:
-                    strNICType = "unknown";
-                    break;
+                    case NetworkAdapterType_Virtio:     pszNICType = "virtio";      break;
+#endif
+                    default: AssertFailed();            pszNICType = "unknown";     break;
                 }
 
@@ -1064 +1067 @@
                 }
                 else
-                    RTPrintf("NIC %d:           MAC: %lS, Attachment: %s, Cable connected: %s, Trace: %s (file: %lS), Type: %s, Reported speed: %d Mbps, Boot priority: %d\n",
+                    RTPrintf("NIC %u:           MAC: %lS, Attachment: %s, Cable connected: %s, Trace: %s (file: %lS), Type: %s, Reported speed: %d Mbps, Boot priority: %d, Promisc Policy: %s\n",
                              currentNIC + 1, strMACAddress.raw(), strAttachment.c_str(),
                              fConnected ? "on" : "off",
                              fTraceEnabled ? "on" : "off",
                              traceFile.isEmpty() ? Bstr("none").raw() : traceFile.raw(),
-                             strNICType.c_str(),
+                             pszNICType,
                              ulLineSpeed / 1000,
-                             (int)ulBootPriority);
+                             (int)ulBootPriority,
+                             pszPromiscuousGuestPolicy);
                 if (strNatSettings.length())
                     RTPrintf(strNatSettings.c_str());

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -104 +104 @@
     MODIFYVM_NICSPEED,
     MODIFYVM_NICBOOTPRIO,
+    MODIFYVM_NICPROMISC,
     MODIFYVM_NIC,
     MODIFYVM_CABLECONNECTED,
@@ -230 +231 @@
     { "--nicspeed",                 MODIFYVM_NICSPEED,                  RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_INDEX },
     { "--nicbootprio",              MODIFYVM_NICBOOTPRIO,               RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_INDEX },
+    { "--nicpromisc",               MODIFYVM_NICPROMISC,                RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--nic",                      MODIFYVM_NIC,                       RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--cableconnected",           MODIFYVM_CABLECONNECTED,            RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX },
@@ -1082 +1084 @@
             }
 
+            case MODIFYVM_NICPROMISC:
+            {
+                NetworkAdapterPromiscModePolicy_T enmPromiscModePolicy;
+                if (!strcmp(ValueUnion.psz, "deny"))
+                    enmPromiscModePolicy = NetworkAdapterPromiscModePolicy_Deny;
+                else if (   !strcmp(ValueUnion.psz, "allow-vms")
+                         || !strcmp(ValueUnion.psz, "allow-network"))
+                    enmPromiscModePolicy = NetworkAdapterPromiscModePolicy_AllowNetwork;
+                else if (!strcmp(ValueUnion.psz, "allow-all"))
+                    enmPromiscModePolicy = NetworkAdapterPromiscModePolicy_AllowAll;
+                else
+                {
+                    errorArgument("Unknown promiscuous mode policy '%s'", ValueUnion.psz);
+                    rc = E_INVALIDARG;
+                    break;
+                }
+
+                ComPtr<INetworkAdapter> nic;
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMSETTER(PromiscModePolicy)(enmPromiscModePolicy));
+                break;
+            }
+
             case MODIFYVM_NIC:
             {