/*
- 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-2008 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 3 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, visit the http://fsf.org website.
+ */
#include "rsync.h"
+#include "inums.h"
-extern int verbose;
-extern int csum_length;
-extern struct stats stats;
-extern int io_error;
extern int dry_run;
+extern int do_xfers;
extern int am_server;
extern int am_daemon;
+extern int inc_recurse;
+extern int log_before_transfer;
+extern int stdout_format_has_i;
+extern int logfile_format_has_i;
+extern int csum_length;
+extern int append_mode;
+extern int io_error;
+extern int allowed_lull;
+extern int preserve_xattrs;
extern int protocol_version;
+extern int remove_source_files;
+extern int updating_basis_file;
extern int make_backups;
+extern int inplace;
+extern int batch_fd;
+extern int write_batch;
extern struct stats stats;
-
+extern struct file_list *cur_flist, *first_flist, *dir_flist;
/**
* @file
* and transmits them to the receiver. The sender process runs on the
* machine holding the source files.
**/
-void read_sum_head(int f, struct sum_struct *sum)
-{
- sum->count = read_int(f);
- sum->blength = read_int(f);
- if (protocol_version < 27) {
- sum->s2length = csum_length;
- } else {
- sum->s2length = read_int(f);
- if (sum->s2length > MD4_SUM_LENGTH) {
- rprintf(FERROR, "Invalid checksum length %ld\n",
- (long)sum->s2length);
- exit_cleanup(RERR_PROTOCOL);
- }
- }
- sum->remainder = read_int(f);
-}
/**
* Receive the checksums for a buffer
static struct sum_struct *receive_sums(int f)
{
struct sum_struct *s;
- int i;
+ int32 i;
+ int lull_mod = allowed_lull * 5;
OFF_T offset = 0;
if (!(s = new(struct sum_struct)))
s->sums = NULL;
- if (verbose > 3) {
- rprintf(FINFO, "count=%ld n=%u rem=%u\n",
- (long)s->count, s->blength, s->remainder);
+ if (DEBUG_GTE(DELTASUM, 3)) {
+ rprintf(FINFO, "count=%s n=%ld rem=%ld\n",
+ big_num(s->count), (long)s->blength, (long)s->remainder);
+ }
+
+ if (append_mode > 0) {
+ s->flength = (OFF_T)s->count * s->blength;
+ if (s->remainder)
+ s->flength -= s->blength - s->remainder;
+ return s;
}
if (s->count == 0)
if (!(s->sums = new_array(struct sum_buf, s->count)))
out_of_memory("receive_sums");
- for (i = 0; i < (int)s->count; i++) {
+ for (i = 0; i < s->count; i++) {
s->sums[i].sum1 = read_int(f);
read_buf(f, s->sums[i].sum2, s->s2length);
s->sums[i].offset = offset;
s->sums[i].flags = 0;
- if (i == (int)s->count-1 && s->remainder != 0)
+ if (i == s->count-1 && s->remainder != 0)
s->sums[i].len = s->remainder;
else
s->sums[i].len = s->blength;
offset += s->sums[i].len;
- if (verbose > 3) {
+ if (allowed_lull && !(i % lull_mod))
+ maybe_send_keepalive();
+
+ if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO,
- "chunk[%d] len=%d offset=%.0f sum1=%08x\n",
- i, s->sums[i].len, (double)s->sums[i].offset,
+ "chunk[%d] len=%d offset=%s sum1=%08x\n",
+ i, s->sums[i].len, big_num(s->sums[i].offset),
s->sums[i].sum1);
}
}
return s;
}
+void successful_send(int ndx)
+{
+ char fname[MAXPATHLEN];
+ struct file_struct *file;
+ struct file_list *flist;
+
+ if (!remove_source_files)
+ return;
+
+ flist = flist_for_ndx(ndx, "successful_send");
+ file = flist->files[ndx - flist->ndx_start];
+ if (!change_pathname(file, NULL, 0))
+ return;
+ f_name(file, fname);
+
+ if (do_unlink(fname) == 0) {
+ if (INFO_GTE(REMOVE, 1))
+ rprintf(FINFO, "sender removed %s\n", fname);
+ } else
+ rsyserr(FERROR, errno, "sender failed to remove %s", fname);
+}
+static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
+ const char *fname, struct file_struct *file,
+ uchar fnamecmp_type, char *buf, int len)
+{
+ write_ndx(f_out, ndx);
+ if (protocol_version < 29)
+ return;
+ write_shortint(f_out, iflags);
+ if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
+ write_byte(f_out, fnamecmp_type);
+ if (iflags & ITEM_XNAME_FOLLOWS)
+ write_vstring(f_out, buf, len);
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run)
+ send_xattr_request(fname, file, f_out);
+#endif
+}
-void send_files(struct file_list *flist, int f_out, int f_in)
+void send_files(int f_in, int f_out)
{
int fd = -1;
struct sum_struct *s;
struct map_struct *mbuf = NULL;
STRUCT_STAT st;
- char *fname2, fname[MAXPATHLEN];
- int i;
+ char fname[MAXPATHLEN], xname[MAXPATHLEN];
+ const char *path, *slash;
+ 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 j;
+ int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
+ enum logcode log_code = log_before_transfer ? FLOG : FINFO;
+ int f_xfer = write_batch < 0 ? batch_fd : f_out;
+ int ndx, j;
- if (verbose > 2)
+ if (DEBUG_GTE(SEND, 1))
rprintf(FINFO, "send_files starting\n");
while (1) {
- unsigned int offset;
-
- 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;
+ if (inc_recurse)
+ send_extra_file_list(f_out, FILECNT_LOOKAHEAD);
+
+ /* This call also sets cur_flist. */
+ ndx = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
+ xname, &xlen);
+ if (ndx == NDX_DONE) {
+ if (!am_server && INFO_GTE(PROGRESS, 2) && cur_flist) {
+ set_current_file_index(NULL, 0);
+ end_progress(0);
+ }
+ if (inc_recurse && first_flist) {
+ flist_free(first_flist);
+ if (first_flist) {
+ write_ndx(f_out, NDX_DONE);
+ continue;
+ }
}
- break;
+ if (++phase > max_phase)
+ break;
+ if (DEBUG_GTE(SEND, 1))
+ rprintf(FINFO, "send_files phase=%d\n", phase);
+ write_ndx(f_out, NDX_DONE);
+ continue;
}
- if (i < 0 || i >= flist->count) {
- rprintf(FERROR, "Invalid file index %d (count=%d)\n",
- i, flist->count);
- exit_cleanup(RERR_PROTOCOL);
+ if (inc_recurse)
+ send_extra_file_list(f_out, FILECNT_LOOKAHEAD);
+
+ if (ndx - cur_flist->ndx_start >= 0)
+ file = cur_flist->files[ndx - cur_flist->ndx_start];
+ else
+ file = dir_flist->files[cur_flist->parent_ndx];
+ if (F_PATHNAME(file)) {
+ path = F_PATHNAME(file);
+ slash = "/";
+ } else {
+ path = slash = "";
}
+ if (!change_pathname(file, NULL, 0))
+ continue;
+ f_name(file, fname);
- file = flist->files[i];
+ if (DEBUG_GTE(SEND, 1))
+ rprintf(FINFO, "send_files(%d, %s%s%s)\n", ndx, path,slash,fname);
- stats.current_file_index = i;
- stats.num_transferred_files++;
- stats.total_transferred_size += file->length;
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run)
+ recv_xattr_request(file, f_in);
+#endif
- if (file->basedir) {
- /* N.B. We're sure that this fits, so offset is OK. */
- offset = strlcpy(fname, file->basedir, sizeof fname);
- if (!offset || fname[offset-1] != '/')
- fname[offset++] = '/';
- } else
- offset = 0;
- fname2 = f_name_to(file, fname + offset);
+ if (!(iflags & ITEM_TRANSFER)) {
+ maybe_log_item(file, iflags, itemizing, xname);
+ write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
+ fnamecmp_type, xname, xlen);
+ continue;
+ }
+ if (phase == 2) {
+ rprintf(FERROR,
+ "got transfer request in phase 2 [%s]\n",
+ who_am_i());
+ exit_cleanup(RERR_PROTOCOL);
+ }
+
+ if (file->flags & FLAG_FILE_SENT) {
+ if (csum_length == SHORT_SUM_LENGTH) {
+ /* For inplace: redo phase turns off the backup
+ * flag so that we do a regular inplace send. */
+ make_backups = -make_backups;
+ append_mode = -append_mode;
+ csum_length = SUM_LENGTH;
+ }
+ } else {
+ if (csum_length != SHORT_SUM_LENGTH) {
+ make_backups = -make_backups;
+ append_mode = -append_mode;
+ csum_length = SHORT_SUM_LENGTH;
+ }
+ }
+
+ updating_basis_file = inplace && (protocol_version >= 29
+ ? fnamecmp_type == FNAMECMP_FNAME : make_backups <= 0);
- if (verbose > 2)
- rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
+ if (!am_server && INFO_GTE(PROGRESS, 1))
+ set_current_file_index(file, ndx);
+ stats.num_transferred_files++;
+ stats.total_transferred_size += F_LENGTH(file);
- if (dry_run) {
- if (!am_server && verbose) /* log the transfer */
- rprintf(FINFO, "%s\n", safe_fname(fname2));
- write_int(f_out, i);
+ if (!do_xfers) { /* log the transfer */
+ log_item(FCLIENT, file, &stats, iflags, NULL);
+ write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
+ fnamecmp_type, xname, xlen);
continue;
}
if (!(s = receive_sums(f_in))) {
io_error |= IOERR_GENERAL;
- rprintf(FERROR, "receive_sums failed\n");
- return;
+ rprintf(FERROR_XFER, "receive_sums failed\n");
+ exit_cleanup(RERR_PROTOCOL);
}
fd = do_open(fname, O_RDONLY, 0);
if (errno == ENOENT) {
enum logcode c = am_daemon
&& protocol_version < 28 ? FERROR
- : FINFO;
+ : FWARNING;
io_error |= IOERR_VANISHED;
rprintf(c, "file has vanished: %s\n",
full_fname(fname));
} else {
io_error |= IOERR_GENERAL;
- rsyserr(FERROR, errno,
+ rsyserr(FERROR_XFER, errno,
"send_files failed to open %s",
full_fname(fname));
}
free_sums(s);
+ if (protocol_version >= 30)
+ send_msg_int(MSG_NO_SEND, ndx);
continue;
}
/* map the local file */
if (do_fstat(fd, &st) != 0) {
io_error |= IOERR_GENERAL;
- rsyserr(FERROR, errno, "fstat failed");
+ rsyserr(FERROR_XFER, errno, "fstat failed");
free_sums(s);
close(fd);
- return;
+ exit_cleanup(RERR_PROTOCOL);
}
if (st.st_size) {
- OFF_T map_size = MAX(s->blength * 3, MAX_MAP_SIZE);
- mbuf = map_file(fd, st.st_size, map_size, s->blength);
+ int32 read_size = MAX(s->blength * 3, MAX_MAP_SIZE);
+ mbuf = map_file(fd, st.st_size, read_size, s->blength);
} else
mbuf = NULL;
- if (verbose > 2) {
- rprintf(FINFO, "send_files mapped %s of size %.0f\n",
- safe_fname(fname), (double)st.st_size);
+ if (DEBUG_GTE(DELTASUM, 2)) {
+ rprintf(FINFO, "send_files mapped %s%s%s of size %s\n",
+ path,slash,fname, big_num(st.st_size));
}
- write_int(f_out, i);
- write_sum_head(f_out, s);
+ write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
+ fnamecmp_type, xname, xlen);
+ write_sum_head(f_xfer, s);
- if (verbose > 2) {
- rprintf(FINFO, "calling match_sums %s\n",
- safe_fname(fname));
- }
+ if (DEBUG_GTE(DELTASUM, 2))
+ rprintf(FINFO, "calling match_sums %s%s%s\n", path,slash,fname);
- if (!am_server && verbose) /* log the transfer */
- rprintf(FINFO, "%s\n", safe_fname(fname2));
+ if (log_before_transfer)
+ log_item(FCLIENT, file, &initial_stats, iflags, NULL);
+ else if (!am_server && INFO_GTE(NAME, 1) && INFO_EQ(PROGRESS, 1))
+ rprintf(FCLIENT, "%s\n", fname);
set_compression(fname);
- match_sums(f_out, s, mbuf, st.st_size);
- log_send(file, &initial_stats);
+ match_sums(f_xfer, s, mbuf, st.st_size);
+ if (INFO_GTE(PROGRESS, 1))
+ end_progress(st.st_size);
+
+ log_item(log_code, file, &initial_stats, iflags, NULL);
if (mbuf) {
j = unmap_file(mbuf);
if (j) {
io_error |= IOERR_GENERAL;
- rsyserr(FERROR, j,
+ rsyserr(FERROR_XFER, j,
"read errors mapping %s",
full_fname(fname));
}
free_sums(s);
- if (verbose > 2) {
- rprintf(FINFO, "sender finished %s\n",
- safe_fname(fname));
- }
+ if (DEBUG_GTE(SEND, 1))
+ rprintf(FINFO, "sender finished %s%s%s\n", path,slash,fname);
+
+ /* Flag that we actually sent this entry. */
+ file->flags |= FLAG_FILE_SENT;
}
- make_backups = save_make_backups;
+ if (make_backups < 0)
+ make_backups = -make_backups;
- if (verbose > 2)
+ if (DEBUG_GTE(SEND, 1))
rprintf(FINFO, "send files finished\n");
match_report();
- write_int(f_out, -1);
+ write_ndx(f_out, NDX_DONE);
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff