Changeset 44742 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 18, 2013 5:26:05 PM (12 years ago)

Author:

vboxsync

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

83847

Message:

Main/Metrics: Generic implentation of link state and stubs for line speed for all platforms (#6345)

Location:

trunk/src/VBox/Main

Files:

• include/netif.h (modified) (1 diff)
• src-server/Performance.cpp (modified) (1 diff)
• src-server/darwin/NetIf-darwin.cpp (modified) (1 diff)
• src-server/freebsd/NetIf-freebsd.cpp (modified) (1 diff)
• src-server/generic/NetIf-generic.cpp (modified) (2 diffs)
• src-server/linux/NetIf-linux.cpp (modified) (3 diffs)
• src-server/solaris/NetIf-solaris.cpp (modified) (1 diff)
• src-server/win/NetIf-win.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/netif.h

@@ -92 +92 @@
 int NetIfGetConfig(HostNetworkInterface * pIf, NETIFINFO *);
 int NetIfGetConfigByName(PNETIFINFO pInfo);
+int NetIfGetState(const char *pcszIfName, NETIFSTATUS *penmState);
+int NetIfGetLinkSpeed(const char *pcszIfName, uint32_t *puMbits);
 int NetIfDhcpRediscover(VirtualBox *pVbox, HostNetworkInterface * pIf);
 int NetIfAdpCtlOut(const char * pcszName, const char * pcszCmd, char *pszBuffer, size_t cBufSize);

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

@@ -689 +689 @@
 static bool getLinkSpeed(const char *szShortName, uint32_t *pSpeed)
 {
-    /*
-     * Note that we do not need the full name in the info, so we do not
-     * allocate the space for it and we rely on the fact that
-     * NetIfGetConfigByName() never fills it.
-     */
-    NETIFINFO Info;
-    memset(&Info, 0, sizeof(Info));
-    strcpy(Info.szShortName, szShortName);
-    int rc = NetIfGetConfigByName(&Info);
+    NETIFSTATUS enmState = NETIF_S_UNKNOWN;
+    int rc = NetIfGetState(szShortName, &enmState);
     if (RT_FAILURE(rc))
         return false;
-    *pSpeed =  Info.enmStatus == NETIF_S_UP ? Info.uSpeedMbits : 0;
+    if (enmState != NETIF_S_UP)
+        *pSpeed = 0;
+    else
+    {
+        rc = NetIfGetLinkSpeed(szShortName, pSpeed);
+        if (RT_FAILURE(rc))
+            return false;
+    }
     return true;
 }

trunk/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp

@@ -529 +529 @@
 }
 
+/**
+ * Retrieve the physical link speed in megabits per second. If the interface is
+ * not up or otherwise unavailable the zero speed is returned.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pcszIfName  Interface name.
+ * @param   puMbits     Where to store the link speed.
+ */
+int NetIfGetLinkSpeed(const char * /*pcszIfName*/, uint32_t * /*puMbits*/)
+{
+    return VERR_NOT_IMPLEMENTED;
+}
 #endif

trunk/src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp

@@ -406 +406 @@
 }
 
+/**
+ * Retrieve the physical link speed in megabits per second. If the interface is
+ * not up or otherwise unavailable the zero speed is returned.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pcszIfName  Interface name.
+ * @param   puMbits     Where to store the link speed.
+ */
+int NetIfGetLinkSpeed(const char * /*pcszIfName*/, uint32_t * /*puMbits*/)
+{
+    return VERR_NOT_IMPLEMENTED;
+}

trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp

@@ -22 +22 @@
 #include <iprt/path.h>
 #include <iprt/param.h>
+#include <sys/ioctl.h>
+#include <netinet/in.h>
+#include <net/if.h>
+#include <errno.h>
+
+#if defined(RT_OS_SOLARIS)
+# include <sys/sockio.h>
+#endif
 
 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
@@ -358 +366 @@
 }
 
+/**
+ * Obtain the current state of the interface.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pcszIfName  Interface name.
+ * @param   penmState   Where to store the retrieved state.
+ */
+int NetIfGetState(const char *pcszIfName, NETIFSTATUS *penmState)
+{
+    int sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
+    if (sock < 0)
+        return VERR_OUT_OF_RESOURCES;
+    struct ifreq Req;
+    memset(&Req, 0, sizeof(Req));
+    strncpy(Req.ifr_name, pcszIfName, sizeof(Req.ifr_name) - 1);
+    if (ioctl(sock, SIOCGIFFLAGS, &Req) < 0)
+    {
+        Log(("NetIfGetState: ioctl(SIOCGIFFLAGS) -> %d\n", errno));
+        *penmState = NETIF_S_UNKNOWN;
+    }
+    else
+        *penmState = (Req.ifr_flags & IFF_UP) ? NETIF_S_UP : NETIF_S_DOWN;
+    return VINF_SUCCESS;
+}

trunk/src/VBox/Main/src-server/linux/NetIf-linux.cpp

@@ -70 +70 @@
     }
     return VERR_INTERNAL_ERROR;
