Changeset 12866 in vbox for trunk

Timestamp:

Oct 1, 2008 1:50:12 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/Main: Load libdlpi dynamically for walking links. (Disabled).

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Main/HostImpl.cpp (modified) (8 diffs)
• src/VBox/Main/Makefile.kmk (modified) (3 diffs)
• src/VBox/Main/solaris/DynLoadLibSolaris.cpp (added)
• src/VBox/Main/solaris/DynLoadLibSolaris.h (added)

trunk/Config.kmk

@@ -431 +431 @@
 if1of ($(KBUILD_TARGET), darwin solaris)
  VBOX_WITH_NETFLT = 1
-# VBOX_SOLARIS_USE_DEVINFO = 1
+# VBOX_SOLARIS_NSL_RESOLVED = 1
 endif
 

trunk/src/VBox/Main/HostImpl.cpp

@@ -52 +52 @@
 # include <limits.h>
 # include <stdio.h>
-# ifdef VBOX_SOLARIS_USE_DEVINFO
+# ifdef VBOX_SOLARIS_NSL_RESOLVED
 #  include <libdevinfo.h>
 # else
@@ -71 +71 @@
 extern "C" char *getfullrawname(char *);
 # endif
+# include "solaris/DynLoadLibSolaris.h"
 #endif /* RT_OS_SOLARIS */
 
@@ -531 +532 @@
 
 #ifdef RT_OS_SOLARIS
-static void vboxSolarisAddHostIface(char *pszIface, int Instance, PCRTMAC pMac, void *pvArg)
-{
-    std::list <ComObjPtr <HostNetworkInterface> > *pList = (std::list <ComObjPtr <HostNetworkInterface> > *)pvArg;
+static void vboxSolarisAddHostIface(char *pszIface, int Instance, PCRTMAC pMac, void *pvHostNetworkInterfaceList)
+{
+    std::list<ComObjPtr <HostNetworkInterface> > *pList = (std::list<ComObjPtr <HostNetworkInterface> > *)pvHostNetworkInterfaceList;
+    Assert(pList);
 
     typedef std::map <std::string, std::string> NICMap;
@@ -606 +608 @@
 }
 
-# ifdef VBOX_SOLARIS_USE_DEVINFO
-static int vboxSolarisAddPhysHostIface(di_node_t Node, di_minor_t Minor, void *pvArg)
+static boolean_t vboxSolarisAddLinkHostIface(const char *pszIface, void *pvHostNetworkInterfaceList)
+{
+    /*
+     * Clip off the instance number from the interface name.
+     */
+    int cbInstance = 0;
+    int cbIface = strlen(pszIface);
+    const char *pszEnd = pszIface + cbIface - 1;
+    for (int i = 0; i < cbIface - 1; i++)
+    {
+        if (!RT_C_IS_DIGIT(*pszEnd))
+            break;
+        cbInstance++;
+        pszEnd--;
+    }
+
+    /*
+     * 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);
+
+    /*
+     * Continue walking...
+     */
+    return _B_FALSE;
+}
+
+# ifdef VBOX_SOLARIS_NSL_RESOLVED
+static int vboxSolarisAddPhysHostIface(di_node_t Node, di_minor_t Minor, void *pvHostNetworkInterfaceList)
 {
         /*
@@ -621 +654 @@
                 return DI_WALK_CONTINUE;
 
-    vboxSolarisAddHostIface(di_driver_name(Node), di_instance(Node), NULL, pvArg);
+    vboxSolarisAddHostIface(di_driver_name(Node), di_instance(Node), NULL, pvHostNetworkInterfaceList);
         return DI_WALK_CONTINUE;
 }
@@ -661 +694 @@
 # elif defined(RT_OS_SOLARIS)
 
-#ifdef VBOX_SOLARIS_USE_DEVINFO
+#ifdef VBOX_SOLARIS_NSL_RESOLVED
+
     /*
      * Use libdevinfo for determining all physical interfaces.
-     * @todo Try using libdlpi instead and using links rather than physical interfaces.
      */
     di_node_t Root;
@@ -673 +706 @@
         di_fini(Root);
     }
+
+    /*
+     * Use libdlpi for determining all DLPI interfaces.
+     */
+    if (VBoxSolarisLibDlpiFound())
+        g_pfnLibDlpiWalk(vboxSolarisAddLinkHostIface, &list, 0);
+
 #else
     /*
@@ -728 +768 @@
                         char *pszIface = Ifaces[i].lifr_name;
                         strcpy(szNICDesc, pszIface);
-
-                        /*
-                         * Clip off the instance number from the interface name.
-                         */
-                        int cbInstance = 0;
-                        int cbIface = strlen(pszIface);
-                        char *pszEnd = pszIface + cbIface - 1;
-                        for (int i = 0; i < cbIface - 1; i++)
-                        {
-                            if (!RT_C_IS_DIGIT(*pszEnd))
-                                break;
-                            cbInstance++;
-                            pszEnd--;
-                        }
-
-                        /*
-                         * Add the interface.
-                         */
-                        char szIfaceName[LIFNAMSIZ + 1];
-                        strncpy(szIfaceName, pszIface, cbIface - cbInstance);
-                        szIfaceName[cbIface - cbInstance] = '\0';
-
-                        int Instance = atoi(pszEnd + 1);
-                        vboxSolarisAddHostIface(szIfaceName, Instance, &Mac, &list);
+                        
+                        vboxSolarisAddLinkHostIface(pszIface, &list);
                     }
                 }

trunk/src/VBox/Main/Makefile.kmk

@@ -211 +211 @@
 VBoxSVC_DEFS.linux += VBOX_USE_LIBHAL
 VBoxSVC_DEFS.solaris += VBOX_USE_LIBHAL
-ifdef VBOX_SOLARIS_USE_DEVINFO
- VBoxSVC_DEFS.solaris += VBOX_SOLARIS_USE_DEVINFO
+ifdef VBOX_SOLARIS_NSL_RESOLVED
+ VBoxSVC_DEFS.solaris += VBOX_SOLARIS_NSL_RESOLVED
 endif
 
@@ -236 +236 @@
         adm
 ifdef VBOX_WITH_NETFLT
- ifdef VBOX_SOLARIS_USE_DEVINFO
+ ifdef VBOX_SOLARIS_NSL_RESOLVED
   VBoxSVC_LIBS.solaris += devinfo
  else
@@ -300 +300 @@
 
 VBoxSVC_SOURCES.solaris = \
-        linux/vbox-libhal.cpp
+        linux/vbox-libhal.cpp \
+        solaris/DynLoadLibSolaris.cpp
 
 ifdef VBOX_WITH_USB