8b83bc77bf
With the introduction of 'rustynat' in 2.6.11, the old tricks of preventing NAT of 'untracked' connections (e.g. NOTRACK target in 'raw' table) are no longer sufficient. The ip_conntrack_untracked.status |= IPS_NAT_DONE_MASK effectively prevents iteration of the 'nat' table, but doesn't prevent nat_packet() to be executed. Since nr_manips is gone in 'rustynat', nat_packet() now implicitly thinks that it has to do NAT on the packet. This patch fixes that problem by explicitly checking for ip_conntrack_untracked in ip_nat_fn(). Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> |
||
---|---|---|
.. | ||
arp_tables.c | ||
arpt_mangle.c | ||
arptable_filter.c | ||
ip_conntrack_amanda.c | ||
ip_conntrack_core.c | ||
ip_conntrack_ftp.c | ||
ip_conntrack_irc.c | ||
ip_conntrack_proto_generic.c | ||
ip_conntrack_proto_icmp.c | ||
ip_conntrack_proto_sctp.c | ||
ip_conntrack_proto_tcp.c | ||
ip_conntrack_proto_udp.c | ||
ip_conntrack_standalone.c | ||
ip_conntrack_tftp.c | ||
ip_nat_amanda.c | ||
ip_nat_core.c | ||
ip_nat_ftp.c | ||
ip_nat_helper.c | ||
ip_nat_irc.c | ||
ip_nat_proto_icmp.c | ||
ip_nat_proto_tcp.c | ||
ip_nat_proto_udp.c | ||
ip_nat_proto_unknown.c | ||
ip_nat_rule.c | ||
ip_nat_snmp_basic.c | ||
ip_nat_standalone.c | ||
ip_nat_tftp.c | ||
ip_queue.c | ||
ip_tables.c | ||
ipt_addrtype.c | ||
ipt_ah.c | ||
ipt_CLASSIFY.c | ||
ipt_CLUSTERIP.c | ||
ipt_comment.c | ||
ipt_connmark.c | ||
ipt_CONNMARK.c | ||
ipt_conntrack.c | ||
ipt_dscp.c | ||
ipt_DSCP.c | ||
ipt_ecn.c | ||
ipt_ECN.c | ||
ipt_esp.c | ||
ipt_hashlimit.c | ||
ipt_helper.c | ||
ipt_iprange.c | ||
ipt_length.c | ||
ipt_limit.c | ||
ipt_LOG.c | ||
ipt_mac.c | ||
ipt_mark.c | ||
ipt_MARK.c | ||
ipt_MASQUERADE.c | ||
ipt_multiport.c | ||
ipt_NETMAP.c | ||
ipt_NOTRACK.c | ||
ipt_owner.c | ||
ipt_physdev.c | ||
ipt_pkttype.c | ||
ipt_realm.c | ||
ipt_recent.c | ||
ipt_REDIRECT.c | ||
ipt_REJECT.c | ||
ipt_SAME.c | ||
ipt_sctp.c | ||
ipt_state.c | ||
ipt_tcpmss.c | ||
ipt_TCPMSS.c | ||
ipt_tos.c | ||
ipt_TOS.c | ||
ipt_ttl.c | ||
ipt_ULOG.c | ||
iptable_filter.c | ||
iptable_mangle.c | ||
iptable_raw.c | ||
Kconfig | ||
Makefile |