Changeset 36353 in vbox

Timestamp:

Mar 23, 2011 7:08:02 AM (14 years ago)

Author:

vboxsync

Message:

NAT/arp: cosmetic. verfication of updating of pair moved to slirp_arp_cache_update_or_add,
helper functions _update and _add are hidden and asserts on invalid pair adding.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (2 diffs)
• slirp.h (modified) (1 diff)

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

@@ -2020 +2020 @@
 }
 
+/* updates the arp cache
+ * @note: this is helper function, slirp_arp_cache_update_or_add should be used.
+ * @returns 0 - if has found and updated
+ *          1 - if hasn't found.
+ */
+static inline int slirp_arp_cache_update(PNATState pData, uint32_t dst, const uint8_t *mac)
+{
+    struct arp_cache_entry *ac;
+    Assert((   memcmp(mac, broadcast_ethaddr, ETH_ALEN)
+            && memcmp(mac, zerro_ethaddr, ETH_ALEN)));
+    LIST_FOREACH(ac, &pData->arp_cache, list)
+    {
+        if (!memcmp(ac->ether, mac, ETH_ALEN))
+        {
+            ac->ip = dst;
+            return 0;
+        }
+    }
+    return 1;
+}
+/**
+ * add entry to the arp cache
+ * @note: this is helper function, slirp_arp_cache_update_or_add should be used.
+ */
+
+static inline void slirp_arp_cache_add(PNATState pData, uint32_t ip, const uint8_t *ether)
+{
+    struct arp_cache_entry *ac = NULL;
+    Assert((   memcmp(ether, broadcast_ethaddr, ETH_ALEN)
+            && memcmp(ether, zerro_ethaddr, ETH_ALEN)));
+    ac = RTMemAllocZ(sizeof(struct arp_cache_entry));
+    if (ac == NULL)
+    {
+        Log(("NAT: Can't allocate arp cache entry\n"));
+        return;
+    }
+    ac->ip = ip;
+    memcpy(ac->ether, ether, ETH_ALEN);
+    LIST_INSERT_HEAD(&pData->arp_cache, ac, list);
+}
+
+/* updates or adds entry to the arp cache
+ * @returns 0 - if has found and updated
+ *          1 - if hasn't found.
+ */
 int slirp_arp_cache_update_or_add(PNATState pData, uint32_t dst, const uint8_t *mac)
 {
+    if (   !memcmp(mac, broadcast_ethaddr, ETH_ALEN)
+        || !memcmp(mac, zerro_ethaddr, ETH_ALEN))
+    {
+        static bool fBroadcastEtherAddReported;
+        if (!fBroadcastEtherAddReported)
+        {
+            LogRel(("NAT: Attept to add pair [%R[ether]:%R[IP4]] was ignored\n",
+                    mac, &dst));
+            fBroadcastEtherAddReported = true;
+        }
+        return 1;
+    }
     if (slirp_arp_cache_update(pData, dst, mac))
         slirp_arp_cache_add(pData, dst, mac);
@@ -2028 +2085 @@
 }
 
-/* updates the arp cache
- * @returns 0 - if has found and updated
- *          1 - if hasn't found.
- */
-int slirp_arp_cache_update(PNATState pData, uint32_t dst, const uint8_t *mac)
-{
-    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))
-        {
-            ac->ip = dst;
-            return 0;
-        }
-    }
-    return 1;
-}
-
-void slirp_arp_cache_add(PNATState pData, uint32_t ip, const uint8_t *ether)
-{
-    struct arp_cache_entry *ac = NULL;
-    ac = RTMemAllocZ(sizeof(struct arp_cache_entry));
-    if (ac == NULL)
-    {
-        Log(("NAT: Can't allocate arp cache entry\n"));
-        return;
-    }
-    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);
-}
 
 void slirp_set_mtu(PNATState pData, int mtu)

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

@@ -344 +344 @@
 /*slirp.c*/
 void slirp_arp_who_has(PNATState pData, uint32_t dst);
-int slirp_arp_cache_update(PNATState pData, uint32_t dst, const uint8_t *mac);
-void slirp_arp_cache_add(PNATState pData, uint32_t ip, const uint8_t *ether);
 int slirp_arp_cache_update_or_add(PNATState pData, uint32_t dst, const uint8_t *mac);
 int slirp_init_dns_list(PNATState pData);