Changeset 54869 in vbox for trunk/src

Timestamp:

Mar 20, 2015 1:55:12 PM (10 years ago)

Author:

vboxsync

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

99080

Message:

NetIf-solaris: fix listing of link names that don't have the same name as the driver.

Location:

trunk/src/VBox/Main/src-server/solaris

Files:

• DynLoadLibSolaris.cpp (modified) (3 diffs)
• NetIf-solaris.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.cpp

@@ -28 +28 @@
  * and symbols have been successfully loaded.
  */
-static RTLDRMOD g_hLibDlpi = NULL;
+static RTLDRMOD g_hLibDlpi = NIL_RTLDRMOD;
 
 /**
@@ -41 +41 @@
  */
 int (*g_pfnLibDlpiWalk)(dlpi_walkfunc_t *, void *, uint_t);
+int (*g_pfnLibDlpiOpen)(const char *, dlpi_handle_t *, uint_t);
+void (*g_pfnLibDlpiClose)(dlpi_handle_t);
 /** @} */
 
@@ -47 +49 @@
     RTLDRMOD hLibDlpi;
 
-    if (g_hLibDlpi && g_fCheckedForLibDlpi)
-        return true;
     if (g_fCheckedForLibDlpi)
-        return false;
-    if (!RT_SUCCESS(RTLdrLoad(LIB_DLPI, &hLibDlpi)))
-        return false;
-    /*
-     * Unfortunately; we cannot make use of dlpi_get_physaddr because it requires us to
-     * open the VNIC/link which requires root permissions :/
-     */
-    if (RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_walk", (void **)&g_pfnLibDlpiWalk)))
+        return g_hLibDlpi != NIL_RTLDRMOD;
+    g_fCheckedForLibDlpi = true;
+    int rc = RTLdrLoad(LIB_DLPI, &hLibDlpi);
+    if (RT_SUCCESS(rc))
     {
-        g_hLibDlpi = hLibDlpi;
-        g_fCheckedForLibDlpi = true;
-        return true;
+        /*
+         * Unfortunately; we cannot make use of dlpi_get_physaddr because it requires us to
+         * open the VNIC/link which requires root permissions :/
+         */
+        rc  = RTLdrGetSymbol(hLibDlpi, "dlpi_walk", (void **)&g_pfnLibDlpiWalk);
+        rc |= RTLdrGetSymbol(hLibDlpi, "dlpi_close", (void **)&g_pfnLibDlpiClose);
+        rc |= RTLdrGetSymbol(hLibDlpi, "dlpi_open", (void **)&g_pfnLibDlpiOpen);
+        if (RT_SUCCESS(rc))
+        {
+            g_hLibDlpi = hLibDlpi;
+            return true;
+        }
+
+        RTLdrClose(hLibDlpi);
     }
-    else
-    {
-        RTLdrClose(hLibDlpi);
-        g_fCheckedForLibDlpi = true;
-        return false;
-    }
+    hLibDlpi = NIL_RTLDRMOD;
+    return false;
 }
 

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

@@ -176 +176 @@
         SolarisNICMap.insert(NICPair("spwr", "SMC EtherPower II 10/100 (9432) Ethernet"));
         SolarisNICMap.insert(NICPair("vboxnet", "VirtualBox Host Ethernet"));
-        SolarisNICMap.insert(NICPair(VBOXBOW_VNIC_TEMPLATE_NAME, "VirtualBox Virtual Network Interface Template"));
+        SolarisNICMap.insert(NICPair(VBOXBOW_VNIC_TEMPLATE_NAME, "VirtualBox VNIC Template"));
         SolarisNICMap.insert(NICPair("vlan", "Virtual LAN Ethernet"));
         SolarisNICMap.insert(NICPair("vr", "VIA Rhine Fast Ethernet"));
@@ -384 +384 @@
     NOREF(Minor);
 
+    char *pszDriverName = di_driver_name(Node);
+    int   Instance      = di_instance(Node);
+
     /*
      * Skip aggregations.
      */
-    if (!strcmp(di_driver_name(Node), "aggr"))
+    if (!strcmp(pszDriverName, "aggr"))
         return DI_WALK_CONTINUE;
 
@@ -393 +396 @@
      * Skip softmacs.
      */
-    if (!strcmp(di_driver_name(Node), "softmac"))
+    if (!strcmp(pszDriverName, "softmac"))
         return DI_WALK_CONTINUE;
 
-    vboxSolarisAddHostIface(di_driver_name(Node), di_instance(Node), pvHostNetworkInterfaceList);
+    /*
+     * Driver names doesn't always imply the same link name probably since
+     * S11's vanity names by default (e.g. highly descriptive "net0") names
+     * was introduced. Try opening the link to find out if it really exists.
+     */
+    if (VBoxSolarisLibDlpiFound())
+    {
+        /** @todo should we try also opening "linkname+instance"? */
+        dlpi_handle_t hLink;
+        if (g_pfnLibDlpiOpen(pszDriverName, &hLink, 0) != DLPI_SUCCESS)
+            return DI_WALK_CONTINUE;
+        g_pfnLibDlpiClose(hLink);
+    }
+
+    vboxSolarisAddHostIface(pszDriverName, Instance, pvHostNetworkInterfaceList);
     return DI_WALK_CONTINUE;
 }
@@ -402 +419 @@
 int NetIfList(std::list <ComObjPtr<HostNetworkInterface> > &list)
 {
-
     /*
      * Use libdevinfo for determining all physical interfaces.
@@ -410 +426 @@
     if (Root != DI_NODE_NIL)
     {
-        di_walk_minor(Root, DDI_NT_NET, 0, &list, vboxSolarisAddPhysHostIface);
+        di_walk_minor(Root, DDI_NT_NET, 0 /* flag */, &list, vboxSolarisAddPhysHostIface);
         di_fini(Root);
     }