Changeset 19571 in vbox

Timestamp:

May 11, 2009 10:07:04 AM (16 years ago)

Author:

vboxsync

Message:

Solaris/VBoxNetFlt: enable style 2 opens on trunk.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (9 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

@@ -42 +42 @@
 #include <iprt/crc32.h>
 #include <iprt/err.h>
-#define VBOX_WITH_NETFLT_SOLARIS_DLPISTYLE2
-#ifdef VBOX_WITH_NETFLT_SOLARIS_DLPISTYLE2
-# include <iprt/ctype.h>
-#endif
+#include <iprt/ctype.h>
 
 #include <inet/ip.h>
@@ -60 +57 @@
 #include <sys/dlpi.h>
 #include <sys/types.h>
-#ifdef VBOX_WITH_NETFLT_SOLARIS_DLPISTYLE2
-# include <sys/time.h>
-#endif
+#include <sys/time.h>
 #include <sys/param.h>
 #include <sys/ethernet.h>
@@ -1415 +1410 @@
 }
 
-#ifdef VBOX_WITH_NETFLT_SOLARIS_DLPISTYLE2
+#if 0
 /**
  * Set the DLPI style-2 PPA via an attach request.
+ * Currently unused; dl_attach is used instead.
  *
  * @returns VBox status code.
@@ -1667 +1663 @@
 
 
-#ifdef VBOX_WITH_NETFLT_SOLARIS_DLPISTYLE2
 /**
  * Opens up the DLPI style 2 link that requires explicit PPA attach
  * phase. 
  *
+ * @returns VBox status code.
  * @param   pThis       The instance.
+ * @param   pDevId      Where to store the opened LDI device id.
  */
 static int vboxNetFltSolarisOpenStyle2(PVBOXNETFLTINS pThis, ldi_ident_t *pDevId)
@@ -1680 +1677 @@
      */
     char *pszDev = RTStrDup(pThis->szName);
+    if (!pszDev)
+        return VERR_NO_MEMORY;
+
     char *pszEnd = strchr(pszDev, '\0');
     int PPALen = 0;
@@ -1716 +1716 @@
 
             ldi_close(pThis->u.s.hIface, FREAD | FWRITE, kcred);
-            LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStyle2 dl_attach failed. rc=%d\n", rc));
+            LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStyle2 dl_attach failed. rc=%d szDev=%s PPA=%d rc=%d\n", rc, szDev, PPA));
         }
         else
-            LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStyle2 Failed to open szDev=%s\n", szDev));
+            LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStyle2 Failed to open. rc=%d szDev=%s PPA=%d\n", rc, szDev, PPA));
     }
     else
-        LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStyle2 Failed to construct PPA.\n"));
+        LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStyle2 Failed to construct PPA. pszDev=%s pszEnd=%s.\n", pszDev, pszEnd));
 
     RTStrFree(pszDev);
     return VERR_INTNET_FLT_IF_FAILED;
 }
-#endif
 
 
@@ -1743 +1742 @@
     int ret;
 
-    /** @todo enable and test DLPI style 2.*/
     /*
      * Try style-1 open first.
@@ -1760 +1758 @@
     }
 
-#ifdef VBOX_WITH_NETFLT_SOLARIS_DLPISTYLE2
     if (rc)
     {
@@ -1769 +1766 @@
         if (RT_FAILURE(rc))
             LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStream vboxNetFltSolarisOpenStyle2 failed. rc=%d\n", rc));
-    }
-#endif
+        else
+            rc = 0;
+    }
 
     ldi_ident_release(DevId);