patch-2.4.19 linux-2.4.19/net/ipv4/netfilter/ip_nat_rule.c
Next file: linux-2.4.19/net/ipv4/netfilter/ip_nat_standalone.c
Previous file: linux-2.4.19/net/ipv4/netfilter/ip_nat_core.c
Back to the patch index
Back to the overall index
- Lines: 37
- Date:
Fri Aug 2 17:39:46 2002
- Orig file:
linux-2.4.18/net/ipv4/netfilter/ip_nat_rule.c
- Orig date:
Mon Feb 25 11:38:14 2002
diff -urN linux-2.4.18/net/ipv4/netfilter/ip_nat_rule.c linux-2.4.19/net/ipv4/netfilter/ip_nat_rule.c
@@ -140,8 +140,12 @@
struct ip_conntrack *ct;
enum ip_conntrack_info ctinfo;
+#ifdef CONFIG_IP_NF_NAT_LOCAL
IP_NF_ASSERT(hooknum == NF_IP_PRE_ROUTING
|| hooknum == NF_IP_LOCAL_OUT);
+#else
+ IP_NF_ASSERT(hooknum == NF_IP_PRE_ROUTING);
+#endif
ct = ip_conntrack_get(*pskb, &ctinfo);
@@ -210,7 +214,7 @@
/* Only allow these for NAT. */
if (strcmp(tablename, "nat") != 0) {
- DEBUGP("SNAT: wrong table %s\n", tablename);
+ DEBUGP("DNAT: wrong table %s\n", tablename);
return 0;
}
@@ -218,6 +222,14 @@
DEBUGP("DNAT: hook mask 0x%x bad\n", hook_mask);
return 0;
}
+
+#ifndef CONFIG_IP_NF_NAT_LOCAL
+ if (hook_mask & (1 << NF_IP_LOCAL_OUT)) {
+ DEBUGP("DNAT: CONFIG_IP_NF_NAT_LOCAL not enabled\n");
+ return 0;
+ }
+#endif
+
return 1;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)