Changeset 36352 in vbox

Timestamp:

Mar 23, 2011 4:58:16 AM (14 years ago)

Author:

vboxsync

Message:

NAT: for gratuitous ARP processing pair ar_sip, ar_sha is used.
NAT now is reporting what pair is used for addressing for statically address assigned guests.
It's also prevent adding broadcast ethernet address as one of element of pair.

File:

• trunk/src/VBox/Devices/Network/slirp/slirp.c (modified) (4 diffs)

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -1456 +1456 @@
                  * let's do an ARP cache update
                  */
-                slirp_arp_cache_update_or_add(pData, *(uint32_t *)ah->ar_tip, &eh->h_dest[0]);
+                static bool fGratuitousArpReported;
+                if (!fGratuitousArpReported)
+                {
+                    LogRel(("NAT: Gratuitous ARP [IP:%R[IP4], ether:%R[ether]]\n",
+                            ah->ar_sip, ah->ar_sha));
+                    fGratuitousArpReported = true;
+                }
+                slirp_arp_cache_update_or_add(pData, *(uint32_t *)ah->ar_sip, &ah->ar_sha[0]);
             }
             break;
@@ -1948 +1955 @@
     LIST_FOREACH(ac, &pData->arp_cache, list)
     {
-        if (ac->ip == ip)
+        if (   ac->ip == ip
+            && memcmp(ac->ether, broadcast_ethaddr, ETH_ALEN) != 0)
         {
             memcpy(ether, ac->ether, ETH_ALEN);
@@ -2027 +2035 @@
 {
     struct arp_cache_entry *ac;
+    if (!memcmp(mac, broadcast_ethaddr, ETH_ALEN))
+        return 1;
     LIST_FOREACH(ac, &pData->arp_cache, list)
     {
-        if (memcmp(ac->ether, mac, ETH_ALEN) == 0)
+        if (!memcmp(ac->ether, mac, ETH_ALEN))
         {
             ac->ip = dst;
@@ -2048 +2058 @@
     }
     ac->ip = ip;
+    if(!memcmp(ether, broadcast_ethaddr, ETH_ALEN))
+    {
+        static bool fBroadcastEtherAddReported;
+        if (!fBroadcastEtherAddReported)
+        {
+            LogRel(("NAT: Attept to add pair [%R[ether]:%R[IP4]] was ignored\n",
+                    ether, ip));
+            fBroadcastEtherAddReported = true;
+        }
+        RTMemFree(ac);
+        return;
+    }
     memcpy(ac->ether, ether, ETH_ALEN);
     LIST_INSERT_HEAD(&pData->arp_cache, ac, list);