From 27114ba79438f42db5a1f40e308014dfae8bcddc Mon Sep 17 00:00:00 2001 From: Changli Gao Date: Fri, 9 Jul 2010 17:31:49 +0200 Subject: [PATCH] --- yaml --- r: 203966 b: refs/heads/master c: 116e1f1b09dffe0ff8ebab73501324dca7bbbe5e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/netfilter/xt_TPROXY.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f16206423577..82d69eb8c4b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a0acaac807ec3fcb7b5a895c6bbb8e8b61e6275 +refs/heads/master: 116e1f1b09dffe0ff8ebab73501324dca7bbbe5e diff --git a/trunk/net/netfilter/xt_TPROXY.c b/trunk/net/netfilter/xt_TPROXY.c index e1a0dedac258..c61294d85fda 100644 --- a/trunk/net/netfilter/xt_TPROXY.c +++ b/trunk/net/netfilter/xt_TPROXY.c @@ -37,8 +37,10 @@ tproxy_tg(struct sk_buff *skb, const struct xt_action_param *par) return NF_DROP; sk = nf_tproxy_get_sock_v4(dev_net(skb->dev), iph->protocol, - iph->saddr, tgi->laddr ? tgi->laddr : iph->daddr, - hp->source, tgi->lport ? tgi->lport : hp->dest, + iph->saddr, + tgi->laddr ? tgi->laddr : iph->daddr, + hp->source, + tgi->lport ? tgi->lport : hp->dest, par->in, true); /* NOTE: assign_sock consumes our sk reference */