aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_output.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2008-10-27 02:10:12 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-27 02:10:12 -0400
commit8b5f12d04b2e93842f3dda01f029842047bf3f81 (patch)
treec539679c5dce56b95de9767a9aa90eff07193fa5 /net/ipv4/tcp_output.c
parentb700a98c70401c2a48e509b91b47f58a883806bc (diff)
syncookies: fix inclusion of tcp options in syn-ack
David Miller noticed that commit 33ad798c924b4a1afad3593f2796d465040aadd5 '(tcp: options clean up') did not move the req->cookie_ts check. This essentially disabled commit 4dfc2817025965a2fc78a18c50f540736a6b5c24 '[Syncookies]: Add support for TCP options via timestamps.'. This restores the original logic. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r--net/ipv4/tcp_output.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index e4c5ac9fe89b..ba85d8831893 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2279,6 +2279,11 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
2279 } 2279 }
2280 2280
2281 memset(&opts, 0, sizeof(opts)); 2281 memset(&opts, 0, sizeof(opts));
2282#ifdef CONFIG_SYN_COOKIES
2283 if (unlikely(req->cookie_ts))
2284 TCP_SKB_CB(skb)->when = cookie_init_timestamp(req);
2285 else
2286#endif
2282 TCP_SKB_CB(skb)->when = tcp_time_stamp; 2287 TCP_SKB_CB(skb)->when = tcp_time_stamp;
2283 tcp_header_size = tcp_synack_options(sk, req, mss, 2288 tcp_header_size = tcp_synack_options(sk, req, mss,
2284 skb, &opts, &md5) + 2289 skb, &opts, &md5) +
@@ -2304,11 +2309,6 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
2304 2309
2305 /* RFC1323: The window in SYN & SYN/ACK segments is never scaled. */ 2310 /* RFC1323: The window in SYN & SYN/ACK segments is never scaled. */
2306 th->window = htons(min(req->rcv_wnd, 65535U)); 2311 th->window = htons(min(req->rcv_wnd, 65535U));
2307#ifdef CONFIG_SYN_COOKIES
2308 if (unlikely(req->cookie_ts))
2309 TCP_SKB_CB(skb)->when = cookie_init_timestamp(req);
2310 else
2311#endif
2312 tcp_options_write((__be32 *)(th + 1), tp, &opts, &md5_hash_location); 2312 tcp_options_write((__be32 *)(th + 1), tp, &opts, &md5_hash_location);
2313 th->doff = (tcp_header_size >> 2); 2313 th->doff = (tcp_header_size >> 2);
2314 TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS); 2314 TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS);