Changeset 43144 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 1, 2012 2:44:48 PM (13 years ago)

Author:

vboxsync

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

80517

Message:

BUGZ:3965 Do check if physical network interface found more correctly.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -1132 +1132 @@
     {
         CNetworkAdapter na = machine.GetNetworkAdapter(uAdapterIndex);
-        if (na.GetEnabled() &&
-            (na.GetAttachmentType() == KNetworkAttachmentType_Bridged ||
-             na.GetAttachmentType() == KNetworkAttachmentType_HostOnly))
-        {
-            QStringList ifNames;
-            ifNames << na.GetBridgedInterface()
-                    << na.GetHostOnlyInterface();
-
-            foreach (const QString &strIfName, ifNames)
+
+        if (na.GetEnabled())
+        {
+            QString strIfName = QString();
+
+            /* Get physical network interface name for currently
+             * enabled network attachement type */
+            switch (na.GetAttachmentType())
             {
-                if (!strIfName.isEmpty() &&
-                    !QNetworkInterface::interfaceFromName(strIfName).isValid())
-                {
-                    LogFlow(("Found invalid network interface: %s\n", strIfName.toStdString().c_str()));
-                    failedInterfaceNames << QString("%1 (adapter %2)").arg(strIfName).arg(uAdapterIndex + 1);
+                case KNetworkAttachmentType_Bridged:
+                    strIfName = na.GetBridgedInterface();
                     break;
-                }
+                case KNetworkAttachmentType_HostOnly:
+                    strIfName = na.GetHostOnlyInterface();
+                    break;
             }
-        }
-    }
-    /* Check failed? */
+
+            if (!strIfName.isEmpty() &&
+                !QNetworkInterface::interfaceFromName(strIfName).isValid())
+            {
+                LogFlow(("Found invalid network interface: %s\n", strIfName.toStdString().c_str()));
+                failedInterfaceNames << QString("%1 (adapter %2)").arg(strIfName).arg(uAdapterIndex + 1);
+            }
+        }
+    }
+
+    /* Check if non-existent interfaces found */
     if (!failedInterfaceNames.isEmpty())
     {