#include "rsync.h"
extern int verbose;
-extern int remote_version;
extern int csum_length;
extern struct stats stats;
extern int io_error;
extern int am_server;
-/*
- receive the checksums for a buffer
- */
+/**
+ * @file
+ *
+ * The sender gets checksums from the generator, calculates deltas,
+ * 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)
+{
+ extern int remote_version;
+
+ sum->count = read_int(f);
+ sum->blength = read_int(f);
+ if (remote_version < 27)
+ {
+ sum->s2length = csum_length;
+ } else {
+ sum->s2length = read_int(f);
+ }
+ sum->remainder = read_int(f);
+}
+
+/**
+ * Receive the checksums for a buffer
+ **/
static struct sum_struct *receive_sums(int f)
{
struct sum_struct *s;
s = (struct sum_struct *)malloc(sizeof(*s));
if (!s) out_of_memory("receive_sums");
- s->count = read_int(f);
- s->n = read_int(f);
- s->remainder = read_int(f);
+ read_sum_head(f, s);
+
s->sums = NULL;
if (verbose > 3)
- rprintf(FINFO,"count=%d n=%d rem=%d\n",
- s->count,s->n,s->remainder);
+ rprintf(FINFO,"count=%ld n=%ld rem=%ld\n",
+ (long) s->count, (long) s->blength,
+ (long) s->remainder);
if (s->count == 0)
return(s);
s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count);
if (!s->sums) out_of_memory("receive_sums");
- for (i=0;i<s->count;i++) {
+ for (i=0; i < (int) s->count;i++) {
s->sums[i].sum1 = read_int(f);
- read_buf(f,s->sums[i].sum2,csum_length);
+ read_buf(f,s->sums[i].sum2,s->s2length);
s->sums[i].offset = offset;
s->sums[i].i = i;
- if (i == s->count-1 && s->remainder != 0) {
+ if (i == (int) s->count-1 && s->remainder != 0) {
s->sums[i].len = s->remainder;
} else {
- s->sums[i].len = s->n;
+ s->sums[i].len = s->blength;
}
offset += s->sums[i].len;
i = read_int(f_in);
if (i == -1) {
- if (phase==0 && remote_version >= 13) {
+ if (phase==0) {
phase++;
csum_length = SUM_LENGTH;
write_int(f_out,-1);
rprintf(FINFO,"send_files(%d,%s)\n",i,fname);
if (dry_run) {
- if (!am_server) {
- log_transfer(file, fname+offset);
+ if (!am_server && verbose) { /* log transfer */
+ rprintf(FINFO, "%s\n", fname+offset);
}
write_int(f_out,i);
continue;
initial_stats = stats;
s = receive_sums(f_in);
- if (write_batch) /* dw */
- write_batch_csum_info(&i,flist->count,s);
if (!s) {
io_error = 1;
rprintf(FERROR,"receive_sums failed\n");
return;
}
+
+ if (write_batch)
+ write_batch_csum_info(&i,flist->count,s);
if (!read_batch) {
fd = do_open(fname, O_RDONLY, 0);
if (write_batch)
write_batch_delta_file((char *)&i,sizeof(i));
- write_int(f_out,s->count);
- write_int(f_out,s->n);
- write_int(f_out,s->remainder);
+ write_sum_head(f_out, s);
}
if (verbose > 2)
if (!read_batch)
rprintf(FINFO,"calling match_sums %s\n",fname);
- if (!am_server) {
- log_transfer(file, fname+offset);
+ if (!am_server && verbose) { /* log transfer */
+ rprintf(FINFO, "%s\n", fname+offset);
}
set_compression(fname);
}
else {
write_int(f_out,j);
- write_int(f_out,s->count);
- write_int(f_out,s->n);
- write_int(f_out,s->remainder);
+ write_sum_head(f_out, s);
done=0;
while (!done) {
read_batch_delta_file( (char *) &buff_len, sizeof(int) );