X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6087ef2a84efd4e40cc9527d71da317845a1ea53..e7c67065c060d500eba8d073da9568db2c658aad:/sender.c diff --git a/sender.c b/sender.c index adfe7d55..db7974c3 100644 --- a/sender.c +++ b/sender.c @@ -1,39 +1,46 @@ /* - Copyright (C) Andrew Tridgell 1996 - Copyright (C) Paul Mackerras 1996 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ + * Routines only used by the sending process. + * + * Copyright (C) 1996 Andrew Tridgell + * Copyright (C) 1996 Paul Mackerras + * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ #include "rsync.h" extern int verbose; -extern int dry_run; +extern int do_xfers; extern int am_server; extern int am_daemon; extern int log_before_transfer; extern int log_format_has_i; extern int daemon_log_format_has_i; extern int csum_length; +extern int append_mode; extern int io_error; +extern int allowed_lull; extern int protocol_version; extern int remove_sent_files; extern int updating_basis_file; extern int make_backups; extern int do_progress; extern int inplace; +extern int batch_fd; +extern int write_batch; extern struct stats stats; extern struct file_list *the_file_list; extern char *log_format; @@ -54,6 +61,7 @@ static struct sum_struct *receive_sums(int f) { struct sum_struct *s; int32 i; + int lull_mod = allowed_lull * 5; OFF_T offset = 0; if (!(s = new(struct sum_struct))) @@ -68,6 +76,13 @@ static struct sum_struct *receive_sums(int f) (double)s->count, (long)s->blength, (long)s->remainder); } + if (append_mode) { + s->flength = (OFF_T)s->count * s->blength; + if (s->remainder) + s->flength -= s->blength - s->remainder; + return s; + } + if (s->count == 0) return(s); @@ -87,6 +102,9 @@ 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 (verbose > 3) { rprintf(FINFO, "chunk[%d] len=%d offset=%.0f sum1=%08x\n", @@ -118,15 +136,13 @@ void successful_send(int ndx) file->dir.root, "/", NULL); } else offset = 0; - f_name_to(file, fname + offset); - if (remove_sent_files && do_unlink(fname) == 0 && verbose > 1) { - rprintf(FINFO, "sender removed %s\n", - safe_fname(fname + offset)); - } + f_name(file, fname + offset); + if (remove_sent_files && do_unlink(fname) == 0 && verbose > 1) + rprintf(FINFO, "sender removed %s\n", fname + offset); } -static void write_item_attrs(int f_out, int ndx, int iflags, - uchar fnamecmp_type, char *buf, int len) +static void write_ndx_and_attrs(int f_out, int ndx, int iflags, + uchar fnamecmp_type, char *buf, int len) { write_int(f_out, ndx); if (protocol_version < 29) @@ -134,11 +150,8 @@ static void write_item_attrs(int f_out, int ndx, int iflags, write_shortint(f_out, iflags); if (iflags & ITEM_BASIS_TYPE_FOLLOWS) write_byte(f_out, fnamecmp_type); - if (iflags & ITEM_XNAME_FOLLOWS) { - if (len < 0) - len = strlen(buf); + if (iflags & ITEM_XNAME_FOLLOWS) write_vstring(f_out, buf, len); - } } /* This is also used by receive.c with f_out = -1. */ @@ -149,18 +162,17 @@ int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr, uchar fnamecmp_type = FNAMECMP_FNAME; int iflags = protocol_version >= 29 ? read_shortint(f_in) : ITEM_TRANSFER | ITEM_MISSING_DATA; - int isave = iflags; /* XXX remove soon */ /* Handle the new keep-alive (no-op) packet. */ if (ndx == the_file_list->count && iflags == ITEM_IS_NEW) ; else if (ndx < 0 || ndx >= the_file_list->count) { - rprintf(FERROR, "Invalid file index %d (count=%d) [%s]\n", + rprintf(FERROR, "Invalid file index: %d (count=%d) [%s]\n", ndx, the_file_list->count, who_am_i()); exit_cleanup(RERR_PROTOCOL); } else if (iflags == ITEM_IS_NEW) { - rprintf(FERROR, "Invalid itemized flag word [%s]\n", - who_am_i()); + rprintf(FERROR, "Invalid itemized flag word: %x [%s]\n", + iflags, who_am_i()); exit_cleanup(RERR_PROTOCOL); } @@ -177,23 +189,16 @@ int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr, } *len_ptr = len; - /* XXX Temporary backward compatibility when talking to 2.6.4pre[12] */ - if (protocol_version >= 29 && iflags & ITEM_TRANSFER - && !S_ISREG(the_file_list->files[ndx]->mode)) { - iflags &= ~ITEM_TRANSFER; - iflags |= ITEM_LOCAL_CHANGE; - } - if (iflags & ITEM_TRANSFER) { if (!S_ISREG(the_file_list->files[ndx]->mode)) { rprintf(FERROR, - "received index of non-regular file: %d [%s]\n", + "received request to transfer non-regular file: %d [%s]\n", ndx, who_am_i()); exit_cleanup(RERR_PROTOCOL); } } else if (f_out >= 0) { - write_item_attrs(f_out, ndx, isave /*XXX iflags */, - fnamecmp_type, buf, len); + write_ndx_and_attrs(f_out, ndx, iflags, + fnamecmp_type, buf, len); } return iflags; @@ -210,11 +215,12 @@ void send_files(struct file_list *flist, int f_out, int f_in) uchar fnamecmp_type; int iflags, xlen; struct file_struct *file; - int phase = 0; + int phase = 0, max_phase = protocol_version >= 29 ? 2 : 1; struct stats initial_stats; int save_make_backups = make_backups; int itemizing = am_daemon ? daemon_log_format_has_i : !am_server && log_format_has_i; + int f_xfer = write_batch < 0 ? batch_fd : f_out; int i, j; if (verbose > 2) @@ -225,18 +231,17 @@ void send_files(struct file_list *flist, int f_out, int f_in) i = read_int(f_in); if (i == -1) { - if (phase == 0) { - phase++; - csum_length = SUM_LENGTH; - write_int(f_out, -1); - if (verbose > 2) - rprintf(FINFO, "send_files phase=%d\n", phase); - /* For inplace: redo phase turns off the backup - * flag so that we do a regular inplace send. */ - make_backups = 0; - continue; - } - break; + if (++phase > max_phase) + break; + csum_length = SUM_LENGTH; + if (verbose > 2) + rprintf(FINFO, "send_files phase=%d\n", phase); + write_int(f_out, -1); + /* For inplace: redo phase turns off the backup + * flag so that we do a regular inplace send. */ + make_backups = 0; + append_mode = 0; + continue; } iflags = read_item_attrs(f_in, f_out, i, &fnamecmp_type, @@ -252,7 +257,7 @@ void send_files(struct file_list *flist, int f_out, int f_in) fname[offset++] = '/'; } else offset = 0; - fname2 = f_name_to(file, fname + offset); + fname2 = f_name(file, fname + offset); if (verbose > 2) rprintf(FINFO, "send_files(%d, %s)\n", i, fname); @@ -261,6 +266,12 @@ void send_files(struct file_list *flist, int f_out, int f_in) maybe_log_item(file, iflags, itemizing, xname); continue; } + if (phase == 2) { + rprintf(FERROR, + "got transfer request in phase 2 [%s]\n", + who_am_i()); + exit_cleanup(RERR_PROTOCOL); + } updating_basis_file = inplace && (protocol_version >= 29 ? fnamecmp_type == FNAMECMP_FNAME : !make_backups); @@ -269,11 +280,11 @@ void send_files(struct file_list *flist, int f_out, int f_in) stats.num_transferred_files++; stats.total_transferred_size += file->length; - if (dry_run) { /* log the transfer */ + if (!do_xfers) { /* log the transfer */ if (!am_server && log_format) log_item(file, &stats, iflags, NULL); - write_item_attrs(f_out, i, iflags, fnamecmp_type, - xname, xlen); + write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type, + xname, xlen); continue; } @@ -321,25 +332,24 @@ void send_files(struct file_list *flist, int f_out, int f_in) if (verbose > 2) { rprintf(FINFO, "send_files mapped %s of size %.0f\n", - safe_fname(fname), (double)st.st_size); + fname, (double)st.st_size); } - write_item_attrs(f_out, i, iflags, fnamecmp_type, xname, xlen); - write_sum_head(f_out, s); + write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type, + xname, xlen); + write_sum_head(f_xfer, s); - if (verbose > 2) { - rprintf(FINFO, "calling match_sums %s\n", - safe_fname(fname)); - } + if (verbose > 2) + rprintf(FINFO, "calling match_sums %s\n", fname); if (log_before_transfer) log_item(file, &initial_stats, iflags, NULL); else if (!am_server && verbose && do_progress) - rprintf(FINFO, "%s\n", safe_fname(fname2)); + rprintf(FINFO, "%s\n", fname2); set_compression(fname); - match_sums(f_out, s, mbuf, st.st_size); + match_sums(f_xfer, s, mbuf, st.st_size); if (do_progress) end_progress(st.st_size); @@ -359,10 +369,8 @@ void send_files(struct file_list *flist, int f_out, int f_in) free_sums(s); - if (verbose > 2) { - rprintf(FINFO, "sender finished %s\n", - safe_fname(fname)); - } + if (verbose > 2) + rprintf(FINFO, "sender finished %s\n", fname); /* Flag that we actually sent this entry. */ file->flags |= FLAG_SENT;