/*
- 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 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 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 protocol_version;
+extern int remove_source_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 *stdout_format;
/**
* 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;
- s = new(struct sum_struct);
- if (!s) out_of_memory("receive_sums");
+ if (!(s = new(struct sum_struct)))
+ out_of_memory("receive_sums");
read_sum_head(f, s);
s->sums = NULL;
if (verbose > 3) {
- rprintf(FINFO, "count=%ld n=%u rem=%u\n",
- (long)s->count, s->blength, s->remainder);
+ rprintf(FINFO, "count=%.0f n=%ld rem=%ld\n",
+ (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);
- s->sums = new_array(struct sum_buf, s->count);
- if (!s->sums) out_of_memory("receive_sums");
+ 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].i = i;
+ 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 {
+ else
s->sums[i].len = s->blength;
- }
offset += s->sums[i].len;
- if (verbose > 3)
- rprintf(FINFO, "chunk[%d] len=%d offset=%.0f sum1=%08x\n",
- i, s->sums[i].len, (double)s->sums[i].offset, s->sums[i].sum1);
+ if (allowed_lull && !(i % lull_mod))
+ maybe_send_keepalive();
+
+ if (verbose > 3) {
+ rprintf(FINFO,
+ "chunk[%d] len=%d offset=%.0f sum1=%08x\n",
+ i, s->sums[i].len, (double)s->sums[i].offset,
+ s->sums[i].sum1);
+ }
}
s->flength = offset;
return s;
}
+void successful_send(int ndx)
+{
+ char fname[MAXPATHLEN];
+ struct file_struct *file;
+ unsigned int offset;
+
+ if (ndx < 0 || ndx >= the_file_list->count)
+ return;
+
+ file = the_file_list->files[ndx];
+ if (F_ROOTDIR(file)) {
+ offset = stringjoin(fname, sizeof fname,
+ F_ROOTDIR(file), "/", NULL);
+ } else
+ offset = 0;
+ f_name(file, fname + offset);
+ if (remove_source_files) {
+ if (do_unlink(fname) == 0) {
+ if (verbose > 1)
+ rprintf(FINFO, "sender removed %s\n", fname + offset);
+ } else
+ rsyserr(FERROR, errno, "sender failed to remove %s", fname + offset);
+ }
+}
+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)
+ 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);
+}
void send_files(struct file_list *flist, int f_out, int f_in)
{
int fd = -1;
struct sum_struct *s;
- struct map_struct *buf = NULL;
+ struct map_struct *mbuf = NULL;
STRUCT_STAT st;
- char fname[MAXPATHLEN];
- int i;
+ char *fname2, fname[MAXPATHLEN];
+ char xname[MAXPATHLEN];
+ uchar fnamecmp_type;
+ int iflags, xlen;
struct file_struct *file;
- int phase = 0;
- extern struct stats stats;
+ int phase = 0, max_phase = protocol_version >= 29 ? 2 : 1;
struct stats initial_stats;
- extern int write_batch;
- extern int read_batch;
- int checksums_match;
- int buff_len;
- char buff[CHUNK_SIZE];
- int j;
- int done;
+ int save_make_backups = make_backups;
+ 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 i, j;
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
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);
- continue;
- }
- break;
+ if (i == NDX_DONE) {
+ if (++phase > max_phase)
+ break;
+ csum_length = SUM_LENGTH;
+ if (verbose > 2)
+ rprintf(FINFO, "send_files phase=%d\n", phase);
+ write_int(f_out, NDX_DONE);
+ /* For inplace: redo phase turns off the backup
+ * flag so that we do a regular inplace send. */
+ make_backups = 0;
+ append_mode = 0;
+ continue;
}
- if (i < 0 || i >= flist->count) {
- rprintf(FERROR, "Invalid file index %d (count=%d)\n",
- i, flist->count);
- exit_cleanup(RERR_PROTOCOL);
- }
+ iflags = read_item_attrs(f_in, f_out, i, &fnamecmp_type,
+ xname, &xlen);
+ if (iflags == ITEM_IS_NEW) /* no-op packet */
+ continue;
file = flist->files[i];
-
- stats.current_file_index = i;
- stats.num_transferred_files++;
- stats.total_transferred_size += file->length;
-
- if (file->basedir) {
+ if (F_ROOTDIR(file)) {
/* N.B. We're sure that this fits, so offset is OK. */
- offset = strlcpy(fname, file->basedir, sizeof fname);
+ offset = strlcpy(fname, F_ROOTDIR(file), sizeof fname);
if (!offset || fname[offset-1] != '/')
fname[offset++] = '/';
} else
offset = 0;
- f_name_to(file, fname + offset);
+ fname2 = f_name(file, fname + offset);
if (verbose > 2)
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
- if (dry_run) {
- if (!am_server && verbose) { /* log transfer */
- rprintf(FINFO, "%s\n", fname+offset);
- }
- write_int(f_out, i);
+ if (!(iflags & ITEM_TRANSFER)) {
+ 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);
+
+ stats.current_file_index = i;
+ stats.num_transferred_files++;
+ stats.total_transferred_size += F_LENGTH(file);
+
+ if (!do_xfers) { /* log the transfer */
+ log_item(FCLIENT, file, &stats, iflags, NULL);
+ write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
+ xname, xlen);
continue;
}
initial_stats = stats;
- s = receive_sums(f_in);
- if (!s) {
+ if (!(s = receive_sums(f_in))) {
io_error |= IOERR_GENERAL;
rprintf(FERROR, "receive_sums failed\n");
return;
}
- if (write_batch)
- write_batch_csum_info(&i, s);
-
- if (!read_batch) {
- fd = do_open(fname, O_RDONLY, 0);
- if (fd == -1) {
- if (errno == ENOENT) {
- enum logcode c = am_daemon
- && protocol_version < 28 ? FERROR
- : FINFO;
- io_error |= IOERR_VANISHED;
- rprintf(c, "file has vanished: %s\n",
- full_fname(fname));
- } else {
- io_error |= IOERR_GENERAL;
- rprintf(FERROR, "send_files failed to open %s: %s\n",
- full_fname(fname), strerror(errno));
- }
- free_sums(s);
- continue;
- }
-
- /* map the local file */
- if (do_fstat(fd, &st) != 0) {
- io_error |= IOERR_GENERAL;
- rprintf(FERROR, "fstat failed: %s\n", strerror(errno));
- free_sums(s);
- close(fd);
- return;
- }
-
- if (st.st_size > 0) {
- buf = map_file(fd, st.st_size);
+ fd = do_open(fname, O_RDONLY, 0);
+ if (fd == -1) {
+ if (errno == ENOENT) {
+ enum logcode c = am_daemon
+ && protocol_version < 28 ? FERROR
+ : FINFO;
+ io_error |= IOERR_VANISHED;
+ rprintf(c, "file has vanished: %s\n",
+ full_fname(fname));
} else {
- buf = NULL;
+ io_error |= IOERR_GENERAL;
+ rsyserr(FERROR, errno,
+ "send_files failed to open %s",
+ full_fname(fname));
}
+ free_sums(s);
+ continue;
+ }
- if (verbose > 2)
- rprintf(FINFO, "send_files mapped %s of size %.0f\n",
- fname, (double)st.st_size);
-
- write_int(f_out, i);
+ /* map the local file */
+ if (do_fstat(fd, &st) != 0) {
+ io_error |= IOERR_GENERAL;
+ rsyserr(FERROR, errno, "fstat failed");
+ free_sums(s);
+ close(fd);
+ return;
+ }
- if (write_batch)
- write_batch_delta_file((char *)&i, sizeof i);
+ if (st.st_size) {
+ int32 read_size = MAX(s->blength * 3, MAX_MAP_SIZE);
+ mbuf = map_file(fd, st.st_size, read_size, s->blength);
+ } else
+ mbuf = NULL;
- write_sum_head(f_out, s);
+ if (verbose > 2) {
+ rprintf(FINFO, "send_files mapped %s of size %.0f\n",
+ fname, (double)st.st_size);
}
- if (verbose > 2 && !read_batch)
+ 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", fname);
- if (!am_server && verbose) { /* log transfer */
- rprintf(FINFO, "%s\n", fname+offset);
- }
+ if (log_before_transfer)
+ log_item(FCLIENT, file, &initial_stats, iflags, NULL);
+ else if (!am_server && verbose && do_progress)
+ rprintf(FCLIENT, "%s\n", fname2);
set_compression(fname);
- if (read_batch) {
- /* read checksums originally computed on sender side */
- read_batch_csum_info(i, s, &checksums_match);
- if (checksums_match) {
- read_batch_delta_file((char*)&j, sizeof (int));
- if (j != i) { /* if flist index entries don't match*/
- rprintf(FINFO, "index mismatch in send_files\n");
- rprintf(FINFO, "read index = %d flist ndx = %d\n", j, i);
- close_batch_delta_file();
- close_batch_csums_file();
- exit_cleanup(1);
- } else {
- write_int(f_out, j);
- write_sum_head(f_out, s);
- done = 0;
- while (!done) {
- read_batch_delta_file((char*)&buff_len, sizeof (int));
- write_int(f_out, buff_len);
- if (buff_len == 0) {
- done = 1;
- } else {
- if (buff_len > 0) {
- read_batch_delta_file(buff, buff_len);
- write_buf(f_out, buff, buff_len);
- }
- }
- } /* end while */
- read_batch_delta_file( buff, MD4_SUM_LENGTH);
- write_buf(f_out, buff, MD4_SUM_LENGTH);
-
- } /* j=i */
- } else { /* not checksum match */
- rprintf (FINFO, "readbatch & checksums don't match\n");
- rprintf (FINFO, "filename=%s is being skipped\n", fname);
- continue;
- }
- } else {
- match_sums(f_out, s, buf, st.st_size);
- log_send(file, &initial_stats);
- }
+ match_sums(f_xfer, s, mbuf, st.st_size);
+ if (do_progress)
+ end_progress(st.st_size);
+
+ log_item(log_code, file, &initial_stats, iflags, NULL);
- if (!read_batch) {
- if (buf) {
- j = unmap_file(buf);
- if (j) {
- io_error |= IOERR_GENERAL;
- rprintf(FERROR,
- "read errors mapping %s: (%d) %s\n",
- full_fname(fname), j, strerror(j));
- }
+ if (mbuf) {
+ j = unmap_file(mbuf);
+ if (j) {
+ io_error |= IOERR_GENERAL;
+ rsyserr(FERROR, j,
+ "read errors mapping %s",
+ full_fname(fname));
}
- close(fd);
}
+ close(fd);
free_sums(s);
if (verbose > 2)
rprintf(FINFO, "sender finished %s\n", fname);
+
+ /* Flag that we actually sent this entry. */
+ file->flags |= FLAG_SENT;
}
+ make_backups = save_make_backups;
if (verbose > 2)
rprintf(FINFO, "send files finished\n");
match_report();
- write_int(f_out, -1);
- if (write_batch || read_batch) {
- close_batch_csums_file();
- close_batch_delta_file();
- }
-
+ write_int(f_out, NDX_DONE);
}
-
-
-
-
-
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff