Changeset 25205 in vbox

Timestamp:

Dec 5, 2009 10:40:15 AM (15 years ago)

Author:

vboxsync

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

55691

Message:

NAT: port-forwarding attempts to active itself till count of (registered and acivated aren't equal)
vbox/#5666 and vbox/#5664.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (10 diffs)
• slirp_state.h (modified) (1 diff)

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

@@ -1503 +1503 @@
                 slirp_arp_cache_add(pData, *(uint32_t *)ah->ar_tip, &eh->h_dest[0]);
                 /* good opportunity to activate port-forwarding on address (self)asignment*/
-                activate_port_forwarding(pData, eh);
+                if (pData->port_forwarding_activated != pData->port_forwarding_count)
+                    activate_port_forwarding(pData, eh);
             }
             break;
@@ -1515 +1516 @@
             slirp_arp_cache_add(pData, *(uint32_t *)ah->ar_sip, ah->ar_sha);
             /*after/save restore we need up port forwarding again*/
-            if (pData->port_forwarding_activated == 0)
+            if (pData->port_forwarding_activated != pData->port_forwarding_count)
                 activate_port_forwarding(pData, eh);
             m_free(pData, m);
@@ -1603 +1604 @@
 
 
-    if (pData->port_forwarding_activated == 0)
+    if (pData->port_forwarding_activated != pData->port_forwarding_count)
         activate_port_forwarding(pData, mtod(m, struct ethhdr *));
 
@@ -1742 +1743 @@
     struct port_forward_rule *rule = NULL;
 
-    pData->port_forwarding_activated = 1;
     /* check mac here */
     LIST_FOREACH(rule, &pData->port_forward_rule_head, list)
@@ -1773 +1773 @@
         {
             /* the address wasn't granted */
-            pData->port_forwarding_activated = 0;
             return;
         }
-#if defined(DEBUG_vvl) && !defined(VBOX_WITH_NAT_SERVICE)
-        Assert(rule->guest_addr.s_addr == guest_addr);
+#if !defined(VBOX_WITH_NAT_SERVICE)
+        if (rule->guest_addr.s_addr != guest_addr)
+        {
+            continue;
+        }
 #endif
 
@@ -1786 +1788 @@
             so = udp_listen(pData, rule->bind_ip.s_addr, htons(rule->host_port), guest_addr,
                             htons(rule->guest_port), 0);
+            pData->port_forwarding_activated++;
         }
         else
@@ -1791 +1794 @@
             so = solisten(pData, rule->bind_ip.s_addr, htons(rule->host_port), guest_addr,
                           htons(rule->guest_port), 0);
+            pData->port_forwarding_activated++;
         }
         if (so == NULL)
@@ -1837 +1841 @@
     remove_port_forwarding:
         LIST_REMOVE(rule, list);
+        pData->port_forwarding_count--;
         RTMemFree(rule);
     }
@@ -1871 +1876 @@
     /* @todo add mac address */
     LIST_INSERT_HEAD(&pData->port_forward_rule_head, rule, list);
+    pData->port_forwarding_count++;
     return 0;
 }
@@ -2061 +2067 @@
     LIST_FOREACH(ac, &pData->arp_cache, list)
     {
-        if (memcmp(ether, ac->ether, ETH_ALEN))
+        if (memcmp(ether, ac->ether, ETH_ALEN) == 0)
         {
             *ip = ac->ip;

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

@@ -319 +319 @@
     struct port_forward_rule_list port_forward_rule_head;
     int port_forwarding_activated;
+    int port_forwarding_count;
     struct arp_cache_head arp_cache;
     /*libalis modules' handlers*/