Changeset 36082 in vbox for trunk/src/VBox/Main/src-server

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/Main/src-server

Files:

• MachineImpl.cpp (modified) (1 diff)
• NetworkAdapterImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -5974 +5974 @@
 
 /**
+ * Adds the given IsModified_* flag to the dirty flags of the machine, taking
+ * care of the write locking.
+ *
+ * @param   fModifications      The flag to add.
+ */
+void Machine::setModifiedLock(uint32_t fModification)
+{
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    mData->flModifications |= fModification;
+}
+
+/**
  *  Saves the registry entry of this machine to the given configuration node.
  *

trunk/src/VBox/Main/src-server/NetworkAdapterImpl.cpp

@@ -753 +753 @@
 }
 
+
+STDMETHODIMP NetworkAdapter::COMGETTER(PromiscModePolicy)(NetworkAdapterPromiscModePolicy_T *aPromiscModePolicy)
+{
+    CheckComArgOutPointerValid(aPromiscModePolicy);
+
+    AutoCaller autoCaller(this);
+    HRESULT hrc = autoCaller.rc();
+    if (SUCCEEDED(hrc))
+    {
+        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+        *aPromiscModePolicy = mData->mPromiscModePolicy;
+    }
+    return hrc;
+}
+
+STDMETHODIMP NetworkAdapter::COMSETTER(PromiscModePolicy)(NetworkAdapterPromiscModePolicy_T aPromiscModePolicy)
+{
+    switch (aPromiscModePolicy)
+    {
+        case NetworkAdapterPromiscModePolicy_Deny:
+        case NetworkAdapterPromiscModePolicy_AllowNetwork:
+        case NetworkAdapterPromiscModePolicy_AllowAll:
+            break;
+        default:
+            return setError(E_INVALIDARG, tr("Invalid promiscuous mode policy (%d)"), aPromiscModePolicy);
+    }
+
+    AutoCaller autoCaller(this);
+    HRESULT hrc = autoCaller.rc();
+
+    if (SUCCEEDED(hrc))
+    {
+        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+        if (aPromiscModePolicy != mData->mPromiscModePolicy)
+        {
+            mData.backup();
+            mData->mPromiscModePolicy = aPromiscModePolicy;
+            m_fModified = true;
+
+            alock.release();
+            mParent->setModifiedLock(Machine::IsModified_NetworkAdapters);
+            mParent->onNetworkAdapterChange(this, TRUE);
+        }
+    }
+
+    return hrc;
+}
+
 STDMETHODIMP NetworkAdapter::COMGETTER(BandwidthLimit) (ULONG *aLimit)
 {
@@ -1258 +1306 @@
     /* line speed (defaults to 100 Mbps) */
     mData->mLineSpeed = data.ulLineSpeed;
+    mData->mPromiscModePolicy = data.enmPromiscModePolicy;
     /* tracing (defaults to false) */
     mData->mTraceEnabled = data.fTraceEnabled;