Changeset 12620 in vbox for trunk/src

Timestamp:

Sep 21, 2008 3:20:32 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/vboxnetflt: Loopback enabled.

File:

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

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

@@ -316 +316 @@
     bool fRawMode;                        /* whether raw mode request was successful */
     uint32_t ModeReqId;                   /* track MIOCTLs for swallowing our fake request acknowledgements */
-    PVBOXNETFLTPACKETID pLoopbackHead;    /* loopback packet identifier head */
-    PVBOXNETFLTPACKETID pLoopbackTail;    /* loopback packet identifier tail */
+    PVBOXNETFLTPACKETID pHead;            /* loopback packet identifier head */
+    PVBOXNETFLTPACKETID pTail;            /* loopback packet identifier tail */
     size_t cLoopback;                     /* loopback queue size list */
 } vboxnetflt_promisc_stream_t;
@@ -1774 +1774 @@
     RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
 
-    vboxnetflt_promisc_stream_t *pPromiscStream = (vboxnetflt_promisc_stream_t *)pThis->u.s.pvPromiscStream;
+    vboxnetflt_promisc_stream_t *pPromiscStream = pThis->u.s.pvPromiscStream;
     if (pPromiscStream)
     {
@@ -1780 +1780 @@
          * Free-up loopback buffers.
          */
-        PVBOXNETFLTPACKETID pCur = pPromiscStream->pLoopbackHead;
+        PVBOXNETFLTPACKETID pCur = pPromiscStream->pHead;
         while (pCur)
         {
@@ -2402 +2402 @@
 
     PCRTNETETHERHDR pEthHdr = (PCRTNETETHERHDR)pMsg->b_rptr;
-    PVBOXNETFLTPACKETID pHead = pPromiscStream->pLoopbackHead;
-    PVBOXNETFLTPACKETID pTail = pPromiscStream->pLoopbackTail;
     PVBOXNETFLTPACKETID pCur = NULL;
     int rc = VINF_SUCCESS;
@@ -2410 +2408 @@
         do
         {
-            if (!pHead)
+            if (!pPromiscStream->pHead)
             {
                 pCur = RTMemAllocZ(sizeof(VBOXNETFLTPACKETID));
@@ -2421 +2419 @@
                 vboxNetFltSolarisInitPacketId(pCur, pMsg);
 
-                pHead = pCur;
-                pTail = pHead;
+                pPromiscStream->pHead = pCur;
+                pPromiscStream->pTail = pPromiscStream->pHead;
                 pPromiscStream->cLoopback++;
+
+                LogFlow((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback initialized head. checksum=%u.\n",
+                        pPromiscStream->pHead->Checksum));
                 break;
             }
 
-            if (   pTail
-                && pTail->cbPacket == 0)
+            if (   pPromiscStream->pTail
+                && pPromiscStream->pTail->cbPacket == 0)
             {
-                pCur = pTail;
+                pCur = pPromiscStream->pTail;
                 vboxNetFltSolarisInitPacketId(pCur, pMsg);
+
+                LogFlow((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback re-used tail checksum=%u cLoopback=%d.\n",
+                        pCur->Checksum, pPromiscStream->cLoopback));
                 break;
             }
@@ -2442 +2446 @@
             }
 
-            pTail->pNext = pCur;
+            pPromiscStream->pTail->pNext = pCur;
             vboxNetFltSolarisInitPacketId(pCur, pMsg);
             pPromiscStream->cLoopback++;
+
+            LogFlow((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback added tail checksum=%u cLoopback=%d.\n", pCur->Checksum,
+                    pPromiscStream->cLoopback));
             break;
         } while (0);
@@ -2453 +2460 @@
          * Maximum loopback queue size reached. Re-use head as tail.
          */
-        PVBOXNETFLTPACKETID pCur = pHead;
-        pHead = pHead->pNext;
-        pTail->pNext = pCur;
-        pTail = pCur;
+        PVBOXNETFLTPACKETID pCur = pPromiscStream->pHead;
+        pPromiscStream->pHead = pPromiscStream->pHead->pNext;
+        pPromiscStream->pTail->pNext = pCur;
+        pPromiscStream->pTail = pCur;
 
         pCur->pNext = NULL;
         vboxNetFltSolarisInitPacketId(pCur, pMsg);
+        LogFlow((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback recycled head!! checksum=%u cLoopback=%d\n", pCur->Checksum,
+                pPromiscStream->cLoopback));
     }
 
@@ -2494 +2503 @@
         return false;
 
-    PVBOXNETFLTPACKETID pCur = pPromiscStream->pLoopbackHead;
+    PVBOXNETFLTPACKETID pCur = pPromiscStream->pHead;
+    bool fIsOur = false;
     while (pCur)
     {
         if (pCur->cbPacket != cbMsg)
-            return false;
+        {
+            pCur = pCur->pNext;
+            continue;
+        }
 
         PCRTNETETHERHDR pEthHdr = (PCRTNETETHERHDR)pMsg->b_rptr;
@@ -2514 +2527 @@
             || pCur->DstMac.au8[5] != pEthHdr->DstMac.au8[5])
         {
-            return false;
+            pCur = pCur->pNext;
+            continue;
         }
 
         uint16_t Checksum = RTCrc32(pMsg->b_rptr, cbMsg);
         if (pCur->Checksum != Checksum)
-            return false;
+        {
+            pCur = pCur->pNext;
+            continue;
+        }
 
         /*
-         * Yes, it really is our own packet.
+         * Yes, it really is our own packet, mark it as handled
+         * and return it's found.
          */
+        pCur->cbPacket = 0;
+        pPromiscStream->cLoopback--;
+        LogFlow((DEVICE_NAME ":vboxNetFltSolarisIsOurMBlk found packet %p cLoopback=%d\n", pMsg, pPromiscStream->cLoopback));
         return true;
     }
 
+    NOREF(pThis);
     return false;
 }
@@ -2550 +2572 @@
      * Don't loopback packets we transmit to the wire.
      */
-    /** @todo -XXX- fix this with proper loopback handling. We must not be using unspecified flags. */
-    if (pMsg->b_flag & MSGNOLOOP)
+    vboxnetflt_promisc_stream_t *pPromiscStream = pThis->u.s.pvPromiscStream;
+    if (vboxNetFltSolarisIsOurMBlk(pThis, pPromiscStream, pMsg))
     {
         LogFlow((DEVICE_NAME ":Avoiding packet loopback.\n"));
@@ -2933 +2955 @@
     if (fDst & INTNETTRUNKDIR_WIRE)
     {
-        vboxnetflt_stream_t *pPromiscStream = pThis->u.s.pvPromiscStream;
-        queue_t *pPromiscWriteQueue = WR(pPromiscStream->pReadQueue);
+        vboxnetflt_promisc_stream_t *pPromiscStream = pThis->u.s.pvPromiscStream;
+        queue_t *pPromiscWriteQueue = WR(pPromiscStream->Stream.pReadQueue);
 
         mblk_t *pMsg = vboxNetFltSolarisMBlkFromSG(pThis, pSG, fDst);
@@ -2943 +2965 @@
         }
 
-        LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_WIRE %u\n", DB_CKSUM16(pMsg)));
-
-        /*
-         * Flag for avoiding loopback. (Should be fixed later)
-         */
-        pMsg->b_flag |= MSGNOLOOP;
+        LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_WIRE\n"));
+
+        vboxNetFltSolarisQueueLoopback(pThis, pPromiscStream, pMsg);
         putnext(pPromiscWriteQueue, pMsg);
     }