Changeset 12683 in vbox for trunk/src

Timestamp:

Sep 24, 2008 12:12:13 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/vboxnetflt: bits.

File:

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

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

@@ -793 +793 @@
     vboxnetflt_stream_t **ppPrevStream = NULL;
 
+    qprocsoff(pQueue);
+
     /*
      * Get instance data.
@@ -806 +808 @@
     PVBOXNETFLTINS pThis = ASMAtomicUoReadPtr((void * volatile *)&pStream->pThis);
     RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-
-    qprocsoff(pQueue);
 
     /*
@@ -859 +859 @@
      * Yes, I'm paranoid.
      */
-    if (!pMsg || !pQueue)
+    if (!pMsg)
     {
         LogRel((DEVICE_NAME ":VBoxNetFltSolarisModReadPut huh?? Invalid parameters.\n"));
@@ -884 +884 @@
         {
             /*
-             * Retain the instance if we're actively filtering.
+             * Retain the instance if we're filtering regardless of we are active or not
+             * The reason being even when we are inactive we reference the instance (e.g
+             * the promiscuous OFF acknowledgement case).
              */
             RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
@@ -2396 +2398 @@
             if (!pPromiscStream->pHead)
             {
-                pCur = RTMemAllocZ(sizeof(VBOXNETFLTPACKETID));
+                pCur = RTMemAlloc(sizeof(VBOXNETFLTPACKETID));
                 if (RT_UNLIKELY(!pCur))
                 {
@@ -2407 +2409 @@
                 pPromiscStream->pHead = pCur;
                 pPromiscStream->pTail = pCur;
-                pCur->pNext = NULL;
                 pPromiscStream->cLoopback++;
 
@@ -2414 +2415 @@
                 break;
             }
-
-            if (   pPromiscStream->pTail
-                && pPromiscStream->pTail->cbPacket == 0)
+            else if (   pPromiscStream->pTail
+                     && pPromiscStream->pTail->cbPacket == 0)
             {
                 pCur = pPromiscStream->pTail;
@@ -2426 +2426 @@
                 break;
             }
-
-            AssertRelease(pPromiscStream->pTail);
-
-            pCur = RTMemAllocZ(sizeof(VBOXNETFLTPACKETID));
-            if (RT_UNLIKELY(!pCur))
+            else
             {
-                rc = VERR_NO_MEMORY;
+                Assert(pPromiscStream->pTail);
+                pCur = RTMemAlloc(sizeof(VBOXNETFLTPACKETID));
+                if (RT_UNLIKELY(!pCur))
+                {
+                    rc = VERR_NO_MEMORY;
+                    break;
+                }
+
+                vboxNetFltSolarisInitPacketId(pCur, pMsg);
+
+                pPromiscStream->pTail->pNext = pCur;
+                pPromiscStream->pTail = pCur;
+                pPromiscStream->cLoopback++;
+
+                LogFlow((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback added tail checksum=%u cLoopback=%d.\n", pCur->Checksum,
+                        pPromiscStream->cLoopback));
                 break;
             }
-
-            vboxNetFltSolarisInitPacketId(pCur, pMsg);
-            pPromiscStream->pTail->pNext = pCur;
-            pPromiscStream->pTail = pCur;
-            pCur->pNext = NULL;
-            pPromiscStream->cLoopback++;
-
-            LogFlow((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback added tail checksum=%u cLoopback=%d.\n", pCur->Checksum,
-                    pPromiscStream->cLoopback));
-            break;
         } while (0);
     }
@@ -2460 +2461 @@
         pPromiscStream->pTail = pCur;
 
-        pCur->pNext = NULL;
         vboxNetFltSolarisInitPacketId(pCur, pMsg);
         LogFlow((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback recycled head!! checksum=%u cLoopback=%d\n", pCur->Checksum,
@@ -2608 +2608 @@
             pMsg = pCorrectedMsg;
     }
-
     vboxNetFltSolarisAnalyzeMBlk(pMsg);
+
 #endif
 
@@ -2809 +2809 @@
                     && RT_BE2H_U16(pUdpHdr->uh_dport) == 68)
                 {
-                    LogFlow((DEVICE_NAME ":UDP bootp ack D=%.6Rhxs S=%.6Rhxs UDP_CheckSum=%04x Computex=%04x\n", pb, pb + 6,
+                    LogRel((DEVICE_NAME ":UDP bootp ack D=%.6Rhxs S=%.6Rhxs UDP_CheckSum=%04x Computex=%04x\n", pb, pb + 6,
                                 RT_BE2H_U16(pUdpHdr->uh_sum), RT_BE2H_U16(RTNetIPv4UDPChecksum(pIpHdr, pUdpHdr, pUdpHdr + 1))));
                 }
@@ -2984 +2984 @@
     }
 
-
     /*
      * Create a message block and send it up the host stack (upstream).
@@ -2997 +2996 @@
 
             /*
-             * Construct a DL_UNITDATA_IND style message.
+             * Send message up ARP stream.
              */
-            mblk_t *pDlpiMsg;
-            int rc = vboxNetFltSolarisRawToUnitData(pMsg, &pDlpiMsg);
-            if (RT_SUCCESS(rc))
+            if (fArp)
             {
-                pMsg = pDlpiMsg;
-
-                if (fArp)
+                LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST ARP\n"));
+
+                /*
+                 * Construct a DL_UNITDATA_IND style message for ARP as it doesn't understand fast path.
+                 */
+                mblk_t *pDlpiMsg;
+                int rc = vboxNetFltSolarisRawToUnitData(pMsg, &pDlpiMsg);
+                if (RT_SUCCESS(rc))
                 {
-                    LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST ARP\n"));
-
-                    /*
-                     * Send message up ARP stream.
-                     */
-                    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+                    pMsg = pDlpiMsg;
 
                     vboxnetflt_stream_t *pArpStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvArpStream);
@@ -3018 +3015 @@
                     {
                         queue_t *pArpReadQueue = pArpStream->pReadQueue;
-                        Assert(pArpReadQueue);
-
-                        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
-
                         putnext(pArpReadQueue, pMsg);
                     }
                     else
-                    {
-                        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
                         rc = VERR_INVALID_POINTER;
-                    }
                 }
                 else
                 {
-                    LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST\n"));
-
-                    /*
-                     * Send messages up IP stream.
-                     */
-                    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-
-                    vboxnetflt_stream_t *pIpStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvIpStream);
-                    if (RT_LIKELY(pIpStream))
-                    {
-                        queue_t *pIpReadQueue = pIpStream->pReadQueue;
-                        Assert(pIpReadQueue);
-    
-                        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
-                        putnext(pIpReadQueue, pMsg);
-                    }
-                    else
-                    {
-                        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
-                        rc = VERR_INVALID_POINTER;                    
-                    }
+                    LogRel((DEVICE_NAME ":vboxNetFltSolarisRawToUnitData failed! rc=%d\n", rc));
+                    freemsg(pMsg);
+                    rc = VERR_NO_MEMORY;
                 }
             }
             else
             {
-                LogRel((DEVICE_NAME ":vboxNetFltSolarisRawToUnitData failed! rc=%d\n", rc));
-                freemsg(pMsg);
-                rc = VERR_NO_MEMORY;
+                /*
+                 * Send messages up IP stream.
+                 */
+                LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST\n"));
+
+                pMsg->b_rptr += sizeof(RTNETETHERHDR);
+
+                vboxnetflt_stream_t *pIpStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvIpStream);
+                if (RT_LIKELY(pIpStream))
+                {
+                    queue_t *pIpReadQueue = pIpStream->pReadQueue;
+                    putnext(pIpReadQueue, pMsg);
+                }
+                else
+                    rc = VERR_INVALID_POINTER;                    
             }
         }