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

Commit e6b4d113 authored by William Allen Simpson's avatar William Allen Simpson Committed by David S. Miller
Browse files

TCPCT part 1a: add request_values parameter for sending SYNACK 



Add optional function parameters associated with sending SYNACK.
These parameters are not needed after sending SYNACK, and are not
used for retransmission.  Avoids extending struct tcp_request_sock,
and avoids allocating kernel memory.

Also affects DCCP as it uses common struct request_sock_ops,
but this parameter is currently reserved for future use.

Signed-off-by: default avatar <William.Allen.Simpson@gmail.com>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e0048402

include/net/request_sock.h

+7 −1
Original line number Diff line number Diff line
@@ -27,13 +27,19 @@ struct sk_buff; 
struct dst_entry;

struct proto;



/* empty to "strongly type" an otherwise void parameter.

 */

struct request_values {

};



struct request_sock_ops {

	int		family;

	int		obj_size;

	struct kmem_cache	*slab;

	char		*slab_name;

	int		(*rtx_syn_ack)(struct sock *sk,

				       struct request_sock *req);

				       struct request_sock *req,

				       struct request_values *rvp);

	void		(*send_ack)(struct sock *sk, struct sk_buff *skb,

				    struct request_sock *req);

	void		(*send_reset)(struct sock *sk,

include/net/tcp.h

+2 −1
Original line number Diff line number Diff line
@@ -440,7 +440,8 @@ extern int tcp_connect(struct sock *sk); 


extern struct sk_buff *		tcp_make_synack(struct sock *sk,

						struct dst_entry *dst,

						struct request_sock *req);

						struct request_sock *req,

						struct request_values *rvp);



extern int			tcp_disconnect(struct sock *sk, int flags);

net/dccp/ipv4.c

+3 −2
Original line number Diff line number Diff line
@@ -477,7 +477,8 @@ static struct dst_entry* dccp_v4_route_skb(struct net *net, struct sock *sk, 
	return &rt->u.dst;

}



static int dccp_v4_send_response(struct sock *sk, struct request_sock *req)

static int dccp_v4_send_response(struct sock *sk, struct request_sock *req,

				 struct request_values *rv_unused)

{

	int err = -1;

	struct sk_buff *skb;
@@ -626,7 +627,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
	dreq->dreq_iss	   = dccp_v4_init_sequence(skb);

	dreq->dreq_service = service;



	if (dccp_v4_send_response(sk, req))

	if (dccp_v4_send_response(sk, req, NULL))

		goto drop_and_free;



	inet_csk_reqsk_queue_hash_add(sk, req, DCCP_TIMEOUT_INIT);

net/dccp/ipv6.c

+3 −2
Original line number Diff line number Diff line
@@ -241,7 +241,8 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
}





static int dccp_v6_send_response(struct sock *sk, struct request_sock *req)

static int dccp_v6_send_response(struct sock *sk, struct request_sock *req,

				 struct request_values *rv_unused)

{

	struct inet6_request_sock *ireq6 = inet6_rsk(req);

	struct ipv6_pinfo *np = inet6_sk(sk);
@@ -468,7 +469,7 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb) 
	dreq->dreq_iss	   = dccp_v6_init_sequence(skb);

	dreq->dreq_service = service;



	if (dccp_v6_send_response(sk, req))

	if (dccp_v6_send_response(sk, req, NULL))

		goto drop_and_free;



	inet6_csk_reqsk_queue_hash_add(sk, req, DCCP_TIMEOUT_INIT);

net/dccp/minisocks.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb, 
			 * counter (backoff, monitored by dccp_response_timer).

			 */

			req->retrans++;

			req->rsk_ops->rtx_syn_ack(sk, req);

			req->rsk_ops->rtx_syn_ack(sk, req, NULL);

		}

		/* Network Duplicate, discard packet */

		return NULL;