+}
+
+static uint32_t getInterfaceSpeed(const char *pszName)
+{
+    /*
+     * I wish I could do simple ioctl here, but older kernels require root
+     * privileges for any ethtool commands.
+     */
+    char szBuf[256];
+    uint32_t uSpeed = 0;
+    /* First, we try to retrieve the speed via sysfs. */
+    RTStrPrintf(szBuf, sizeof(szBuf), "/sys/class/net/%s/speed", pszName);
+    FILE *fp = fopen(szBuf, "r");
+    if (fp)
+    {
+        if (fscanf(fp, "%u", &uSpeed) != 1)
+            uSpeed = 0;
+        fclose(fp);
+    }
+    if (uSpeed == 10)
+    {
+        /* Check the cable is plugged in at all */
+        unsigned uCarrier = 0;
+        RTStrPrintf(szBuf, sizeof(szBuf), "/sys/class/net/%s/carrier", pszName);
+        fp = fopen(szBuf, "r");
+        if (fp)
+        {
+            if (fscanf(fp, "%u", &uCarrier) != 1 || uCarrier == 0)
+                uSpeed = 0;
+            fclose(fp);
+        }
+    }
+    
+    if (uSpeed == 0)
+    {
+        /* Failed to get speed via sysfs, go to plan B. */
+        int rc = NetIfAdpCtlOut(pszName, "speed", szBuf, sizeof(szBuf));
+        if (RT_SUCCESS(rc))
+            uSpeed = RTStrToUInt32(szBuf);
+    }
+    return uSpeed;
 }
 
@@ -153 +194 @@
          * produces errors.
          */
-        pInfo->uSpeedMbits = 0;
         if (pInfo->enmMediumType == NETIF_T_ETHERNET)
-        {
-            /*
-             * I wish I could do simple ioctl here, but older kernels require root
-             * privileges for any ethtool commands.
-             */
-            char szBuf[256];
-            /* First, we try to retrieve the speed via sysfs. */
-            RTStrPrintf(szBuf, sizeof(szBuf), "/sys/class/net/%s/speed", pszName);
-            fp = fopen(szBuf, "r");
-            if (fp)
-            {
-                if (fscanf(fp, "%u", &pInfo->uSpeedMbits) != 1)
-                    pInfo->uSpeedMbits = 0;
-                fclose(fp);
-            }
-            if (pInfo->uSpeedMbits == 10)
-            {
-                /* Check the cable is plugged in at all */
-                unsigned uCarrier = 0;
-                RTStrPrintf(szBuf, sizeof(szBuf), "/sys/class/net/%s/carrier", pszName);
-                fp = fopen(szBuf, "r");
-                if (fp)
-                {
-                    if (fscanf(fp, "%u", &uCarrier) != 1 || uCarrier == 0)
-                        pInfo->uSpeedMbits = 0;
-                    fclose(fp);
-                }
-            }
-
-            if (pInfo->uSpeedMbits == 0)
-            {
-                /* Failed to get speed via sysfs, go to plan B. */
-                int rc = NetIfAdpCtlOut(pszName, "speed", szBuf, sizeof(szBuf));
-                if (RT_SUCCESS(rc))
-                    pInfo->uSpeedMbits = RTStrToUInt32(szBuf);
-            }
-        }
+            pInfo->uSpeedMbits = getInterfaceSpeed(pszName);
+        else
+            pInfo->uSpeedMbits = 0;
     }
     return VINF_SUCCESS;
@@ -266 +272 @@
     return rc;
 }
+
+/**
+ * Retrieve the physical link speed in megabits per second. If the interface is
+ * not up or otherwise unavailable the zero speed is returned.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pcszIfName  Interface name.
+ * @param   puMbits     Where to store the link speed.
+ */
+int NetIfGetLinkSpeed(const char *pcszIfName, uint32_t *puMbits)
+{
+    int sock = socket(AF_INET, SOCK_DGRAM, 0);
+    if (sock < 0)
+        return VERR_OUT_OF_RESOURCES;
+    struct ifreq Req;
+    memset(&Req, 0, sizeof(Req));
+    strncpy(Req.ifr_name, pcszIfName, sizeof(Req.ifr_name) - 1);
+    if (ioctl(sock, SIOCGIFHWADDR, &Req) >= 0)
+    {
+        if (ioctl(sock, SIOCGIFFLAGS, &Req) >= 0)
+            if (Req.ifr_flags & IFF_UP)
+            {
+                *puMbits = getInterfaceSpeed(pcszIfName);
+                return VINF_SUCCESS;
+            }
+    }
+    *puMbits = 0;
+    return VWRN_NOT_FOUND;
+}

trunk/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp

@@ -493 +493 @@
 }
 
+/**
+ * Retrieve the physical link speed in megabits per second. If the interface is
+ * not up or otherwise unavailable the zero speed is returned.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pcszIfName  Interface name.
+ * @param   puMbits     Where to store the link speed.
+ */
+int NetIfGetLinkSpeed(const char *pcszIfName, uint32_t *puMbits)
+{
+    *puMbits =  kstatGet(pcszIfName);
+    return VINF_SUCCESS;
+}

trunk/src/VBox/Main/src-server/win/NetIf-win.cpp

@@ -1079 +1079 @@
 
 int NetIfGetConfigByName(PNETIFINFO)
+{
+    return VERR_NOT_IMPLEMENTED;
+}
+
+/**
+ * Obtain the current state of the interface.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pcszIfName  Interface name.
+ * @param   penmState   Where to store the retrieved state.
+ */
+int NetIfGetState(const char *pcszIfName, NETIFSTATUS *penmState)
+{
+    return VERR_NOT_IMPLEMENTED;
+}
+
+/**
+ * Retrieve the physical link speed in megabits per second. If the interface is
+ * not up or otherwise unavailable the zero speed is returned.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pcszIfName  Interface name.
+ * @param   puMbits     Where to store the link speed.
+ */
+int NetIfGetLinkSpeed(const char * /*pcszIfName*/, uint32_t * /*puMbits*/)
 {
     return VERR_NOT_IMPLEMENTED;