diff options
author | Andrey Vagin <avagin@openvz.org> | 2013-02-11 00:50:18 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-13 13:22:15 -0500 |
commit | 93be6ce0e91b6a94783e012b1857a347a5e6e9f2 (patch) | |
tree | 55b7f545fea634d5cde59e21de1470761b7190a7 | |
parent | ceaa1fef65a7c2e017b260b879b310dd24888083 (diff) |
tcp: set and get per-socket timestamp
A timestamp can be set, only if a socket is in the repair mode.
This patch adds a new socket option TCP_TIMESTAMP, which allows to
get and set current tcp times stamp.
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: James Morris <jmorris@namei.org>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/uapi/linux/tcp.h | 1 | ||||
-rw-r--r-- | net/ipv4/tcp.c | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h index e962faa5ab0d..6b1ead0b0c9d 100644 --- a/include/uapi/linux/tcp.h +++ b/include/uapi/linux/tcp.h | |||
@@ -111,6 +111,7 @@ enum { | |||
111 | #define TCP_QUEUE_SEQ 21 | 111 | #define TCP_QUEUE_SEQ 21 |
112 | #define TCP_REPAIR_OPTIONS 22 | 112 | #define TCP_REPAIR_OPTIONS 22 |
113 | #define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */ | 113 | #define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */ |
114 | #define TCP_TIMESTAMP 24 | ||
114 | 115 | ||
115 | struct tcp_repair_opt { | 116 | struct tcp_repair_opt { |
116 | __u32 opt_code; | 117 | __u32 opt_code; |
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 8a90bda96038..801b07b796f0 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -2714,6 +2714,12 @@ static int do_tcp_setsockopt(struct sock *sk, int level, | |||
2714 | else | 2714 | else |
2715 | err = -EINVAL; | 2715 | err = -EINVAL; |
2716 | break; | 2716 | break; |
2717 | case TCP_TIMESTAMP: | ||
2718 | if (!tp->repair) | ||
2719 | err = -EPERM; | ||
2720 | else | ||
2721 | tp->tsoffset = val - tcp_time_stamp; | ||
2722 | break; | ||
2717 | default: | 2723 | default: |
2718 | err = -ENOPROTOOPT; | 2724 | err = -ENOPROTOOPT; |
2719 | break; | 2725 | break; |
@@ -2962,6 +2968,9 @@ static int do_tcp_getsockopt(struct sock *sk, int level, | |||
2962 | case TCP_USER_TIMEOUT: | 2968 | case TCP_USER_TIMEOUT: |
2963 | val = jiffies_to_msecs(icsk->icsk_user_timeout); | 2969 | val = jiffies_to_msecs(icsk->icsk_user_timeout); |
2964 | break; | 2970 | break; |
2971 | case TCP_TIMESTAMP: | ||
2972 | val = tcp_time_stamp + tp->tsoffset; | ||
2973 | break; | ||
2965 | default: | 2974 | default: |
2966 | return -ENOPROTOOPT; | 2975 | return -ENOPROTOOPT; |
2967 | } | 2976 | } |