Changeset 66940 in vbox

Timestamp:

May 17, 2017 4:44:04 PM (8 years ago)

Author:

vboxsync

Message:

Main/NetworkAdapter+NATEngine: Improve default handling (deal with NULL guest OS type), and also add a check if the current settings are default. Note that the API defaults are not the same as the Settings defaults, and that's intentional as the API defaults apply to NICs which the settings didn't read from the config at all.

Location:

trunk/src/VBox/Main

Files:

• include/NATEngineImpl.h (modified) (1 diff)
• include/NetworkAdapterImpl.h (modified) (1 diff)
• src-server/NATEngineImpl.cpp (modified) (1 diff)
• src-server/NetworkAdapterImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/NATEngineImpl.h

@@ -48 +48 @@
     void i_commit();
     void i_copyFrom(NATEngine *aThat);
+    void i_applyDefaults();
+    bool i_hasDefaults();
     HRESULT i_loadSettings(const settings::NAT &data);
     HRESULT i_saveSettings(settings::NAT &data);

trunk/src/VBox/Main/include/NetworkAdapterImpl.h

@@ -58 +58 @@
     void i_copyFrom(NetworkAdapter *aThat);
     void i_applyDefaults(GuestOSType *aOsType);
+    bool i_hasDefaults();
 
     ComObjPtr<NetworkAdapter> i_getPeer();

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

@@ -178 +178 @@
     /* this will back up current data */
     mData->m.assignCopy(aThat->mData->m);
+}
+
+void NATEngine::i_applyDefaults()
+{
+    /* sanity */
+    AutoCaller autoCaller(this);
+    AssertComRCReturnVoid(autoCaller.rc());
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    /* so far nothing to do */
+}
+
+bool NATEngine::i_hasDefaults()
+{
+   /* sanity */
+    AutoCaller autoCaller(this);
+    AssertComRCReturn(autoCaller.rc(), true);
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    return mData->m->areDefaultSettings();
 }
 

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

@@ -1181 +1181 @@
 }
 
+/**
+ * Applies the defaults for this network adapter.
+ *
+ * @note This method currently assumes that the object is in the state after
+ * calling init(), it does not set defaults from an arbitrary state.
+ */
 void NetworkAdapter::i_applyDefaults(GuestOSType *aOsType)
 {
-    AssertReturnVoid(aOsType != NULL);
-
     /* sanity */
     AutoCaller autoCaller(this);
     AssertComRCReturnVoid(autoCaller.rc());
+
+    mNATEngine->i_applyDefaults();
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1196 +1202 @@
 #endif // VBOX_WITH_E1000
 
-    NetworkAdapterType_T defaultType = aOsType->i_networkAdapterType();
+    NetworkAdapterType_T defaultType = NetworkAdapterType_Am79C973;
+    if (aOsType)
+        defaultType = aOsType->i_networkAdapterType();
 
     /* Set default network adapter for this OS type */
@@ -1203 +1211 @@
         defaultType == NetworkAdapterType_I82545EM)
     {
-        if (e1000enabled) mData->type = defaultType;
-    }
-    else mData->type = defaultType;
-
-    /* Enable the first one adapter to the NAT */
-    if (mData->ulSlot == 0)
+        if (e1000enabled)
+            mData->type = defaultType;
+    }
+    else
+        mData->type = defaultType;
+
+    /* Enable the first one adapter and set it to NAT */
+    /** @todo r=klaus remove this long term, since a newly created VM should
+     * have no additional hardware components unless configured either
+     * explicitly or through Machine::applyDefaults. */
+    if (aOsType && mData->ulSlot == 0)
     {
         mData->fEnabled = true;
@@ -1216 +1229 @@
     }
     mData->fCableConnected = true;
+}
+
+bool NetworkAdapter::i_hasDefaults()
+{
+    /* sanity */
+    AutoCaller autoCaller(this);
+    AssertComRCReturn(autoCaller.rc(), true);
+
+    ComObjPtr<GuestOSType> pGuestOSType;
+    HRESULT rc = mParent->i_getVirtualBox()->i_findGuestOSType(mParent->i_getOSTypeId(),
+                                                               pGuestOSType);
+    if (FAILED(rc))
+        return false;
+
+    NetworkAdapterType_T defaultType = pGuestOSType->i_networkAdapterType();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (   !mData->fEnabled
+        && mData->strMACAddress.isEmpty()
+        && mData->type == defaultType
+        && mData->fCableConnected
+        && mData->ulLineSpeed == 0
+        && mData->enmPromiscModePolicy == NetworkAdapterPromiscModePolicy_Deny
+        && mData->mode == NetworkAttachmentType_Null
+        && mData->strBridgedName.isEmpty()
+        && mData->strInternalNetworkName.isEmpty()
+        && mData->strHostOnlyName.isEmpty()
+        && mData->strNATNetworkName.isEmpty()
+        && mData->strGenericDriver.isEmpty()
+        && mData->genericProperties.size() == 0)
+    {
+        /* Could be default, check NAT defaults. */
+        return mNATEngine->i_hasDefaults();
+    }
+
+    return false;
 }