diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-09-21 23:17:29 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-22 22:13:31 +0200 |
| commit | d485d500cf6b13a33bc7a6c09091deea7ea603ca (patch) | |
| tree | 67d132d3b75e8ae5c3f39e0701a20843e50b8ab2 /net | |
| parent | ip: fix truesize mismatch in ip fragmentation (diff) | |
| download | linux-d485d500cf6b13a33bc7a6c09091deea7ea603ca.tar.xz linux-d485d500cf6b13a33bc7a6c09091deea7ea603ca.zip | |
netfilter: tproxy: nf_tproxy_assign_sock() can handle tw sockets
transparent field of a socket is either inet_twsk(sk)->tw_transparent
for timewait sockets, or inet_sk(sk)->transparent for other sockets
(TCP/UDP).
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nf_tproxy_core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/netfilter/nf_tproxy_core.c b/net/netfilter/nf_tproxy_core.c index 5490fc37c92d..daab8c4a903c 100644 --- a/net/netfilter/nf_tproxy_core.c +++ b/net/netfilter/nf_tproxy_core.c @@ -70,7 +70,11 @@ nf_tproxy_destructor(struct sk_buff *skb) int nf_tproxy_assign_sock(struct sk_buff *skb, struct sock *sk) { - if (inet_sk(sk)->transparent) { + bool transparent = (sk->sk_state == TCP_TIME_WAIT) ? + inet_twsk(sk)->tw_transparent : + inet_sk(sk)->transparent; + + if (transparent) { skb_orphan(skb); skb->sk = sk; skb->destructor = nf_tproxy_destructor; |