From 05c36015f79d0d2975f15b08e31ea72825700f11 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 2 Jan 2010 10:51:09 -0800 Subject: More --timeout improvements, especially for the receiving side: - The receiver now sends keep-alive messages to the generator when it is actively doing work and hasn't sent anything recently. This ensures that the generator won't timeout if the receiver is working hard. - The perform_io() code has improved keep-alive participation. - Allow the sender to send some keep-alive messages, which ensures that if it is in a lull, it can probe the socket. --- sender.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sender.c') diff --git a/sender.c b/sender.c index 60820dd8..600ad847 100644 --- a/sender.c +++ b/sender.c @@ -43,7 +43,6 @@ extern int inplace; extern int batch_fd; extern int write_batch; extern int file_old_total; -extern BOOL we_send_keepalive_messages; extern struct stats stats; extern struct file_list *cur_flist, *first_flist, *dir_flist; @@ -64,7 +63,7 @@ static struct sum_struct *receive_sums(int f) { struct sum_struct *s; int32 i; - int lull_mod = allowed_lull * 5; + int lull_mod = protocol_version >= 31 ? 0 : allowed_lull * 5; OFF_T offset = 0; if (!(s = new(struct sum_struct))) @@ -105,7 +104,7 @@ static struct sum_struct *receive_sums(int f) s->sums[i].len = s->blength; offset += s->sums[i].len; - if (we_send_keepalive_messages && !(i % lull_mod)) + if (lull_mod && !(i % lull_mod)) maybe_send_keepalive(time(NULL), True); if (DEBUG_GTE(DELTASUM, 3)) { -- cgit v1.2.1