Changeset 11117 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 4, 2008 5:39:07 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

34053

Message:

intnet: Fixed busted ARP snooping on packets comming from the VMs. When we're the sharing MAC address of the host interface, this *has* to work or we'll not find the ARP replies.

File:

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

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

@@ -980 +980 @@
      * has already checked those.
      */
-    unsigned cLeft = pCache->cEntries;
+    int i = pCache->cEntries - 2;
     uint8_t const *pbEntry = pCache->pbEntries + pCache->cbEntry;
-    while (--cLeft > 1)
+    while (i >= 1)
     {
         if (RT_LIKELY(intnetR0AddrUIsEqualEx((PCRTNETADDRU)pbEntry, pAddr, cbAddr)))
@@ -990 +990 @@
         }
         pbEntry += pCache->cbEntry;
-        cLeft--;
+        i--;
     }
 
@@ -1014 +1014 @@
 
     /*
-     * The optimized case is when the address the first cache entry.
+     * The optimized case is when the address the first or last cache entry.
      */
     unsigned i = pCache->cEntries;
     if (RT_LIKELY(   i > 0
-                  && intnetR0AddrUIsEqualEx((PCRTNETADDRU)pCache->pbEntries, pAddr, cbAddr)))
+                  && (   intnetR0AddrUIsEqualEx((PCRTNETADDRU)pCache->pbEntries, pAddr, cbAddr)
+                      || (i > 1
+                          && intnetR0AddrUIsEqualEx((PCRTNETADDRU)(pCache->pbEntries + pCache->cbEntry * i), pAddr, cbAddr))) ))
     {
         /** @todo usage/ageing? */
         return;
     }
-    if (i <= 1)
-        return;
-
-    /*
-     * And the case where it's the last entry.
-     */
-    i--;
-    if (RT_LIKELY(intnetR0AddrUIsEqualEx((PCRTNETADDRU)pCache->pbEntries, pAddr, cbAddr)))
-    {
-        /** @todo usage/ageing? */
-        return;
-    }
-    if (i <= 1)
-        return;
-
     intnetR0IfAddrCacheAddSlow(pIf, pCache, pAddr, cbAddr, pszMsg);
 }
@@ -2250 +2237 @@
     {
         intnetR0SgInitTemp(&Sg, (void *)pvFrame, cbFrame);
+        if (pNetwork->fFlags & INTNET_OPEN_FLAGS_SHARED_MAC_ON_WIRE)
+            intnetR0IfSnoopAddr(pIf, (uint8_t *)pvFrame, cbFrame, (uint16_t *)&Sg.fFlags);
         intnetR0NetworkSend(pNetwork, pIf, 0, &Sg, !!pTrunkIf);
     }
@@ -3472 +3461 @@
                 Assert(pTrunkIF->pIfPort);
                 pNetwork->pTrunkIF = pTrunkIF;
-                LogFlow(("intnetR0NetworkCreateTrunkIf: VINF_SUCCESS - pszName=%s szTrunk=%s Network=%s\n",
-                         rc, pszName, pNetwork->szTrunk, pNetwork->szName));
+                Log(("intnetR0NetworkCreateTrunkIf: VINF_SUCCESS - pszName=%s szTrunk=%s %s Network=%s%s\n",
+                     pszName, pNetwork->szTrunk, pNetwork->fFlags & INTNET_OPEN_FLAGS_SHARED_MAC_ON_WIRE ? " shared-mac" : "", pNetwork->szName));
                 return VINF_SUCCESS;
             }