Changeset 25402 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

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

Author:

vboxsync

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

56028

Message:

NAT: re-establish port-forwarding after savestate / restore state

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• libslirp.h (modified) (1 diff)
• slirp.c (modified) (7 diffs)

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

@@ -53 +53 @@
 void slirp_input(PNATState pData, void *pvData);
 #endif
-void slirp_set_ethaddr(PNATState pData, const uint8_t *ethaddr);
+void slirp_set_ethaddr_and_activate_port_forwarding(PNATState pData, const uint8_t *ethaddr, uint32_t GuestIP);
 
 /* you must provide the following functions: */

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

@@ -194 +194 @@
 #define LOG_NAT_SOCK(so, proto, winevent, r_fdset, w_fdset, x_fdset) DO_LOG_NAT_SOCK((so), proto, (winevent), r_fdset, w_fdset, x_fdset)
 
-static void activate_port_forwarding(PNATState, uint8_t *pEther);
+static void activate_port_forwarding(PNATState, const uint8_t *pEther);
 
 static const uint8_t special_ethaddr[6] =
@@ -653 +653 @@
 void slirp_link_up(PNATState pData)
 {
-    struct arp_cache_entry *ac = NULL;
+    struct arp_cache_entry *ac;
     link_up = 1;
 
@@ -671 +671 @@
 {
     struct socket *so;
-    struct port_forward_rule *rule = NULL;
+    struct port_forward_rule *rule;
 
     while ((so = tcb.so_next) != &tcb)
@@ -1769 +1769 @@
  * @todo finish this for service case
  */
-static void activate_port_forwarding(PNATState pData, uint8_t *h_source)
-{
-    struct port_forward_rule *rule = NULL;
+static void activate_port_forwarding(PNATState pData, const uint8_t *h_source)
+{
+    struct port_forward_rule *rule;
 
     /* check mac here */
@@ -1909 +1909 @@
 }
 
-void slirp_set_ethaddr(PNATState pData, const uint8_t *ethaddr)
+void slirp_set_ethaddr_and_activate_port_forwarding(PNATState pData, const uint8_t *ethaddr, uint32_t GuestIP)
 {
 #ifndef VBOX_WITH_NAT_SERVICE
     memcpy(client_ethaddr, ethaddr, ETH_ALEN);
 #endif
+    if (GuestIP != INADDR_ANY)
+    {
+        slirp_arp_cache_update_or_add(pData, GuestIP, ethaddr);
+        activate_port_forwarding(pData, ethaddr);
+    }
 }
 
@@ -2051 +2056 @@
 int slirp_arp_lookup_ether_by_ip(PNATState pData, uint32_t ip, uint8_t *ether)
 {
-    struct arp_cache_entry *ac = NULL;
+    struct arp_cache_entry *ac;
 
     if (ether == NULL)
@@ -2077 +2082 @@
 int slirp_arp_lookup_ip_by_ether(PNATState pData, const uint8_t *ether, uint32_t *ip)
 {
-    struct arp_cache_entry *ac = NULL;
+    struct arp_cache_entry *ac;
     *ip = INADDR_ANY;