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

Timestamp:

Oct 3, 2012 4:44:37 AM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: More fixes (#6345)

Location:

trunk/src/VBox/Main/src-server

Files:

• generic/NetIf-generic.cpp (modified) (4 diffs)
• linux/NetIf-linux.cpp (modified) (1 diff)

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

@@ -85 +85 @@
     if (RT_FAILURE(rc))
     {
-        LogRel(("NetIfAdpCtlStream: Failed to get program path, rc=%Rrc\n", rc));
+        LogRel(("NetIfAdpCtlOut: Failed to get program path, rc=%Rrc\n", rc));
         return VERR_INVALID_PARAMETER;
     }
@@ -97 +97 @@
     else
     {
-        LogRel(("NetIfAdpCtlStream: Command line is too long: %s%s %s\n", szAdpCtl, pcszName, pcszCmd));
+        LogRel(("NetIfAdpCtlOut: Command line is too long: %s%s %s\n", szAdpCtl, pcszName, pcszCmd));
         return VERR_INVALID_PARAMETER;
     }
@@ -109 +109 @@
             if (!strncmp(VBOXNETADPCTL_NAME ":", pszBuffer, sizeof(VBOXNETADPCTL_NAME)))
             {
-                LogRel(("NetIfAdpCtlStream: %s", pszBuffer));
+                LogRel(("NetIfAdpCtlOut: %s", pszBuffer));
                 rc = VERR_INTERNAL_ERROR;
             }
@@ -115 +115 @@
         else
         {
-            LogRel(("NetIfAdpCtlStream: No output from " VBOXNETADPCTL_NAME));
+            LogRel(("NetIfAdpCtlOut: No output from " VBOXNETADPCTL_NAME));
             rc = VERR_INTERNAL_ERROR;
         }

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

@@ -162 +162 @@
         {
             /* Failed to get speed via sysfs, go to plan B. */
-            int rc = NetIfAdpCtlOut(pszName, "info", szBuf, sizeof(szBuf));
+            int rc = NetIfAdpCtlOut(pszName, "speed", szBuf, sizeof(szBuf));
             if (RT_SUCCESS(rc))
             {