Commit a30aad50 authored by Alexey Kodanev's avatar Alexey Kodanev Committed by David S. Miller
Browse files

tcp: rename *_sequence_number() to *_seq_and_tsoff() 



The functions that are returning tcp sequence number also setup
TS offset value, so rename them to better describe their purpose.

No functional changes in this patch.

Suggested-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarAlexey Kodanev <alexey.kodanev@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9efd3831

include/net/secure_seq.h

+3 −3
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ 
u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);

u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,

			       __be16 dport);

u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,

u32 secure_tcp_seq_and_tsoff(__be32 saddr, __be32 daddr,

			     __be16 sport, __be16 dport, u32 *tsoff);

u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr,

u32 secure_tcpv6_seq_and_tsoff(const __be32 *saddr, const __be32 *daddr,

			       __be16 sport, __be16 dport, u32 *tsoff);

u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,

				__be16 sport, __be16 dport);

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -1816,7 +1816,7 @@ struct tcp_request_sock_ops { 
	struct dst_entry *(*route_req)(const struct sock *sk, struct flowi *fl,

				       const struct request_sock *req,

				       bool *strict);

	__u32 (*init_seq)(const struct sk_buff *skb, u32 *tsoff);

	__u32 (*init_seq_tsoff)(const struct sk_buff *skb, u32 *tsoff);

	int (*send_synack)(const struct sock *sk, struct dst_entry *dst,

			   struct flowi *fl, struct request_sock *req,

			   struct tcp_fastopen_cookie *foc,

net/core/secure_seq.c

+6 −7
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static u32 seq_scale(u32 seq) 
#endif



#if IS_ENABLED(CONFIG_IPV6)

u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr,

u32 secure_tcpv6_seq_and_tsoff(const __be32 *saddr, const __be32 *daddr,

			       __be16 sport, __be16 dport, u32 *tsoff)

{

	const struct {
@@ -66,7 +66,7 @@ u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr, 
	*tsoff = sysctl_tcp_timestamps == 1 ? (hash >> 32) : 0;

	return seq_scale(hash);

}

EXPORT_SYMBOL(secure_tcpv6_sequence_number);

EXPORT_SYMBOL(secure_tcpv6_seq_and_tsoff);



u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,

			       __be16 dport)
@@ -89,13 +89,12 @@ EXPORT_SYMBOL(secure_ipv6_port_ephemeral); 


#ifdef CONFIG_INET



/* secure_tcp_sequence_number(a, b, 0, d) == secure_ipv4_port_ephemeral(a, b, d),

/* secure_tcp_seq_and_tsoff(a, b, 0, d) == secure_ipv4_port_ephemeral(a, b, d),

 * but fortunately, `sport' cannot be 0 in any circumstances. If this changes,

 * it would be easy enough to have the former function use siphash_4u32, passing

 * the arguments as separate u32.

 */



u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,

u32 secure_tcp_seq_and_tsoff(__be32 saddr, __be32 daddr,

			     __be16 sport, __be16 dport, u32 *tsoff)

{

	u64 hash;

net/ipv4/tcp_input.c

+2 −2
Original line number Diff line number Diff line
@@ -6324,7 +6324,7 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops, 
		goto drop_and_free;



	if (isn && tmp_opt.tstamp_ok)

		af_ops->init_seq(skb, &tcp_rsk(req)->ts_off);

		af_ops->init_seq_tsoff(skb, &tcp_rsk(req)->ts_off);



	if (!want_cookie && !isn) {

		/* VJ's idea. We save last timestamp seen
@@ -6366,7 +6366,7 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops, 
			goto drop_and_release;

		}



		isn = af_ops->init_seq(skb, &tcp_rsk(req)->ts_off);

		isn = af_ops->init_seq_tsoff(skb, &tcp_rsk(req)->ts_off);

	}

	if (!dst) {

		dst = af_ops->route_req(sk, &fl, req, NULL);

net/ipv4/tcp_ipv4.c

+11 −11
Original line number Diff line number Diff line
@@ -94,9 +94,9 @@ static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key, 
struct inet_hashinfo tcp_hashinfo;

EXPORT_SYMBOL(tcp_hashinfo);



static u32 tcp_v4_init_sequence(const struct sk_buff *skb, u32 *tsoff)

static u32 tcp_v4_init_seq_and_tsoff(const struct sk_buff *skb, u32 *tsoff)

{

	return secure_tcp_sequence_number(ip_hdr(skb)->daddr,

	return secure_tcp_seq_and_tsoff(ip_hdr(skb)->daddr,

					ip_hdr(skb)->saddr,

					tcp_hdr(skb)->dest,

					tcp_hdr(skb)->source, tsoff);
@@ -236,7 +236,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	rt = NULL;



	if (likely(!tp->repair)) {

		seq = secure_tcp_sequence_number(inet->inet_saddr,

		seq = secure_tcp_seq_and_tsoff(inet->inet_saddr,

					       inet->inet_daddr,

					       inet->inet_sport,

					       usin->sin_port,
@@ -1249,7 +1249,7 @@ static const struct tcp_request_sock_ops tcp_request_sock_ipv4_ops = { 
	.cookie_init_seq =	cookie_v4_init_sequence,

#endif

	.route_req	=	tcp_v4_route_req,

	.init_seq	=	tcp_v4_init_sequence,

	.init_seq_tsoff	=	tcp_v4_init_seq_and_tsoff,

	.send_synack	=	tcp_v4_send_synack,

};