Changeset 16967 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 20, 2009 10:03:55 AM (16 years ago)

Author:

vboxsync

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

43133

Message:

NetAdp: added a Real property to the IHostNetworkInterface, make the interface name be honored in VM settings

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsNetwork.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsNetwork.cpp

@@ -156 +156 @@
     mAdapter.SetCableConnected (mCbCable->isChecked());
 
-    if (type == KNetworkAttachmentType_HostInterface)
+    if (type == KNetworkAttachmentType_HostInterface
+#if defined (Q_WS_WIN) && defined (VBOX_WITH_NETFLT)
+            || type == KNetworkAttachmentType_HostOnly
+#endif
+            )
     {
 #if defined (Q_WS_WIN) || defined (VBOX_WITH_NETFLT)
@@ -715 +719 @@
     /* Load current inner list */
     QList<QTreeWidgetItem*> itemsList;
-    CHostNetworkInterfaceVector interfaces =
-#if defined(Q_WS_WIN) && defined(VBOX_WITH_NETFLT)
-            enmAttachmentType == KNetworkAttachmentType_HostOnly ?
-                    vboxGlobal().virtualBox().GetHost().GetTapInterfaces()
-                    :
-#endif
-                    vboxGlobal().virtualBox().GetHost().GetNetworkInterfaces();
+    CHostNetworkInterfaceVector interfaces = vboxGlobal().virtualBox().GetHost().GetNetworkInterfaces();
     for (CHostNetworkInterfaceVector::ConstIterator it = interfaces.begin();
          it != interfaces.end(); ++it)
-        itemsList << new VBoxNIListItem (it->GetName());
+    {
+#if defined(Q_WS_WIN) && defined(VBOX_WITH_NETFLT)
+        /* display real for not host-only and viceversa */
+        if((enmAttachmentType == KNetworkAttachmentType_HostOnly) != it->GetReal())
+#endif
+            itemsList << new VBoxNIListItem (it->GetName());
+    }
 
     /* Save current list item name */
@@ -855 +859 @@
 
 #if defined (Q_WS_WIN) || defined (VBOX_WITH_NETFLT)
-        if (type == KNetworkAttachmentType_HostInterface &&
-            page->interfaceName().isNull())
+        if ((type == KNetworkAttachmentType_HostInterface
+#if defined (Q_WS_WIN) && defined (VBOX_WITH_NETFLT)
+                || type == KNetworkAttachmentType_HostOnly
+#endif
+                ) && page->interfaceName().isNull())
         {
             valid = false;