Changeset 112

Timestamp:

Apr 29, 2016, 3:08:01 PM (9 years ago)

Author:

Valery V. Sedletski

Message:

Main: Hardcode the default network interface returned to lan0.

A temporary workaround for a problem: the default network interface string
is not accessible in TCP/IP stack driver memory for some machines. We get a trap
when trying to read it on one machine and get it successfully on another. So,
just fake the return result for the mean time.

File:

• trunk/src/VBox/Main/src-server/os2/NetIf-os2.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/os2/NetIf-os2.cpp ¶

@@ -46 +46 @@
     int    i, num;
     struct ifmib ifmib;
+    char   pszIfName[20];
 
     // get network interface list
@@ -61 +62 @@
         {
             // lanX
-            strcpy(pszName, "lan");
-            itoa(ifindex, pszName + strlen(pszName), 10);
+            strcpy(pszIfName, "lan");
+            itoa(ifindex, pszIfName + strlen(pszIfName), 10);
         }
         else if (strstr(ifmib.iftable[i].iftDescr, "back"))
         {
             // loopback
-            strcpy(pszName, "lo");
+            strcpy(pszIfName, "lo");
         }
         else if (strstr(ifmib.iftable[i].iftDescr, "ace ppp"))
         {
             // pppX
-            strcpy(pszName, "ppp");
-            itoa(ifindex, pszName + strlen(pszName), 10);
+            strcpy(pszIfName, "ppp");
+            itoa(ifindex, pszIfName + strlen(pszIfName), 10);
         }
         else if (strstr(ifmib.iftable[i].iftDescr,"ace sl"))
         {
             // slX
-            strcpy(pszName, "sl");
-            itoa(ifindex, pszName + strlen(pszName), 10);
+            strcpy(pszIfName, "sl");
+            itoa(ifindex, pszIfName + strlen(pszIfName), 10);
         }
         else if (strstr(ifmib.iftable[i].iftDescr,"ace dod"))
         {
             // dodX
-            strcpy(pszName, "dod");
-            itoa(ifindex, pszName + strlen(pszName), 10);
+            strcpy(pszIfName, "dod");
+            itoa(ifindex, pszIfName + strlen(pszIfName), 10);
         }
         else
         {
             // unknown
-            strcpy(pszName, "unk");
-            itoa(ifindex, pszName + strlen(pszName), 10);
-        }
+            strcpy(pszIfName, "unk");
+            itoa(ifindex, pszIfName + strlen(pszIfName), 10);
+        }
+
+        if (stricmp(pszIfName, pszName)) continue;
 
         RT_ZERO(Req);
@@ -194 +197 @@
             // interface name is contained in char * field at the start of the structure
             // pointed to by rt_ifp pointer. So, we just do this strange typecast:
-            strcpy(pszName, (char *)*(unsigned long *)(rt_table[j].rt_ifp));
+            //strcpy(pszName, (char *)*(unsigned long *)(rt_table[j].rt_ifp));
+            // hardcode it for the mean time, before repairing
+            strcpy(pszName, "lan0");
             break;
         }
@@ -227 +232 @@
     NETIFINFO Info;
     RT_ZERO(Info);
-    rc = getInterfaceInfo(sock, pszName, &Info);
-    if (RT_FAILURE(rc))
-        return VERR_INTERNAL_ERROR;
-
-    if (Info.enmMediumType == NETIF_T_ETHERNET)
-    {
-        ComObjPtr<HostNetworkInterface> IfObj;
-        IfObj.createObject();
-
-        HostNetworkInterfaceType_T enmType;
-        if (strncmp(pszName, RT_STR_TUPLE("vboxnet")))
-            enmType = HostNetworkInterfaceType_Bridged;
+
+    for (i = 0; i < ifmib.ifNumber; i++)
+    {
+        struct ifreq Req;
+
+        int ifindex = ifmib.iftable[i].iftIndex;
+
+        if (ifindex >=0 && ifindex <= 9)
+        {
+            // lanX
+            strcpy(pszName, "lan");
+            itoa(ifindex, pszName + strlen(pszName), 10);
+        }
+        else if (strstr(ifmib.iftable[i].iftDescr, "back"))
+        {
+            // loopback
+            strcpy(pszName, "lo");
+        }
+        else if (strstr(ifmib.iftable[i].iftDescr, "ace ppp"))
+        {
+            // pppX
+            strcpy(pszName, "ppp");
+            itoa(ifindex, pszName + strlen(pszName), 10);
+        }
+        else if (strstr(ifmib.iftable[i].iftDescr,"ace sl"))
+        {
+            // slX
+            strcpy(pszName, "sl");
+            itoa(ifindex, pszName + strlen(pszName), 10);
+        }
+        else if (strstr(ifmib.iftable[i].iftDescr,"ace dod"))
+        {
+            // dodX
+            strcpy(pszName, "dod");
+            itoa(ifindex, pszName + strlen(pszName), 10);
+        }
         else
-            enmType = HostNetworkInterfaceType_HostOnly;
-
-        if (SUCCEEDED(IfObj->init(Bstr(pszName), enmType, &Info)))
-        {
-            if (strcmp(pszName, szDefaultIface) == 0)
-                list.push_front(IfObj);
+        {
+            // unknown
+            strcpy(pszName, "unk");
+            itoa(ifindex, pszName + strlen(pszName), 10);
+        }
+
+        rc = getInterfaceInfo(sock, pszName, &Info);
+
+        if (RT_FAILURE(rc))
+            break;
+
+        if (Info.enmMediumType == NETIF_T_ETHERNET)
+        {
+            ComObjPtr<HostNetworkInterface> IfObj;
+            IfObj.createObject();
+
+            HostNetworkInterfaceType_T enmType;
+            if (strncmp(pszName, RT_STR_TUPLE("vboxnet")))
+                enmType = HostNetworkInterfaceType_Bridged;
             else
-                list.push_back(IfObj);
+                enmType = HostNetworkInterfaceType_HostOnly;
+
+            if (SUCCEEDED(IfObj->init(Bstr(pszName), enmType, &Info)))
+            {
+                if (strcmp(pszName, szDefaultIface) == 0)
+                    list.push_front(IfObj);
+                else
+                    list.push_back(IfObj);
+            }
         }
     }