Changeset 19604 in vbox for trunk

Timestamp:

May 12, 2009 10:54:38 AM (16 years ago)

Author:

vboxsync

Message:

Solaris/VBoxNetFlt: do the attach work ourselves rather than dl_attach.

File:

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

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

@@ -1410 +1410 @@
 }
 
-#if 0
-/**
- * Set the DLPI style-2 PPA via an attach request.
- * Currently unused; dl_attach is used instead.
+
+/**
+ * Set the DLPI style-2 PPA via an attach request, Synchronous.
+ * Waits for request acknowledgement and verifies the result.
  *
  * @returns VBox status code.
@@ -1422 +1422 @@
 {
     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);
+    mblk_t *pAttachMsg = mexchange(NULL, NULL, DL_ATTACH_REQ_SIZE, M_PROTO, DL_ATTACH_REQ);
     if (RT_UNLIKELY(!pAttachMsg))
         return VERR_NO_MEMORY;
@@ -1436 +1434 @@
         rc = ldi_getmsg(hDevice, &pAttachMsg, NULL);
         if (!rc)
-            return VINF_SUCCESS;
+        {
+            /*
+             * Verify if the attach succeeded.
+             */
+            size_t cbMsg = MBLKL(pAttachMsg);
+            if (cbMsg >= sizeof(t_uscalar_t))
+            {
+                union DL_primitives *pPrim = (union DL_primitives *)pAttachMsg->b_rptr;
+                t_uscalar_t AckPrim = pPrim->dl_primitive;
+
+                if (   AckPrim == DL_OK_ACK                     /* Success! */
+                    && cbMsg == DL_OK_ACK_SIZE)
+                {
+                    rc = VINF_SUCCESS;
+                }
+                else if (  AckPrim == DL_ERROR_ACK              /* Error Ack. */
+                        && cbMsg == DL_ERROR_ACK_SIZE)
+                {
+                    LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachReq ldi_getmsg succeeded, but unsupported op.\n"));
+                    rc = VERR_NOT_SUPPORTED;
+                }
+                else                                            /* Garbled reply */
+                {
+                    LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachReq ldi_getmsg succeeded, but invalid op. expected %s recvd %s\n",
+                        dl_primstr(DL_OK_ACK), dl_primstr(AckPrim)));
+                    rc = VERR_INVALID_FUNCTION;
+                }
+            }
+            else
+            {
+                LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachReq ldi_getmsg succeeded, but invalid size %d expected %d\n", cbMsg,
+                            DL_OK_ACK_SIZE));
+                rc = VERR_INVALID_FUNCTION;
+            }
+        }
         else
+        {
             LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachReq ldi_getmsg failed. rc=%d\n", rc));
+            rc = VERR_INVALID_FUNCTION;
+        }
     }
     else
+    {
         LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachReq ldi_putmsg failed. rc=%d\n", rc));
-
-    return VERR_GENERAL_FAILURE;
-}
-#endif
+        rc = VERR_UNRESOLVED_ERROR;
+    }
+
+    freemsg(pAttachMsg);
+    return rc;
+}
 
 
@@ -1708 +1746 @@
              * Attach the PPA explictly.
              */
-            rc = dl_attach(pThis->u.s.hIface, (int)PPA, NULL);
-            if (!rc)
+            rc = vboxNetFltSolarisAttachReq(pThis->u.s.hIface, (int)PPA);
+            if (RT_SUCCESS(rc))
             {
                 RTStrFree(pszDev);
-                return VINF_SUCCESS;
+                return rc;
             }