Changeset 8571 in vbox for trunk/src/VBox/Devices

Timestamp:

May 5, 2008 12:43:53 PM (17 years ago)

Author:

vboxsync

Message:

Solaris hostif: Load libdlpi dynamically.

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (2 diffs)
• Network/DrvTAP.cpp (modified) (6 diffs)
• Network/solaris/vbox-libdlpi.cpp (added)
• Network/solaris/vbox-libdlpi.h (added)

trunk/src/VBox/Devices/Makefile.kmk

@@ -175 +175 @@
 ifeq ($(BUILD_TARGET),solaris)
  VBoxDD_LIBS           += adm
- ifdef VBOX_WITH_CROSSBOW
-  VBoxDD_LIBS          += dlpi
- endif
  ifdef VBOX_WITH_SUID_WRAPPER
   VBoxDD_LIBS          += secdb
@@ -619 +616 @@
         Storage/DrvHostDVD.cpp
  ifdef VBOX_WITH_CROSSBOW
+  Drivers_SOURCES += Network/solaris/vbox-libdlpi.cpp
   Drivers_DEFS += VBOX_WITH_CROSSBOW
  endif

trunk/src/VBox/Devices/Network/DrvTAP.cpp

@@ -62 +62 @@
 # include <stdio.h>
 # ifdef VBOX_WITH_CROSSBOW
-#  include <libdlpi.h>
+#  include "solaris/vbox-libdlpi.h"
 # endif
 #else
@@ -277 +277 @@
 #ifdef VBOX_WITH_CROSSBOW
             cbRead = sizeof(achBuf);
-            rc = dlpi_recv(pData->pDeviceHandle, NULL, NULL, achBuf, &cbRead, -1, NULL);
+            rc = gLibDlpiRecv(pData->pDeviceHandle, NULL, NULL, achBuf, &cbRead, -1, NULL);
             rc = RT_LIKELY(rc == DLPI_SUCCESS) ? VINF_SUCCESS : SolarisDLPIErr2VBoxErr(rc);
 #else
@@ -515 +515 @@
      * Open & bind the NIC using the datalink provider routine.
      */
-    int rc = dlpi_open(pData->pszDeviceName, &pData->pDeviceHandle, DLPI_RAW);
+    int rc = gLibDlpiOpen(pData->pszDeviceName, &pData->pDeviceHandle, DLPI_RAW);
     if (rc != DLPI_SUCCESS)
         return PDMDrvHlpVMSetError(pData->pDrvIns, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,
@@ -521 +521 @@
 
     dlpi_info_t vnicInfo;
-    rc = dlpi_info(pData->pDeviceHandle, &vnicInfo, 0);
+    rc = gLibDlpiInfo(pData->pDeviceHandle, &vnicInfo, 0);
     if (rc == DLPI_SUCCESS)
     {
         if (vnicInfo.di_mactype == DL_ETHER)
         {
-            rc = dlpi_bind(pData->pDeviceHandle, DLPI_ANY_SAP, NULL);
+            rc = gLibDlpiBind(pData->pDeviceHandle, DLPI_ANY_SAP, NULL);
             if (rc == DLPI_SUCCESS)
             {
-                rc = dlpi_set_physaddr(pData->pDeviceHandle, DL_CURR_PHYS_ADDR, &pData->MacAddress, ETHERADDRL);
+                rc = gLibDlpiSetPhysAddr(pData->pDeviceHandle, DL_CURR_PHYS_ADDR, &pData->MacAddress, ETHERADDRL);
                 if (rc == DLPI_SUCCESS)
                 {
-                    rc = dlpi_promiscon(pData->pDeviceHandle, DL_PROMISC_SAP);
+                    rc = gLibDlpiPromiscon(pData->pDeviceHandle, DL_PROMISC_SAP);
                     if (rc == DLPI_SUCCESS)
                     {
                         /* Need to use DL_PROMIS_PHYS (not multicast) as we cannot be sure what the guest needs. */
-                        rc = dlpi_promiscon(pData->pDeviceHandle, DL_PROMISC_PHYS);
+                        rc = gLibDlpiPromiscon(pData->pDeviceHandle, DL_PROMISC_PHYS);
                         if (rc == DLPI_SUCCESS)
                         {
-                            pData->FileDevice = dlpi_fd(pData->pDeviceHandle);
+                            pData->FileDevice = gLibDlpiFd(pData->pDeviceHandle);
                             if (pData->FileDevice >= 0)
                             {
@@ -572 +572 @@
         rc = PDMDrvHlpVMSetError(pData->pDrvIns, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,
                                          N_("Failed to obtain VNIC info"));
-    dlpi_close(pData->pDeviceHandle);
+    gLibDlpiClose(pData->pDeviceHandle);
     return rc;
 }
@@ -972 +972 @@
      */
 # ifdef VBOX_WITH_CROSSBOW
+    if (!gLibDlpiFound())
+    {
+        return PDMDrvHlpVMSetError(pDrvIns, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,
+                                       N_("Failed to load library %s required for host interface networking."), LIB_DLPI);
+    }
     rc = SolarisOpenVNIC(pData);
 # else