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

Timestamp:

Sep 19, 2013 3:17:43 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

89083

Message:

Main/NetworkAdapter+Machine+Appliance+SystemProperties+Medium+Console+Settings+IDL: make NAT networking a separate network attachment type which improves the user experience, store the necessary settings, plus changing the design of the methods which will move images and entire VMs, they lacked a progress object
Frontends/VirtualBox: adapted fully, can configure NAT networks with proper drop down list support
Frontends/VBoxManage: also supports NAT networks completely, and adds the long missing code to list intnets

Location:

trunk/src/VBox/Main/src-server

Files:

• ApplianceImpl.cpp (modified) (3 diffs)
• ApplianceImplImport.cpp (modified) (4 diffs)
• MachineImpl.cpp (modified) (2 diffs)
• MediumImpl.cpp (modified) (3 diffs)
• NetworkAdapterImpl.cpp (modified) (8 diffs)
• SystemPropertiesImpl.cpp (modified) (1 diff)

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -305 +305 @@
         case NetworkAttachmentType_HostOnly: strType = "HostOnly"; break;
         case NetworkAttachmentType_Generic: strType = "Generic"; break;
+        case NetworkAttachmentType_NATNetwork: strType = "NATNetwork"; break;
         case NetworkAttachmentType_Null: strType = "Null"; break;
     }
@@ -775 +776 @@
     /** @todo: Maybe too cost-intensive; try to find a lighter way */
     while (    RTPathExists(tmpName)
-            || mVirtualBox->OpenMedium(Bstr(tmpName).raw(), DeviceType_HardDisk, AccessMode_ReadWrite, FALSE /* fForceNewUuid */,  &harddisk) != VBOX_E_OBJECT_NOT_FOUND 
+            || mVirtualBox->OpenMedium(Bstr(tmpName).raw(), DeviceType_HardDisk, AccessMode_ReadWrite, FALSE /* fForceNewUuid */,  &harddisk) != VBOX_E_OBJECT_NOT_FOUND
           )
     {

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

@@ -2714 +2714 @@
                         if (FAILED(rc)) throw rc;
                         /* Set the interface name to attach to */
-                        pNetworkAdapter->COMSETTER(BridgedInterface)(name.raw());
+                        rc = pNetworkAdapter->COMSETTER(BridgedInterface)(name.raw());
                         if (FAILED(rc)) throw rc;
                         break;
@@ -2747 +2747 @@
                         if (FAILED(rc)) throw rc;
                         /* Set the interface name to attach to */
-                        pNetworkAdapter->COMSETTER(HostOnlyInterface)(name.raw());
+                        rc = pNetworkAdapter->COMSETTER(HostOnlyInterface)(name.raw());
                         if (FAILED(rc)) throw rc;
                         break;
@@ -2766 +2766 @@
                 rc = pNetworkAdapter->COMSETTER(AttachmentType)(NetworkAttachmentType_Generic);
                 if (FAILED(rc)) throw rc;
+            }
+            /* Next test for NAT network interfaces */
+            else if (pvsys->strExtraConfigCurrent.endsWith("type=NATNetwork", Utf8Str::CaseInsensitive))
+            {
+                /* Attach to the right interface */
+                rc = pNetworkAdapter->COMSETTER(AttachmentType)(NetworkAttachmentType_NATNetwork);
+                if (FAILED(rc)) throw rc;
+                com::SafeIfaceArray<INATNetwork> nwNATNetworks;
+                rc = mVirtualBox->COMGETTER(NATNetworks)(ComSafeArrayAsOutParam(nwNATNetworks));
+                if (FAILED(rc)) throw rc;
+                // Pick the first NAT network (if there is any)
+                if (nwNATNetworks.size())
+                {
+                    Bstr name;
+                    rc = nwNATNetworks[0]->COMGETTER(NetworkName)(name.asOutParam());
+                    if (FAILED(rc)) throw rc;
+                    /* Set the NAT network name to attach to */
+                    rc = pNetworkAdapter->COMSETTER(NATNetwork)(name.raw());
+                    if (FAILED(rc)) throw rc;
+                    break;
+                }
             }
         }
@@ -3325 +3346 @@
         it1->fEnabled = false;
         if (!(   fKeepAllMACs
-              || (fKeepNATMACs && it1->mode == NetworkAttachmentType_NAT)))
+              || (fKeepNATMACs && it1->mode == NetworkAttachmentType_NAT)
+              || (fKeepNATMACs && it1->mode == NetworkAttachmentType_NATNetwork)))
             Host::generateMACAddress(it1->strMACAddress);
     }

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

@@ -2752 +2752 @@
     mData->m_strConfigFileFull.cloneTo(aFilePath);
     return S_OK;
-}
-
-STDMETHODIMP Machine::COMSETTER(SettingsFilePath)(IN_BSTR aFilePath)
-{
-    CheckComArgStrNotEmptyOrNull(aFilePath);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    ReturnComNotImplemented();
 }
 
@@ -5287 +5277 @@
 
     return S_OK;
