summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy2005-08-15 02:32:50 +0200
committerDavid S. Miller2005-08-30 00:58:36 +0200
commit9baa5c67ff4ce57b6b9f68c90714a1bb876fccd7 (patch)
tree27f2c48e12e1bb5e3e6d5f8320651c213892ed20
parent[NETFILTER]: Remove two unused files (diff)
downloadkernel-qcow2-linux-9baa5c67ff4ce57b6b9f68c90714a1bb876fccd7.tar.gz
kernel-qcow2-linux-9baa5c67ff4ce57b6b9f68c90714a1bb876fccd7.tar.xz
kernel-qcow2-linux-9baa5c67ff4ce57b6b9f68c90714a1bb876fccd7.zip
[NETFILTER]: Don't exclude local packets from MASQUERADING
Increases consistency in source-address selection. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/netfilter/ipt_MASQUERADE.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c
index 91e74502c3d3..2f3e181c8e97 100644
--- a/net/ipv4/netfilter/ipt_MASQUERADE.c
+++ b/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -86,11 +86,6 @@ masquerade_target(struct sk_buff **pskb,
IP_NF_ASSERT(hooknum == NF_IP_POST_ROUTING);
- /* FIXME: For the moment, don't do local packets, breaks
- testsuite for 2.3.49 --RR */
- if ((*pskb)->sk)
- return NF_ACCEPT;
-
ct = ip_conntrack_get(*pskb, &ctinfo);
IP_NF_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED
|| ctinfo == IP_CT_RELATED + IP_CT_IS_REPLY));