Changeset 12123

Timestamp:

09/05/08 13:05:31 (3 months ago)

Author:

vboxsync

Message:

Solaris/vboxnetflt: fixed & enabled checksumming. Enabeld fast path ack's.

Files:

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

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

@@ -520 +520 @@
-static int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **ppResult)
-{
-
+
+
-
-    switch (enmCmd)
@@ -557 +558 @@
-    Assert(pQueue);
-
-
+
+
-
-    /*
@@ -638 +640 @@
-    WR(pQueue)->q_ptr = pStream;
-
-    /** @todo Get rid of linked list maintenance; we're not a virtual DLPI device slaving for ring-3 consumers. */
-    /*
-     * Link it to the list of streams.
@@ -985 +986 @@
-                             * Since we are evil, let's acknowledge the request ourselves!
-                             */
-na
+ac
-                            fSendDownstream = false;
-                            LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModWritePut: Fast path request when we need raw mode!\n"));
@@ -1251 +1252 @@
-        bcopy(pMsg->b_rptr + pPhysAddrAck->dl_addr_offset, &pThis->u.s.Mac, sizeof(pThis->u.s.Mac));
-
-
+
+
-    }
-}
@@ -1382 +1384 @@
-static int vboxNetFltSolarisRelink(vnode_t *pVNode, struct lifreq *pInterface, int IpMuxFd, int ArpMuxFd)
-{
-
+
+
-
-    int NewIpMuxId;
@@ -1623 +1626 @@
-                                 * Inject/Eject from the host IP stack.
-                                 */
-
+
+
-                                if (!rc)
-                                {
@@ -1630 +1634 @@
-                                     */
-                                    g_VBoxNetFltSolarisState.CurType = kArpStream;
-
+
+
-                                    if (!rc)
-                                    {
@@ -1643 +1648 @@
-                                        if (VBOX_SUCCESS(rc))
-                                        {
-      
+
-                                            if (fAttach)
-                                            {
@@ -1671 +1676 @@
-                                                ldi_close(IPDevHandle, FREAD | FWRITE, kcred);
-
-%s interface %s\n",
-fAttach ? "Injected" : "Ejected", StrMod.mod_name, StrMod.pos, ArpStrMod.pos
-
+"
+"%s interface %s\n", fAttach ? "Injected" : "Ejected", StrMod.mod_name
+StrMod.pos, ArpStrMod.pos, 
-                                                return VINF_SUCCESS;
-                                            }
@@ -1681 +1686 @@
-                                        else
-                                        {
-module r
+R
-                                                    fAttach ? "inject" : "eject", rc));
-                                        }
@@ -1709 +1714 @@
-                            }
-                            else
-vboxNetFltSolarisDetermineModPos failed
+failed to find position
-                        }
-                        else
@@ -2099 +2104 @@
-
-    bool fChecksumAdjusted = false;
-0
+1
-    if (fSrc & INTNETTRUNKDIR_HOST)
-    {
@@ -2200 +2205 @@
- *                  This must not be DLPI linked messages, must be M_DATA.
- *
-This function expects raw mblk_t (chained is acceptible) and if it
-returns a corrected message, the passed in input message has been
-freed and should not be referenced anymore
+If this function returns a checksum adjusted message, the
+passed in input message has been freed and should not be
+referenced anymore by the caller
- */
-static mblk_t *vboxNetFltSolarisFixChecksums(mblk_t *pMsg)
@@ -2223 +2228 @@
-         */
-        size_t cbIpPacket = 0;
+        mblk_t *pFullMsg = NULL;
-        if (pMsg->b_cont)
-        {
@@ -2252 +2258 @@
-            }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-        /*
@@ -2301 +2306 @@
-            LogFlow((DEVICE_NAME ":fixed IP checkum.\n"));
-
+            /*
+             * If we made a copy and the checksum is corrected on the copy,
+             * free the original, return the checksum fixed copy.
+             */
+            if (pFullMsg)
+            {
+                freemsg(pMsg);
+                return pFullMsg;
+            }
+
-            return pMsg;
-        }
+
+        /*
+         * If we made a copy and the checksum is NOT corrected, free the copy,
+         * and return NULL.
+         */
+        if (pFullMsg)
+            freemsg(pFullMsg);
-    }
-
@@ -2341 +2363 @@
-    else
-    {
-
+
+
-        /* LogFlow((DEVICE_NAME ":%.*Vhxd\n", MBLKL(pMsg), pMsg->b_rptr)); */
-    }