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

Timestamp:

May 12, 2010 10:07:50 AM (15 years ago)

Author:

vboxsync

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

61515

Message:

FE/Qt: use both guest properties (guest IP and guest MAC) to identify a network adapter

File:

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

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

@@ -268 +268 @@
     {
         const CMachine &machine = m_session.GetMachine();
+        QString strFullData;
 
         ulong uMaxCount = vboxGlobal().virtualBox().GetSystemProperties().GetNetworkAdapterCount();
-        ulong uCount = 0;
+
+        QString strToolTip = QApplication::translate("VBoxConsoleWnd",
+                                "<p style='white-space:pre'><nobr>Indicates the activity of the "
+                                "network interfaces:</nobr>%1</p>", "Network adapters tooltip");
+
+        RTTIMESPEC time;
+        uint64_t u64Now = RTTimeSpecGetNano(RTTimeNow(&time));
+
+        QString strFlags, strCount;
+        ULONG64 timestamp;
+        machine.GetGuestProperty("/VirtualBox/GuestInfo/Net/Count", strCount, timestamp, strFlags);
+        bool fPropsValid = (u64Now - timestamp < UINT64_C(60000000000)); /* timeout beacon */
+
+        QStringList aIp, aMac;
+        if (fPropsValid)
+        {
+            int cAdapters = RT_MIN(strCount.toInt(), uMaxCount);
+            for (int i = 0; i < cAdapters; i++)
+            {
+                aIp << machine.GetGuestPropertyValue(QString("/VirtualBox/GuestInfo/Net/%1/V4/IP").arg(i));
+                aMac << machine.GetGuestPropertyValue(QString("/VirtualBox/GuestInfo/Net/%1/MAC").arg(i));
+            }
+        }
+
+        ulong uEnabled = 0;
         for (ulong uSlot = 0; uSlot < uMaxCount; ++ uSlot)
-            if (machine.GetNetworkAdapter(uSlot).GetEnabled())
-                ++ uCount;
-        setState(uCount > 0 ? KDeviceActivity_Idle : KDeviceActivity_Null);
-        if (!uCount)
-            setHidden(true);
-
-        QString strToolTip = QApplication::translate("VBoxConsoleWnd", "<p style='white-space:pre'><nobr>Indicates the activity of the "
-                                "network interfaces:</nobr>%1</p>", "Network adapters tooltip");
-        QString strFullData;
-
-        for (ulong uSlot = 0, uEnabled = 0; uSlot < uMaxCount; ++ uSlot)
         {
             const CNetworkAdapter &adapter = machine.GetNetworkAdapter(uSlot);
             if (adapter.GetEnabled())
             {
-                QString strFlags;
-                QString strCount;
-                ULONG64 timestamp;
-                machine.GetGuestProperty("/VirtualBox/GuestInfo/Net/Count", strCount, timestamp, strFlags);
-                RTTIMESPEC time;
-                uint64_t u64Now = RTTimeSpecGetNano(RTTimeNow(&time));
-                QString strIP;
-                if (   u64Now - timestamp < UINT64_C(60000000000)
-                    && strCount.toInt() > 0)
-                    strIP = machine.GetGuestPropertyValue(QString("/VirtualBox/GuestInfo/Net/%1/V4/IP").arg(uEnabled));
-                strFullData += QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>Adapter %1 (%2)</b>: %3 cable %4</nobr>", "Network adapters tooltip")
+                QString strGuestIp;
+                if (fPropsValid)
+                {
+                    QString strGuestMac = adapter.GetMACAddress();
+                    int iIp = aMac.indexOf(strGuestMac);
+                    if (iIp >= 0)
+                        strGuestIp = aIp[iIp];
+                }
+                strFullData += QApplication::translate("VBoxConsoleWnd",
+                               "<br><nobr><b>Adapter %1 (%2)</b>: %3 cable %4</nobr>", "Network adapters tooltip")
                     .arg(uSlot + 1)
                     .arg(vboxGlobal().toString(adapter.GetAttachmentType()))
-                    .arg(strIP.isEmpty() ? "" : "IP " + strIP + ", ")
+                    .arg(strGuestIp.isEmpty() ? "" : "IP " + strGuestIp + ", ")
                     .arg(adapter.GetCableConnected() ?
                           QApplication::translate("VBoxConsoleWnd", "connected", "Network adapters tooltip") :
                           QApplication::translate("VBoxConsoleWnd", "disconnected", "Network adapters tooltip"));
-                uEnabled++;
+                ++ uEnabled;
             }
         }
 
+        setState(uEnabled > 0 ? KDeviceActivity_Idle : KDeviceActivity_Null);
+        if (!uEnabled)
+            setHidden(true);
+
         if (strFullData.isNull())
-            strFullData = QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>All network adapters are disabled</b></nobr>", "Network adapters tooltip");
+            strFullData = QApplication::translate("VBoxConsoleWnd",
+                             "<br><nobr><b>All network adapters are disabled</b></nobr>", "Network adapters tooltip");
 
         setToolTip(strToolTip.arg(strFullData));