Changeset 13426 in vbox

Timestamp:

Oct 21, 2008 9:59:54 AM (16 years ago)

Author:

vboxsync

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

38186

Message:

Main/Solaris: Enumerate NICs for zones, fixed duplicate enumeration.

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (11 diffs)
• Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/HostImpl.cpp

@@ -54 +54 @@
 # ifdef VBOX_SOLARIS_NSL_RESOLVED
 #  include <libdevinfo.h>
-# else
-#  include <net/if.h>
-#  include <sys/socket.h>
-#  include <sys/sockio.h>
-#  include <net/if_arp.h>
-#  include <net/if.h>
-# endif /* VBOX_SOLARIS_USE_DEVINFO */
+# endif
+# include <net/if.h>
+# include <sys/socket.h>
+# include <sys/sockio.h>
+# include <net/if_arp.h>
+# include <net/if.h>
 # include <sys/types.h>
 # include <sys/stat.h>
@@ -617 +616 @@
 {
     /*
-     * Clip off the instance number from the interface name.
+     * Clip off the zone instance number from the interface name (if any).
+     */
+    char szIfaceName[128];
+    strcpy(szIfaceName, pszIface);
+    char *pszColon = (char *)memchr(szIfaceName, ':', sizeof(szIfaceName));
+    if (pszColon)
+        *pszColon = '\0';
+
+    /*
+     * Get the instance number from the interface name, then clip it off.
      */
     int cbInstance = 0;
-    int cbIface = strlen(pszIface);
+    int cbIface = strlen(szIfaceName);
     const char *pszEnd = pszIface + cbIface - 1;
     for (int i = 0; i < cbIface - 1; i++)
@@ -630 +638 @@
     }
 
+    int Instance = atoi(pszEnd + 1);
+    strncpy(szIfaceName, pszIface, cbIface - cbInstance);
+    szIfaceName[cbIface - cbInstance] = '\0';
+
     /*
      * Add the interface.
      */
-    char szIfaceName[128];
-    strncpy(szIfaceName, pszIface, cbIface - cbInstance);
-    szIfaceName[cbIface - cbInstance] = '\0';
-    int Instance = atoi(pszEnd + 1);
     vboxSolarisAddHostIface(szIfaceName, Instance, NULL, pvHostNetworkInterfaceList);
 
@@ -643 +651 @@
      */
     return _B_FALSE;
+}
+
+static bool vboxSolarisSortNICList(const ComObjPtr <HostNetworkInterface> Iface1, const ComObjPtr <HostNetworkInterface> Iface2)
+{
+    Bstr Iface1Str;
+    (*Iface1).COMGETTER(Name) (Iface1Str.asOutParam());
+
+    Bstr Iface2Str;
+    (*Iface2).COMGETTER(Name) (Iface2Str.asOutParam());
+
+    return Iface1Str < Iface2Str;    
+}
+
+static bool vboxSolarisSameNIC(const ComObjPtr <HostNetworkInterface> Iface1, const ComObjPtr <HostNetworkInterface> Iface2)
+{
+    Bstr Iface1Str;
+    (*Iface1).COMGETTER(Name) (Iface1Str.asOutParam());
+
+    Bstr Iface2Str;
+    (*Iface2).COMGETTER(Name) (Iface2Str.asOutParam());
+
+    return (Iface1Str == Iface2Str);
 }
 
@@ -663 +693 @@
         return DI_WALK_CONTINUE;
 }
-
-static bool vboxSolarisSameNIC(ComObjPtr <HostNetworkInterface> Iface1, ComObjPtr <HostNetworkInterface> Iface2)
-{
-    Bstr Iface1Str;
-    (*Iface1).COMGETTER(Name) (Iface1Str.asOutParam());
-
-    Bstr Iface2Str;
-    (*Iface2).COMGETTER(Name) (Iface2Str.asOutParam());
-
-    return (Iface1Str == Iface2Str);
-}
-
-# endif /* VBOX_SOLARIS_USE_DEVINFO */
+# endif /* VBOX_SOLARIS_NSL_RESOLVED */
 
 #endif
@@ -1067 +1085 @@
 # elif defined(RT_OS_SOLARIS)
 
-#ifdef VBOX_SOLARIS_NSL_RESOLVED
+#  ifdef VBOX_SOLARIS_NSL_RESOLVED
 
     /*
@@ -1086 +1104 @@
         g_pfnLibDlpiWalk(vboxSolarisAddLinkHostIface, &list, 0);
 
-    /*
-     * Weed out duplicates caused by dlpi_walk inconsistencies across Nevadas.
-     */
-    list.unique(vboxSolarisSameNIC);
-
-#else
+#  endif    /* VBOX_SOLARIS_NSL_RESOLVED */
+
     /*
      * This gets only the list of all plumbed logical interfaces.
+     * This is needed for zones which cannot access the device tree
+     * and in this case we just let them use the list of plumbed interfaces
+     * on the zone.
      */
     int Sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
@@ -1113 +1130 @@
             if (!rc)
             {
-                /*
-                 * Ok now we go the interfaces, get the info we need (i.e MAC address).
-                 */
                 for (int i = 0; i < IfNum.lifn_count; i++)
                 {
@@ -1124 +1138 @@
                         continue;
 
+#if 0
                     rc = ioctl(Sock, SIOCGLIFADDR, &(Ifaces[i]));
                     if (!rc)
@@ -1149 +1164 @@
                         vboxSolarisAddLinkHostIface(pszIface, &list);
                     }
+#endif
+
+                    char *pszIface = Ifaces[i].lifr_name;
+                    vboxSolarisAddLinkHostIface(pszIface, &list);
                 }
             }
@@ -1154 +1173 @@
         close(Sock);
     }
-#endif
+
+    /*
+     * Weed out duplicates caused by dlpi_walk inconsistencies across Nevadas.
+     */
+    list.sort(vboxSolarisSortNICList);
+    list.unique(vboxSolarisSameNIC);
 
 # elif defined RT_OS_WINDOWS

trunk/src/VBox/Main/Makefile.kmk

@@ -238 +238 @@
  ifdef VBOX_SOLARIS_NSL_RESOLVED
   VBoxSVC_LIBS.solaris += devinfo
- else
-  VBoxSVC_LIBS.solaris += socket
  endif
+ VBoxSVC_LIBS.solaris += socket
 endif
 ifdef VBOX_WITH_USB