Changeset 30004 in vbox

Timestamp:

Jun 2, 2010 9:35:10 PM (14 years ago)

Author:

vboxsync

Message:

SrvIntNetR0.cpp: intnetR0NetworkDeliver must send to the internal network before hitting the wire or the other guests will get the edited ARP packages when MAC sharing is enabled (wireless). Fixes #4960.

File:

• trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

@@ -3106 +3106 @@
 {
     /*
-     * Trunk first so we don't wast any more time before hitting the wire.
+     * Do the interfaces first before sending it to the wire and risk having to
+     * modify it.
+     */
+    uint32_t iIf = pDstTab->cIfs;
+    while (iIf-- > 0)
+    {
+        PINTNETIF pIf = pDstTab->aIfs[iIf].pIf;
+        intnetR0IfSend(pIf, pIfSender, pSG,
+                       pDstTab->aIfs[iIf].fReplaceDstMac ? &pIf->MacAddr: NULL);
+        intnetR0BusyDecIf(pIf);
+        pDstTab->aIfs[iIf].pIf = NULL;
+    }
+    pDstTab->cIfs = 0;
+
+    /*
+     * Send to the trunk.
      *
      * Note! The switching functions will include the trunk even when the frame
@@ -3125 +3140 @@
         pDstTab->fTrunkDst = 0;
     }
-
-    /*
-     * Do the interfaces.
-     */
-    uint32_t iIf = pDstTab->cIfs;
-    while (iIf-- > 0)
-    {
-        PINTNETIF pIf = pDstTab->aIfs[iIf].pIf;
-        intnetR0IfSend(pIf, pIfSender, pSG,
-                       pDstTab->aIfs[iIf].fReplaceDstMac ? &pIf->MacAddr: NULL);
-        intnetR0BusyDecIf(pIf);
-        pDstTab->aIfs[iIf].pIf = NULL;
-    }
-    pDstTab->cIfs = 0;
 }
 
@@ -3945 +3946 @@
 
     /*
-     * Set fDestroying if requested to do so and then wake up all the sleeping        
-     * threads (usually just one).   We leave the semaphore in the signalled 
+     * Set fDestroying if requested to do so and then wake up all the sleeping
+     * threads (usually just one).   We leave the semaphore in the signalled
      * state so the next caller will return immediately.
      */