aboutsummaryrefslogtreecommitdiffstats
path: root/rsync.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2010-01-02 10:51:09 -0800
committerWayne Davison <wayned@samba.org>2010-01-02 10:58:39 -0800
commit05c36015f79d0d2975f15b08e31ea72825700f11 (patch)
tree926a7977b092a1b6b30f46edcc7a323df69cf5ce /rsync.c
parente34f43495c0f0ab0e7b01983238f5d6e8988e30b (diff)
downloadandroid_external_rsync-05c36015f79d0d2975f15b08e31ea72825700f11.tar.gz
android_external_rsync-05c36015f79d0d2975f15b08e31ea72825700f11.tar.bz2
android_external_rsync-05c36015f79d0d2975f15b08e31ea72825700f11.zip
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.
Diffstat (limited to 'rsync.c')
-rw-r--r--rsync.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/rsync.c b/rsync.c
index 938969a8..cefbe5f4 100644
--- a/rsync.c
+++ b/rsync.c
@@ -368,7 +368,7 @@ int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr,
/* Support the protocol-29 keep-alive style. */
if (protocol_version < 30 && ndx == cur_flist->used && iflags == ITEM_IS_NEW) {
if (am_sender)
- maybe_send_keepalive(time(NULL), True);
+ maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH);
goto read_loop;
}