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

Commit aabb601b authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

[DCCP]: Initialise write_xmit_timer also on passive sockets 



The TX CCID needs the write_xmit_timer for delaying packet sends. Previously
this timer was only activated on active (connecting) sockets.

This patch initialises the write_xmit_timer in sync with the other timers, i.e.
the timer will be ready on any socket. This is used by applications with a
listening socket which start to stream after receiving an initiation by the
client.  The write_xmit_timer is stopped when the application closes, as before.

Was tested to work and to remove the timer bug reported on dccp@vger.

Also moved timer initialisation into timer.c (static). 

Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: default avatarIan McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c4e38f41

net/dccp/dccp.h

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ extern void dccp_send_sync(struct sock *sk, const u64 seq, 
			   const enum dccp_pkt_type pkt_type);



extern void dccp_write_xmit(struct sock *sk, int block);

extern void dccp_write_xmit_timer(unsigned long data);

extern void dccp_write_space(struct sock *sk);



extern void dccp_init_xmit_timers(struct sock *sk);

net/dccp/output.c

+0 −16
Original line number Diff line number Diff line
@@ -213,19 +213,6 @@ static int dccp_wait_for_ccid(struct sock *sk, struct sk_buff *skb) 
	goto out;

}



static void dccp_write_xmit_timer(unsigned long data) {

	struct sock *sk = (struct sock *)data;

	struct dccp_sock *dp = dccp_sk(sk);



	bh_lock_sock(sk);

	if (sock_owned_by_user(sk))

		sk_reset_timer(sk, &dp->dccps_xmit_timer, jiffies+1);

	else

		dccp_write_xmit(sk, 0);

	bh_unlock_sock(sk);

	sock_put(sk);

}



void dccp_write_xmit(struct sock *sk, int block)

{

	struct dccp_sock *dp = dccp_sk(sk);
@@ -434,9 +421,6 @@ static inline void dccp_connect_init(struct sock *sk) 
	dp->dccps_gar = dp->dccps_iss;



	icsk->icsk_retransmits = 0;

	init_timer(&dp->dccps_xmit_timer);

	dp->dccps_xmit_timer.data = (unsigned long)sk;

	dp->dccps_xmit_timer.function = dccp_write_xmit_timer;

}



int dccp_connect(struct sock *sk)

net/dccp/timer.c

+25 −0
Original line number Diff line number Diff line
@@ -261,8 +261,33 @@ static void dccp_delack_timer(unsigned long data) 
	sock_put(sk);

}



/* Transmit-delay timer: used by the CCIDs to delay actual send time */

void dccp_write_xmit_timer(unsigned long data)

{

	struct sock *sk = (struct sock *)data;

	struct dccp_sock *dp = dccp_sk(sk);



	bh_lock_sock(sk);

	if (sock_owned_by_user(sk))

		sk_reset_timer(sk, &dp->dccps_xmit_timer, jiffies+1);

	else

		dccp_write_xmit(sk, 0);

	bh_unlock_sock(sk);

	sock_put(sk);

}



static void dccp_init_write_xmit_timer(struct sock *sk)

{

	struct dccp_sock *dp = dccp_sk(sk);



	init_timer(&dp->dccps_xmit_timer);

	dp->dccps_xmit_timer.data = (unsigned long)sk;

	dp->dccps_xmit_timer.function = dccp_write_xmit_timer;

}



void dccp_init_xmit_timers(struct sock *sk)

{

	dccp_init_write_xmit_timer(sk);

	inet_csk_init_xmit_timers(sk, &dccp_write_timer, &dccp_delack_timer,

				  &dccp_keepalive_timer);

}