aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>2009-03-14 10:23:03 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-15 23:09:52 -0400
commitc887e6d2d9aee56ee7c9f2af4cec3a5efdcc4c72 (patch)
treeee267baadce309166ceea5649292f221cd9a6766 /net/ipv4
parentc43d558a5139a3b22dcac3f19f64ecb39130b02e (diff)
tcp: consolidate paws check
Wow, it was quite tricky to merge that stream of negations but I think I finally got it right: check & replace_ts_recent: (s32)(rcv_tsval - ts_recent) >= 0 => 0 (s32)(ts_recent - rcv_tsval) <= 0 => 0 discard: (s32)(ts_recent - rcv_tsval) > TCP_PAWS_WINDOW => 1 (s32)(ts_recent - rcv_tsval) <= TCP_PAWS_WINDOW => 0 I toggled the return values of tcp_paws_check around since the old encoding added yet-another negation making tracking of truth-values really complicated. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/tcp_input.c11
-rw-r--r--net/ipv4/tcp_minisocks.c4
2 files changed, 7 insertions, 8 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index f527a16a7b33..b7d02c5dd6da 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3883,8 +3883,7 @@ static inline void tcp_replace_ts_recent(struct tcp_sock *tp, u32 seq)
3883 * Not only, also it occurs for expired timestamps. 3883 * Not only, also it occurs for expired timestamps.
3884 */ 3884 */
3885 3885
3886 if ((s32)(tp->rx_opt.rcv_tsval - tp->rx_opt.ts_recent) >= 0 || 3886 if (tcp_paws_check(&tp->rx_opt, 0))
3887 get_seconds() >= tp->rx_opt.ts_recent_stamp + TCP_PAWS_24DAYS)
3888 tcp_store_ts_recent(tp); 3887 tcp_store_ts_recent(tp);
3889 } 3888 }
3890} 3889}
@@ -3936,9 +3935,9 @@ static inline int tcp_paws_discard(const struct sock *sk,
3936 const struct sk_buff *skb) 3935 const struct sk_buff *skb)
3937{ 3936{
3938 const struct tcp_sock *tp = tcp_sk(sk); 3937 const struct tcp_sock *tp = tcp_sk(sk);
3939 return ((s32)(tp->rx_opt.ts_recent - tp->rx_opt.rcv_tsval) > TCP_PAWS_WINDOW && 3938
3940 get_seconds() < tp->rx_opt.ts_recent_stamp + TCP_PAWS_24DAYS && 3939 return !tcp_paws_check(&tp->rx_opt, TCP_PAWS_WINDOW) &&
3941 !tcp_disordered_ack(sk, skb)); 3940 !tcp_disordered_ack(sk, skb);
3942} 3941}
3943 3942
3944/* Check segment sequence number for validity. 3943/* Check segment sequence number for validity.
@@ -5513,7 +5512,7 @@ discard:
5513 5512
5514 /* PAWS check. */ 5513 /* PAWS check. */
5515 if (tp->rx_opt.ts_recent_stamp && tp->rx_opt.saw_tstamp && 5514 if (tp->rx_opt.ts_recent_stamp && tp->rx_opt.saw_tstamp &&
5516 tcp_paws_check(&tp->rx_opt, 0)) 5515 tcp_paws_reject(&tp->rx_opt, 0))
5517 goto discard_and_undo; 5516 goto discard_and_undo;
5518 5517
5519 if (th->syn) { 5518 if (th->syn) {
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index 4b0df3e6b609..43bbba7926ee 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -107,7 +107,7 @@ tcp_timewait_state_process(struct inet_timewait_sock *tw, struct sk_buff *skb,
107 if (tmp_opt.saw_tstamp) { 107 if (tmp_opt.saw_tstamp) {
108 tmp_opt.ts_recent = tcptw->tw_ts_recent; 108 tmp_opt.ts_recent = tcptw->tw_ts_recent;
109 tmp_opt.ts_recent_stamp = tcptw->tw_ts_recent_stamp; 109 tmp_opt.ts_recent_stamp = tcptw->tw_ts_recent_stamp;
110 paws_reject = tcp_paws_check(&tmp_opt, th->rst); 110 paws_reject = tcp_paws_reject(&tmp_opt, th->rst);
111 } 111 }
112 } 112 }
113 113
@@ -511,7 +511,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,
511 * from another data. 511 * from another data.
512 */ 512 */
513 tmp_opt.ts_recent_stamp = get_seconds() - ((TCP_TIMEOUT_INIT/HZ)<<req->retrans); 513 tmp_opt.ts_recent_stamp = get_seconds() - ((TCP_TIMEOUT_INIT/HZ)<<req->retrans);
514 paws_reject = tcp_paws_check(&tmp_opt, th->rst); 514 paws_reject = tcp_paws_reject(&tmp_opt, th->rst);
515 } 515 }
516 } 516 }
517 517