+}
+
+STDMETHODIMP Machine::SetSettingsFilePath(IN_BSTR aFilePath, IProgress **aProgress)
+{
+    CheckComArgStrNotEmptyOrNull(aFilePath);
+    CheckComArgOutPointerValid(aProgress);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    *aProgress = NULL;
+    ReturnComNotImplemented();
 }
 

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

@@ -1543 +1543 @@
 }
 
-STDMETHODIMP Medium::COMSETTER(Location)(IN_BSTR aLocation)
-{
-    CheckComArgStrNotEmptyOrNull(aLocation);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    /// @todo NEWMEDIA for file names, add the default extension if no extension
-    /// is present (using the information from the VD backend which also implies
-    /// that one more parameter should be passed to setLocation() requesting
-    /// that functionality since it is only allowed when called from this method
-
-    /// @todo NEWMEDIA rename the file and set m->location on success, then save
-    /// the global registry (and local registries of portable VMs referring to
-    /// this medium), this will also require to add the mRegistered flag to data
-
-    ReturnComNotImplemented();
-}
-
 STDMETHODIMP Medium::COMGETTER(Name)(BSTR *aName)
 {
@@ -2892 +2871 @@
 
     return rc;
+}
+
+STDMETHODIMP Medium::SetLocation(IN_BSTR aLocation, IProgress **aProgress)
+{
+    CheckComArgStrNotEmptyOrNull(aLocation);
+    CheckComArgOutPointerValid(aProgress);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    /// @todo NEWMEDIA for file names, add the default extension if no extension
+    /// is present (using the information from the VD backend which also implies
+    /// that one more parameter should be passed to setLocation() requesting
+    /// that functionality since it is only allowed when called from this method
+
+    /// @todo NEWMEDIA rename the file and set m->location on success, then save
+    /// the global registry (and local registries of portable VMs referring to
+    /// this medium), this will also require to add the mRegistered flag to data
+
+    *aProgress = NULL;
+    ReturnComNotImplemented();
 }
 
@@ -5986 +5988 @@
     pToken->Abandon();
     pToken.setNull();
-    
+
     if (FAILED(rc)) return rc;
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -478 +478 @@
         }
 
+        /* there must a NAT network name */
+        if (mData->mNATNetwork.isEmpty())
+        {
+            Log(("NAT network name not defined, setting to default \"NatNetwork\"\n"));
+            mData->mNATNetwork = "NatNetwork";
+        }
+
         mData->mAttachmentType = aAttachmentType;
 
@@ -526 +533 @@
     if (mData->mBridgedInterface != aBridgedInterface)
     {
+        /* if an empty/null string is to be set, bridged interface must be
+         * turned off */
+        if (   (aBridgedInterface == NULL || *aBridgedInterface == '\0')
+            && mData->mAttachmentType == NetworkAttachmentType_Bridged)
+        {
+            return setError(E_FAIL,
+                            tr("Empty or null bridged interface name is not valid"));
+        }
+
         mData.backup();
         mData->mBridgedInterface = aBridgedInterface;
@@ -577 +593 @@
     if (mData->mHostOnlyInterface != aHostOnlyInterface)
     {
+        /* if an empty/null string is to be set, host only interface must be
+         * turned off */
+        if (   (aHostOnlyInterface == NULL || *aHostOnlyInterface == '\0')
+            && mData->mAttachmentType == NetworkAttachmentType_HostOnly)
+        {
+            return setError(E_FAIL,
+                            tr("Empty or null host only interface name is not valid"));
+        }
+
         mData.backup();
         mData->mHostOnlyInterface = aHostOnlyInterface;
@@ -684 +709 @@
     if (mData->mNATNetwork != aNATNetwork)
     {
+        /* if an empty/null string is to be set, host only interface must be
+         * turned off */
+        if (   (aNATNetwork == NULL || *aNATNetwork == '\0')
+            && mData->mAttachmentType == NetworkAttachmentType_NATNetwork)
+        {
+            return setError(E_FAIL,
+                            tr("Empty or null NAT network name is not valid"));
+        }
+
         mData.backup();
         mData->mNATNetwork = aNATNetwork;
@@ -695 +729 @@
         mlock.release();
 
-        /* Changing the NAT network isn't allowed during runtime, therefore
-         * no immediate replug in CFGM logic => changeAdapter=FALSE */
-        mParent->onNetworkAdapterChange(this, FALSE);
+        /* When changing the host adapter, adapt the CFGM logic to make this
+         * change immediately effect and to notify the guest that the network
+         * might have changed, therefore changeAdapter=TRUE. */
+        mParent->onNetworkAdapterChange(this, TRUE);
     }
 
@@ -1209 +1244 @@
     mData->mGenericDriver = data.strGenericDriver;
     mData->mGenericProperties = data.genericProperties;
+    mData->mNATNetwork = data.strNATNetworkName;
 
     // leave the lock before setting attachment type
@@ -1269 +1305 @@
     data.genericProperties = mData->mGenericProperties;
 
+    data.strNATNetworkName = mData->mNATNetwork;
+
     // after saving settings, we are no longer different from the XML on disk
     m_fModified = false;

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

@@ -390 +390 @@
         case NetworkAttachmentType_NAT:
         case NetworkAttachmentType_Internal:
+        case NetworkAttachmentType_NATNetwork:
             /* chipset default is OK */
             break;