Changeset 19323 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

May 4, 2009 12:34:14 PM (16 years ago)

Author:

vboxsync

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

46800

Message:

Solaris/VBoxNetFlt: #3183 DLPI style 2 support (disabled, untested).

File:

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

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

@@ -56 +56 @@
 #include <sys/dlpi.h>
 #include <sys/types.h>
+#ifdef VBOX_WITH_NETFLT_SOLARIS_DLPISTYLE2
+# include <sys/time.h>
+#endif
 #include <sys/param.h>
 #include <sys/ethernet.h>
@@ -95 +98 @@
 #define DEVICE_DESC_DRV          "VirtualBox NetDrv"
 #define DEVICE_DESC_MOD          "VirtualBox NetMod"
+
+#ifdef VBOX_WITH_NETFLT_SOLARIS_DLPISTYLE2
+# define ISDIGIT(c)              ((c) >= '0' && (c) <= '9')
+#endif
 
 /** @todo Remove the below hackery once done! */
@@ -1282 +1289 @@
  * @returns VBox status code.
  * @param   pQueue      Pointer to the read queue.
- * @param   pMsg        Pointer to the request message.
  */
 static int vboxNetFltSolarisPhysAddrReq(queue_t *pQueue)
@@ -1422 +1428 @@
     VN_RELE(pVNodeHeld);
 }
+
+#ifdef VBOX_WITH_NETFLT_SOLARIS_DLPISTYLE2
+/**
+ * Set the DLPI style-2 PPA via an attach request.
+ *
+ * @returns VBox status code.
+ * @param   hDevice        Layered device handle.
+ * @param   PPA            Physical Point of Attachment (PPA) number.
+ */
+static int vboxNetFltSolarisAttachReq(ldi_handle_t hDevice, int PPA)
+{
+    int rc;
+    t_uscalar_t Cmd = DL_ATTACH_REQ;
+    size_t cbReq = DL_ATTACH_REQ_SIZE;
+    mblk_t *pAttachMsg = mexchange(NULL, NULL, cbReq, M_PROTO, Cmd);
+    if (RT_UNLIKELY(!pAttachMsg))
+        return VERR_NO_MEMORY;
+
+    dl_attach_req_t *pAttachReq = (dl_attach_req_t *)pAttachMsg->b_rptr;
+    pAttachReq->dl_ppa = PPA;
+
+    rc = ldi_putmsg(hDevice, pAttachMsg);
+    if (!rc)
+    {
+        rc = ldi_getmsg(hDevice, &pAttachMsg, NULL);
+        if (!rc)
+            return VINF_SUCCESS;
+        else
+            LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachReq ldi_getmsg failed. rc=%d\n", rc));
+    }
+    else
+        LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachReq ldi_putmsg failed. rc=%d\n", rc));
+
+    return VERR_GENERAL_FAILURE;
+}
+#endif
 
 
@@ -1639 +1681 @@
 
 
+#ifdef VBOX_WITH_NETFLT_SOLARIS_DLPISTYLE2
+/**
+ * Opens up the DLPI style 2 link that requires explicit PPA attach
+ * phase. 
+ *
+ * @param   pThis       The instance.
+ */
+static int vboxNetFltSolarisOpenStyle2(PVBOXNETFLTINS pThis, ldi_ident_t *pDevId)
+{
+    /*
+     * Strip out PPA from the device name, eg: "ce3".
+     */
+    char *pszDev = RTStrDup(pThis->szName);
+    char *pszEnd = strchr(pszDev, '\0');
+    int PPALen = 0;
+    while (--pszEnd > pszDev)
+    {
+        if (!ISDIGIT(*pszEnd))
+            break;
+        PPALen++;
+    }
+    pszEnd++;
+
+    char szDev[128];
+    RTStrPrintf(szDev, sizeof(szDev), "/dev/%s", pszDev);
+    RTStrFree(pszDev);
+
+    int rc;
+    long PPA;
+    if (   pszEnd
+        && ddi_strtol(pszEnd, NULL, 10, &PPA) == 0)
+    {
+        pszEnd -= PPALen;
+        *pszEnd = '\0';
+        /*
+         * Try open the device as DPLI style 2.
+         */
+        rc = ldi_open_by_name(szDev, FREAD | FWRITE, kcred, &pThis->u.s.hIface, *pDevId);
+        if (!rc)
+        {
+            /*
+             * Attach the PPA explictly.
+             */
+            rc = dl_attach(pThis->u.s.hIface, (int)PPA, NULL);
+            if (!rc)
+                return VINF_SUCCESS;
+
+            ldi_close(pThis->u.s.hIface, FREAD | FWRITE, kcred);
+            LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStyle2 dl_attach failed. rc=%d\n", rc));
+        }
+        else
+            LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStyle2 Failed to open szDev=%s\n", szDev));
+    }
+    else
+        LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStyle2 Failed to construct PPA.\n"));
+
+    return VERR_INTNET_FLT_IF_FAILED;
+}
+#endif
+
+
 /**
  * Opens up dedicated stream on top of the interface.
@@ -1652 +1755 @@
     int ret;
 
-    /** @todo support DLPI style 2.*/
+    /** @todo enable and test DLPI style 2.*/
     /*
      * Try style-1 open first.
@@ -1668 +1771 @@
         rc = ldi_open_by_name(szDev, FREAD | FWRITE, kcred, &pThis->u.s.hIface, DevId);
     }
+
+#ifdef VBOX_WITH_NETFLT_SOLARIS_DLPISTYLE2
+    if (rc)
+    {
+        /*
+         * Try DLPI style 2.
+         */        
+        rc = vboxNetFltSolarisOpenStyle2(pThis, &DevId);
+        if (RT_FAILURE(rc))
+            LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStream vboxNetFltSolarisOpenStyle2 failed. rc=%d\n", rc));
+    }
+#endif
 
     ldi_ident_release(DevId);