diff options
| author | Vlad Yasevich <vladislav.yasevich@hp.com> | 2006-09-29 17:10:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-09-29 17:10:03 -0700 |
| commit | f236218b7292bccb0f8754a0feb5d9e9a06fe5a2 (patch) | |
| tree | 3d787eac398a370504d3dd051437dd33099b9d89 /net | |
| parent | b56bab46f3220eb6b1f71c000faa44c6b13fb148 (diff) | |
| download | kernel-crypto-f236218b7292bccb0f8754a0feb5d9e9a06fe5a2.tar.gz kernel-crypto-f236218b7292bccb0f8754a0feb5d9e9a06fe5a2.tar.xz kernel-crypto-f236218b7292bccb0f8754a0feb5d9e9a06fe5a2.zip | |
[SCTP]: Do not timestamp every SCTP packet.
We only need the timestamp on COOKIE-ECHO chunks, so instead of always
timestamping every SCTP packet, let common code timestamp if the socket
option is set. For COOKIE-ECHO, simply get the time of day if we don't
have a timestamp. This introduces a small possibility that the cookie
may be considered expired, but it will be renegotiated.
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sctp/input.c | 6 | ||||
| -rw-r--r-- | net/sctp/sm_make_chunk.c | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/net/sctp/input.c b/net/sctp/input.c index 4714882ada9..64f63010253 100644 --- a/net/sctp/input.c +++ b/net/sctp/input.c @@ -218,12 +218,6 @@ int sctp_rcv(struct sk_buff *skb) } } - /* SCTP seems to always need a timestamp right now (FIXME) */ - if (skb->tstamp.off_sec == 0) { - __net_timestamp(skb); - sock_enable_timestamp(sk); - } - if (!xfrm_policy_check(sk, XFRM_POLICY_IN, skb, family)) goto discard_release; nf_reset(skb); diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 7745bdea781..507dff72c58 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c @@ -1447,8 +1447,16 @@ no_hmac: /* Check to see if the cookie is stale. If there is already * an association, there is no need to check cookie's expiration * for init collision case of lost COOKIE ACK. + * If skb has been timestamped, then use the stamp, otherwise + * use current time. This introduces a small possibility that + * that a cookie may be considered expired, but his would only slow + * down the new association establishment instead of every packet. */ - skb_get_timestamp(skb, &tv); + if (sock_flag(ep->base.sk, SOCK_TIMESTAMP)) + skb_get_timestamp(skb, &tv); + else + do_gettimeofday(&tv); + if (!asoc && tv_lt(bear_cookie->expiration, tv)) { __u16 len; /* |