patch-2.4.21 linux-2.4.21/net/ipv4/netfilter/ip_nat_core.c
Next file: linux-2.4.21/net/ipv4/netfilter/ip_nat_helper.c
Previous file: linux-2.4.21/net/ipv4/netfilter/ip_nat_amanda.c
Back to the patch index
Back to the overall index
- Lines: 32
- Date:
2003-06-13 07:51:39.000000000 -0700
- Orig file:
linux-2.4.20/net/ipv4/netfilter/ip_nat_core.c
- Orig date:
2002-11-28 15:53:15.000000000 -0800
diff -urN linux-2.4.20/net/ipv4/netfilter/ip_nat_core.c linux-2.4.21/net/ipv4/netfilter/ip_nat_core.c
@@ -2,9 +2,6 @@
/* (c) 1999 Paul `Rusty' Russell. Licenced under the GNU General
Public Licence. */
-#ifdef MODULE
-#define __NO_VERSION__
-#endif
#include <linux/version.h>
#include <linux/module.h>
#include <linux/types.h>
@@ -915,7 +912,7 @@
packet, except it was never src/dst reversed, so
where we would normally apply a dst manip, we apply
a src, and vice versa. */
- if (info->manips[i].hooknum == opposite_hook[hooknum]) {
+ if (info->manips[i].hooknum == hooknum) {
DEBUGP("icmp_reply: inner %s -> %u.%u.%u.%u %u\n",
info->manips[i].maniptype == IP_NAT_MANIP_SRC
? "DST" : "SRC",
@@ -926,9 +923,9 @@
&info->manips[i].manip,
!info->manips[i].maniptype,
&skb->nfcache);
- /* Outer packet needs to have IP header NATed like
- it's a reply. */
- } else if (info->manips[i].hooknum == hooknum) {
+ /* Outer packet needs to have IP header NATed like
+ it's a reply. */
+
/* Use mapping to map outer packet: 0 give no
per-proto mapping */
DEBUGP("icmp_reply: outer %s -> %u.%u.%u.%u\n",
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)