summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorKOVACS Krisztian <hidden@balabit.hu>2011-10-18 10:17:35 +0000
committerDavid S. Miller <davem@davemloft.net>2011-10-19 03:21:35 -0400
commit58af19e387d8821927e49be3f467da5e6a0aa8fd (patch)
tree24b731d70f90924221ad673d3e682fb2bb7f968c /net
parent8bae8bd6cb24eecad9fda3e125d36ab9c67d3fd7 (diff)
downloadlinux-3.10-58af19e387d8821927e49be3f467da5e6a0aa8fd.tar.gz
linux-3.10-58af19e387d8821927e49be3f467da5e6a0aa8fd.tar.bz2
linux-3.10-58af19e387d8821927e49be3f467da5e6a0aa8fd.zip
tproxy: copy transparent flag when creating a time wait
The transparent socket option setting was not copied to the time wait socket when an inet socket was being replaced by a time wait socket. This broke the --transparent option of the socket match and may have caused that FIN packets belonging to sockets in FIN_WAIT2 or TIME_WAIT state were being dropped by the packet filter. Signed-off-by: KOVACS Krisztian <hidden@balabit.hu> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp_minisocks.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index d2fe4e06b47..0ce3d06dce6 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -328,6 +328,7 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
struct tcp_timewait_sock *tcptw = tcp_twsk((struct sock *)tw);
const int rto = (icsk->icsk_rto << 2) - (icsk->icsk_rto >> 1);
+ tw->tw_transparent = inet_sk(sk)->transparent;
tw->tw_rcv_wscale = tp->rx_opt.rcv_wscale;
tcptw->tw_rcv_nxt = tp->rcv_nxt;
tcptw->tw_snd_nxt = tp->snd_nxt;