Changeset 8960 in vbox for trunk/src/VBox

Timestamp:

May 20, 2008 2:49:14 PM (17 years ago)

Author:

vboxsync

Message:

Hungarian.

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvTAP.cpp (modified) (5 diffs)
• solaris/vbox-libdlpi.cpp (modified) (2 diffs)
• solaris/vbox-libdlpi.h (modified) (1 diff)

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

@@ -277 +277 @@
 #ifdef VBOX_WITH_CROSSBOW
             cbRead = sizeof(achBuf);
-            rc = gLibDlpiRecv(pData->pDeviceHandle, NULL, NULL, achBuf, &cbRead, -1, NULL);
+            rc = g_pfnLibDlpiRecv(pData->pDeviceHandle, NULL, NULL, achBuf, &cbRead, -1, NULL);
             rc = RT_LIKELY(rc == DLPI_SUCCESS) ? VINF_SUCCESS : SolarisDLPIErr2VBoxErr(rc);
 #else
@@ -520 +520 @@
      * Open & bind the NIC using the datalink provider routine.
      */
-    int rc = gLibDlpiOpen(pData->pszDeviceName, &pData->pDeviceHandle, DLPI_RAW);
+    int rc = g_pfnLibDlpiOpen(pData->pszDeviceName, &pData->pDeviceHandle, DLPI_RAW);
     if (rc != DLPI_SUCCESS)
         return PDMDrvHlpVMSetError(pData->pDrvIns, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,
@@ -526 +526 @@
 
     dlpi_info_t vnicInfo;
-    rc = gLibDlpiInfo(pData->pDeviceHandle, &vnicInfo, 0);
+    rc = g_pfnLibDlpiInfo(pData->pDeviceHandle, &vnicInfo, 0);
     if (rc == DLPI_SUCCESS)
     {
         if (vnicInfo.di_mactype == DL_ETHER)
         {
-            rc = gLibDlpiBind(pData->pDeviceHandle, DLPI_ANY_SAP, NULL);
+            rc = g_pfnLibDlpiBind(pData->pDeviceHandle, DLPI_ANY_SAP, NULL);
             if (rc == DLPI_SUCCESS)
             {
-                rc = gLibDlpiSetPhysAddr(pData->pDeviceHandle, DL_CURR_PHYS_ADDR, &pData->MacAddress, ETHERADDRL);
+                rc = g_pfnLibDlpiSetPhysAddr(pData->pDeviceHandle, DL_CURR_PHYS_ADDR, &pData->MacAddress, ETHERADDRL);
                 if (rc == DLPI_SUCCESS)
                 {
-                    rc = gLibDlpiPromiscon(pData->pDeviceHandle, DL_PROMISC_SAP);
+                    rc = g_pfnLibDlpiPromiscon(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 = gLibDlpiPromiscon(pData->pDeviceHandle, DL_PROMISC_PHYS);
+                        rc = g_pfnLibDlpiPromiscon(pData->pDeviceHandle, DL_PROMISC_PHYS);
                         if (rc == DLPI_SUCCESS)
                         {
-                            pData->FileDevice = gLibDlpiFd(pData->pDeviceHandle);
+                            pData->FileDevice = g_pfnLibDlpiFd(pData->pDeviceHandle);
                             if (pData->FileDevice >= 0)
                             {
@@ -577 +577 @@
         rc = PDMDrvHlpVMSetError(pData->pDrvIns, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,
                                          N_("Failed to obtain VNIC info"));
-    gLibDlpiClose(pData->pDeviceHandle);
+    g_pfnLibDlpiClose(pData->pDeviceHandle);
     return rc;
 }
@@ -977 +977 @@
      */
 # ifdef VBOX_WITH_CROSSBOW
-    if (!gLibDlpiFound())
+    if (!VBoxLibDlpiFound())
     {
         return PDMDrvHlpVMSetError(pDrvIns, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,

trunk/src/VBox/Devices/Network/solaris/vbox-libdlpi.cpp

@@ -39 +39 @@
 
 /** All the symbols we need from libdlpi.
- * @todo r=bird: rename to g_pfnLibDlpi*.
  * @{
  */
-int (*gLibDlpiOpen)(const char *, dlpi_handle_t *, uint_t);
-void (*gLibDlpiClose)(dlpi_handle_t);
-int (*gLibDlpiInfo)(dlpi_handle_t, dlpi_info_t *, uint_t);
-int (*gLibDlpiBind)(dlpi_handle_t, uint_t, uint_t *);
-int (*gLibDlpiSetPhysAddr)(dlpi_handle_t, uint_t, const void *, size_t);
-int (*gLibDlpiPromiscon)(dlpi_handle_t, uint_t);
-int (*gLibDlpiRecv)(dlpi_handle_t, void *, size_t *, void *, size_t *, int, dlpi_recvinfo_t *);
-int (*gLibDlpiFd)(dlpi_handle_t);
+int (*g_pfnLibDlpiOpen)(const char *, dlpi_handle_t *, uint_t);
+void (*g_pfnLibDlpiClose)(dlpi_handle_t);
+int (*g_pfnLibDlpiInfo)(dlpi_handle_t, dlpi_info_t *, uint_t);
+int (*g_pfnLibDlpiBind)(dlpi_handle_t, uint_t, uint_t *);
+int (*g_pfnLibDlpiSetPhysAddr)(dlpi_handle_t, uint_t, const void *, size_t);
+int (*g_pfnLibDlpiPromiscon)(dlpi_handle_t, uint_t);
+int (*g_pfnLibDlpiRecv)(dlpi_handle_t, void *, size_t *, void *, size_t *, int, dlpi_recvinfo_t *);
+int (*g_pfnLibDlpiFd)(dlpi_handle_t);
 /** @} */
 
-bool gLibDlpiFound(void)
+bool VBoxLibDlpiFound(void)
 {
     RTLDRMOD hLibDlpi;
@@ -62 +61 @@
     if (!RT_SUCCESS(RTLdrLoad(LIB_DLPI, &hLibDlpi)))
         return false;
-    if (   RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_open", (void **)&gLibDlpiOpen))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_close", (void **)&gLibDlpiClose))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_info", (void **)&gLibDlpiInfo))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_bind", (void **)&gLibDlpiBind))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_promiscon", (void **)&gLibDlpiPromiscon))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_set_physaddr", (void **)&gLibDlpiSetPhysAddr))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_recv", (void **)&gLibDlpiRecv))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_fd", (void **)&gLibDlpiFd))
+    if (   RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_open", (void **)&g_pfnLibDlpiOpen))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_close", (void **)&g_pfnLibDlpiClose))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_info", (void **)&g_pfnLibDlpiInfo))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_bind", (void **)&g_pfnLibDlpiBind))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_promiscon", (void **)&g_pfnLibDlpiPromiscon))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_set_physaddr", (void **)&g_pfnLibDlpiSetPhysAddr))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_recv", (void **)&g_pfnLibDlpiRecv))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDlpi, "dlpi_fd", (void **)&g_pfnLibDlpiFd))
        )
     {

trunk/src/VBox/Devices/Network/solaris/vbox-libdlpi.h

@@ -26 +26 @@
 #include <libdlpi.h>
 
-extern int (*gLibDlpiOpen)(const char *, dlpi_handle_t *, uint_t);
-extern void (*gLibDlpiClose)(dlpi_handle_t);
-extern int (*gLibDlpiInfo)(dlpi_handle_t, dlpi_info_t *, uint_t);
-extern int (*gLibDlpiBind)(dlpi_handle_t, uint_t, uint_t *);
-extern int (*gLibDlpiSetPhysAddr)(dlpi_handle_t, uint_t, const void *, size_t);
-extern int (*gLibDlpiPromiscon)(dlpi_handle_t, uint_t);
-extern int (*gLibDlpiRecv)(dlpi_handle_t, void *, size_t *, void *, size_t *, int, dlpi_recvinfo_t *);
-extern int (*gLibDlpiFd)(dlpi_handle_t);
+extern int (*g_pfnLibDlpiOpen)(const char *, dlpi_handle_t *, uint_t);
+extern void (*g_pfnLibDlpiClose)(dlpi_handle_t);
+extern int (*g_pfnLibDlpiInfo)(dlpi_handle_t, dlpi_info_t *, uint_t);
+extern int (*g_pfnLibDlpiBind)(dlpi_handle_t, uint_t, uint_t *);
+extern int (*g_pfnLibDlpiSetPhysAddr)(dlpi_handle_t, uint_t, const void *, size_t);
+extern int (*g_pfnLibDlpiPromiscon)(dlpi_handle_t, uint_t);
+extern int (*g_pfnLibDlpiRecv)(dlpi_handle_t, void *, size_t *, void *, size_t *, int, dlpi_recvinfo_t *);
+extern int (*g_pfnLibDlpiFd)(dlpi_handle_t);
 
-extern bool gLibDlpiFound(void);
+extern bool VBoxLibDlpiFound(void);
 
 #endif /* ____H_VBOX_LIBDLPI not defined */