Changeset 25362 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Dec 14, 2009 1:16:35 PM (15 years ago)

Author:

vboxsync

Message:

NAT: apply patch from xtracker 5434: update/create ARP cache entry on DHCPACK + re-activate port forwarding on link-up

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -324 +324 @@
         FILL_BOOTP_EXT(q, RFC1533_HOSTNAME, val, slirp_hostname);
     }
+    slirp_arp_cache_update_or_add(pData, rbp->bp_yiaddr.s_addr, bc->macaddr);
     return q - rbp->bp_vend; /*return offset */
 }
@@ -457 +458 @@
                memcpy(bc->macaddr, bp->bp_hwaddr, bp->bp_hlen);
                bc->addr.s_addr = bp->bp_ciaddr.s_addr;
-               slirp_arp_cache_update(pData, bp->bp_ciaddr.s_addr, bp->bp_hwaddr);
             }
             break;
@@ -481 +481 @@
             memcpy(bc->macaddr, bp->bp_hwaddr, bp->bp_hlen);
             bc->addr.s_addr = ui32;
-            slirp_arp_cache_update(pData, bp->bp_ciaddr.s_addr, bp->bp_hwaddr);
             break;
 

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

@@ -653 +653 @@
 void slirp_link_up(PNATState pData)
 {
+    struct arp_cache_entry *ac = NULL;
     link_up = 1;
+
+    if (LIST_EMPTY(&pData->arp_cache))
+        return;
+
+    LIST_FOREACH(ac, &pData->arp_cache, list)
+    {
+        activate_port_forwarding(pData, ac->ether);
+    }
 }
 
@@ -2123 +2132 @@
 }
 
+int slirp_arp_cache_update_or_add(PNATState pData, uint32_t dst, const uint8_t *mac)
+{
+    if (slirp_arp_cache_update(pData, dst, mac))
+        slirp_arp_cache_add(pData, dst, mac);
+
+    return 0;
+}
+
 /* updates the arp cache
  * @returns 0 - if has found and updated

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

@@ -319 +319 @@
 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);
 #define MIN_MRU 128
 #define MAX_MRU 16384