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

Timestamp:

Feb 13, 2014 1:42:17 PM (11 years ago)

Author:

vboxsync

Message:

Main/Appliance: new options for suppressing MAC addresses on export
Frontends/VBoxManage: add support for the new options
doc/manual: document the new feature

File:

• trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp (modified) (2 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1835 +1835 @@
         // fill the machine config
         vsdescThis->m->pMachine->copyMachineDataToSettings(*pConfig);
+
+        // Apply export tweaks to machine settings
+        bool fStripAllMACs = m->optListExport.contains(ExportOptions_StripAllMACs);
+        bool fStripAllNonNATMACs = m->optListExport.contains(ExportOptions_StripAllNonNATMACs);
+        if (fStripAllMACs || fStripAllNonNATMACs)
+        {
+            for (settings::NetworkAdaptersList::iterator it = pConfig->hardwareMachine.llNetworkAdapters.begin();
+                 it != pConfig->hardwareMachine.llNetworkAdapters.end();
+                 ++it)
+            {
+                settings::NetworkAdapter &nic = *it;
+                if (fStripAllMACs || (fStripAllNonNATMACs && nic.mode != NetworkAttachmentType_NAT))
+                    nic.strMACAddress.setNull();
+            }
+        }
 
         // write the machine config to the vbox:Machine element