Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 936b8bdb authored by Octavian Purdila's avatar Octavian Purdila Committed by David S. Miller
Browse files

tcp: add init_seq method to tcp_request_sock_ops 



More work in preparation of unifying tcp_v4_conn_request and
tcp_v6_conn_request: indirect the init sequence calls via the
tcp_request_sock_ops.

Signed-off-by: default avatarOctavian Purdila <octavian.purdila@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 94037159

include/net/tcp.h

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

				       const struct request_sock *req,

				       bool *strict);

	__u32 (*init_seq)(const struct sk_buff *skb);

};



#ifdef CONFIG_SYN_COOKIES

net/ipv4/tcp_ipv4.c

+3 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 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 inline __u32 tcp_v4_init_sequence(const struct sk_buff *skb)

static  __u32 tcp_v4_init_sequence(const struct sk_buff *skb)

{

	return secure_tcp_sequence_number(ip_hdr(skb)->daddr,

					  ip_hdr(skb)->saddr,
@@ -1284,6 +1284,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,

};



int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
@@ -1391,7 +1392,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
			goto drop_and_release;

		}



		isn = tcp_v4_init_sequence(skb);

		isn = af_ops->init_seq(skb);

	}

	if (!dst) {

		dst = af_ops->route_req(sk, (struct flowi *)&fl4, req, NULL);

net/ipv6/tcp_ipv6.c

+2 −1
Original line number Diff line number Diff line
@@ -775,6 +775,7 @@ static const struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = { 
	.cookie_init_seq =	cookie_v6_init_sequence,

#endif

	.route_req	=	tcp_v6_route_req,

	.init_seq	=	tcp_v6_init_sequence,

};



static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win,
@@ -1114,7 +1115,7 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb) 
			goto drop_and_release;

		}



		isn = tcp_v6_init_sequence(skb);

		isn = af_ops->init_seq(skb);

	}



	if (!dst) {