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

Commit c676270b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[INET_TWSK]: Introduce inet_twsk_alloc 



With the parts of tcp_time_wait that are not TCP specific, tcp_time_wait uses
it and so will dccp_time_wait.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e48c414e

include/net/inet_timewait_sock.h

+3 −0
Original line number Diff line number Diff line
@@ -142,6 +142,9 @@ static inline void inet_twsk_put(struct inet_timewait_sock *tw) 
	}

}



extern struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk,

						  const int state);



extern void __inet_twsk_kill(struct inet_timewait_sock *tw,

			     struct inet_hashinfo *hashinfo);

net/ipv4/inet_timewait_sock.c

+28 −0
Original line number Diff line number Diff line
@@ -81,3 +81,31 @@ void __inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk, 


	write_unlock(&ehead->lock);

}



struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk, const int state)

{

	struct inet_timewait_sock *tw = kmem_cache_alloc(sk->sk_prot_creator->twsk_slab,

							 SLAB_ATOMIC);

	if (tw != NULL) {

		const struct inet_sock *inet = inet_sk(sk);



		/* Give us an identity. */

		tw->tw_daddr	    = inet->daddr;

		tw->tw_rcv_saddr    = inet->rcv_saddr;

		tw->tw_bound_dev_if = sk->sk_bound_dev_if;

		tw->tw_num	    = inet->num;

		tw->tw_state	    = TCP_TIME_WAIT;

		tw->tw_substate	    = state;

		tw->tw_sport	    = inet->sport;

		tw->tw_dport	    = inet->dport;

		tw->tw_family	    = sk->sk_family;

		tw->tw_reuse	    = sk->sk_reuse;

		tw->tw_hashent	    = sk->sk_hashent;

		tw->tw_ipv6only	    = 0;

		tw->tw_prot	    = sk->sk_prot_creator;

		atomic_set(&tw->tw_refcnt, 1);

		inet_twsk_dead_node_init(tw);

	}



	return tw;

}

net/ipv4/tcp_minisocks.c

+2 −22
Original line number Diff line number Diff line
@@ -267,37 +267,18 @@ void tcp_time_wait(struct sock *sk, int state, int timeo) 
		recycle_ok = tp->af_specific->remember_stamp(sk);



	if (tcp_tw_count < sysctl_tcp_max_tw_buckets)

		tw = kmem_cache_alloc(sk->sk_prot_creator->twsk_slab, SLAB_ATOMIC);

		tw = inet_twsk_alloc(sk, state);



	if (tw != NULL) {

		struct tcp_timewait_sock *tcptw = tcp_twsk((struct sock *)tw);

		const struct inet_sock *inet = inet_sk(sk);

		const int rto = (tp->rto << 2) - (tp->rto >> 1);



		/* Remember our protocol */

		tw->tw_prot		= sk->sk_prot_creator;



		/* Give us an identity. */

		tw->tw_daddr		= inet->daddr;

		tw->tw_rcv_saddr	= inet->rcv_saddr;

		tw->tw_bound_dev_if	= sk->sk_bound_dev_if;

		tw->tw_num		= inet->num;

		tw->tw_state		= TCP_TIME_WAIT;

		tw->tw_substate		= state;

		tw->tw_sport		= inet->sport;

		tw->tw_dport		= inet->dport;

		tw->tw_family		= sk->sk_family;

		tw->tw_reuse		= sk->sk_reuse;

		tw->tw_rcv_wscale	= tp->rx_opt.rcv_wscale;

		atomic_set(&tw->tw_refcnt, 1);



		tw->tw_hashent		= sk->sk_hashent;

		tcptw->tw_rcv_nxt	= tp->rcv_nxt;

		tcptw->tw_snd_nxt	= tp->snd_nxt;

		tcptw->tw_rcv_wnd	= tcp_receive_window(tp);

		tcptw->tw_ts_recent	= tp->rx_opt.ts_recent;

		tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp;

		inet_twsk_dead_node_init(tw);



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

		if (tw->tw_family == PF_INET6) {
@@ -307,8 +288,7 @@ void tcp_time_wait(struct sock *sk, int state, int timeo) 
			ipv6_addr_copy(&tcp6tw->tw_v6_daddr, &np->daddr);

			ipv6_addr_copy(&tcp6tw->tw_v6_rcv_saddr, &np->rcv_saddr);

			tw->tw_ipv6only = np->ipv6only;

		} else

			tw->tw_ipv6only = 0;

		}

#endif

		/* Linkage updates. */

		__inet_twsk_hashdance(tw, sk, &tcp_hashinfo);