Changeset 39555 in vbox

Timestamp:

Dec 8, 2011 5:52:20 AM (13 years ago)

Author:

vboxsync

Message:

NAT/service: registering port-forwarding without ether address of the guest.

File:

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

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

@@ -1722 +1722 @@
 {
     struct port_forward_rule *rule, *tmp;
+    const uint8_t *pu8EthSource;
+    if (!h_source)
+        pu8EthSource = h_source;
 
     /* check mac here */
@@ -1741 +1744 @@
 
 #ifdef VBOX_WITH_NAT_SERVICE
-        if (memcmp(rule->mac_address, h_source, ETH_ALEN) != 0)
-            continue; /*not right mac, @todo: it'd be better do the list port forwarding per mac */
-        guest_addr = find_guest_ip(pData, h_source);
-#else
-#if 0
-        if (memcmp(client_ethaddr, h_source, ETH_ALEN) != 0)
-            continue;
-#endif
-        guest_addr = find_guest_ip(pData, h_source);
-#endif
+        /**
+         * case when guest ip is INADDR_ANY shouldn't appear in NAT service
+         */
+        Assert((rule->guest_addr.s_addr != INADDR_ANY));
+        guest_addr = rule->guest_addr.s_addr;
+#else /* VBOX_WITH_NAT_SERVICE */
+        guest_addr = find_guest_ip(pData, pu8EthSource);
+#endif /* !VBOX_WITH_NAT_SERVICE */
         if (guest_addr == INADDR_ANY)
         {
@@ -1835 +1836 @@
 {
     struct port_forward_rule *rule = NULL;
-    Assert(ethaddr);
     LIST_FOREACH(rule, &pData->port_forward_rule_head, list)
     {
@@ -1856 +1856 @@
     rule->guest_addr.s_addr = guest_addr.s_addr;
     rule->bind_ip.s_addr = host_addr.s_addr;
-    memcpy(rule->mac_address, ethaddr, ETH_ALEN);
+    if (ethaddr != NULL)
+        memcpy(rule->mac_address, ethaddr, ETH_ALEN);
     /* @todo add mac address */
     LIST_INSERT_HEAD(&pData->port_forward_rule_head, rule, list);
     pData->cRedirectionsStored++;
     /* activate port-forwarding if guest has already got assigned IP */
-    if (memcmp(ethaddr, zerro_ethaddr, ETH_ALEN))
+    if (   ethaddr
+        && memcmp(ethaddr, zerro_ethaddr, ETH_ALEN))
         activate_port_forwarding(pData, ethaddr);
     return 0;