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

Timestamp:

Aug 30, 2013 7:37:03 AM (12 years ago)

Author:

vboxsync

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

88563

Message:

Devices/Network/tstIntNet-1: Use the default route interface for testing on Linux + minor updates in route table parsing in NetIf-linux.cpp

File:

• trunk/src/VBox/Main/src-server/linux/NetIf-linux.cpp (modified) (3 diffs)

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

@@ -38 +38 @@
 #include "Logging.h"
 
+/**
+ * Obtain the name of the interface used for default routing.
+ *
+ * NOTE: There is a copy in Devices/Network/testcase/tstIntNet-1.cpp.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pszName     The buffer of IFNAMSIZ+1 length where to put the name.
+ */
 static int getDefaultIfaceName(char *pszName)
 {
@@ -43 +52 @@
     char szBuf[1024];
     char szIfName[17];
-    char szAddr[129];
-    char szGateway[129];
-    char szMask[129];
+    uint32_t uAddr;
+    uint32_t uGateway;
+    uint32_t uMask;
     int  iTmp;
     unsigned uFlags;
@@ -53 +62 @@
         while (fgets(szBuf, sizeof(szBuf)-1, fp))
         {
-            int n = sscanf(szBuf, "%16s %128s %128s %X %d %d %d %128s %d %d %d\n",
-                           szIfName, szAddr, szGateway, &uFlags, &iTmp, &iTmp, &iTmp,
-                           szMask, &iTmp, &iTmp, &iTmp);
+            int n = sscanf(szBuf, "%16s %x %x %x %d %d %d %x %d %d %d\n",
+                           szIfName, &uAddr, &uGateway, &uFlags, &iTmp, &iTmp, &iTmp,
+                           &uMask, &iTmp, &iTmp, &iTmp);
             if (n < 10 || !(uFlags & RTF_UP))
                 continue;
 
-            if (strcmp(szAddr, "00000000") == 0 && strcmp(szMask, "00000000") == 0)
+            if (uAddr == 0 && uMask == 0)
             {
                 fclose(fp);