Add understanding of RSYNC_PROTECT_ARGS environment var.

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 7aadfcb..60820dd 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -43,6 +43,7 @@ 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;
 
@@ -104,8 +105,8 @@ static struct sum_struct *receive_sums(int f)
                        s->sums[i].len = s->blength;
                offset += s->sums[i].len;
 
-               if (allowed_lull && !(i % lull_mod))
-                       maybe_send_keepalive();
+               if (we_send_keepalive_messages && !(i % lull_mod))
+                       maybe_send_keepalive(time(NULL), True);
 
                if (DEBUG_GTE(DELTASUM, 3)) {
                        rprintf(FINFO,
@@ -337,7 +338,7 @@ void send_files(int f_in, int f_out)
                        rsyserr(FERROR_XFER, errno, "fstat failed");
                        free_sums(s);
                        close(fd);
-                       exit_cleanup(RERR_PROTOCOL);
+                       exit_cleanup(RERR_FILEIO);
                }
 
                if (st.st_size) {