Changeset 54824 in vbox

Timestamp:

Mar 18, 2015 2:27:32 AM (10 years ago)

Author:

vboxsync

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

99024

Message:

NAT: G/c ancient unused VBOX_WITH_NAT_SERVICE ifdefs.

File:

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

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

@@ -1544 +1544 @@
             continue;
 
-#ifdef VBOX_WITH_NAT_SERVICE
-        /**
-         * 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)
         {
@@ -1559 +1551 @@
         }
 
-#if !defined(VBOX_WITH_NAT_SERVICE)
         if (   rule->guest_addr.s_addr != guest_addr
             && rule->guest_addr.s_addr != INADDR_ANY)
@@ -1565 +1556 @@
         if (rule->guest_addr.s_addr == INADDR_ANY)
             rule->guest_addr.s_addr = guest_addr;
-#endif
 
         LogRel(("NAT: set redirect %s host %RTnaipv4:%d => guest %RTnaipv4:%d\n",