Merge across rsync+ patch; add a little documentation to the manpage. More documenta...

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index d2ab1b3..39bb279 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -93,6 +93,14 @@ void send_files(struct file_list *flist,int f_out,int f_in)
        int phase = 0;
        extern struct stats stats;              
        struct stats initial_stats;
+       extern int write_batch;   /* dw */
+       int negative_one;  /* dw */
+       extern int read_batch;    /* dw */
+       int checksums_match;   /* dw */
+       int buff_len;  /* dw */
+       char buff[CHUNK_SIZE];    /* dw */
+       int j;   /* dw */
+       int done;   /* dw */
 
        if (verbose > 2)
                rprintf(FINFO,"send_files starting\n");
@@ -152,12 +160,15 @@ void send_files(struct file_list *flist,int f_out,int f_in)
                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 (!read_batch) {
                fd = do_open(fname, O_RDONLY, 0);
                if (fd == -1) {
                        io_error = 1;
@@ -185,28 +196,78 @@ 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",
                                fname,(double)st.st_size);
+               }
 
-               write_int(f_out,i);
+               if (!read_batch) { /* dw */
+                   write_int(f_out,i);
          
-               write_int(f_out,s->count);
-               write_int(f_out,s->n);
-               write_int(f_out,s->remainder);
+                   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);
+               }
          
                if (verbose > 2)
-                       rprintf(FINFO,"calling match_sums %s\n",fname);
+                       if (!read_batch)
+                           rprintf(FINFO,"calling match_sums %s\n",fname);
          
                if (!am_server) {
                        log_transfer(file, fname+offset);
                }
 
                set_compression(fname);
-         
-               match_sums(f_out,s,buf,st.st_size);
 
-               log_send(file, &initial_stats);
-                 
-               if (buf) unmap_file(buf);
-               close(fd);
+                if (read_batch) { /* dw */
+                   /* 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_int(f_out,s->count);
+                         write_int(f_out,s->n);
+                         write_int(f_out,s->remainder);
+                         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");
+                      continue;
+                   }
+                } else  {
+                   match_sums(f_out,s,buf,st.st_size);
+                   log_send(file, &initial_stats);
+                }
+
+               if (!read_batch) { /* dw */
+                   if (buf) unmap_file(buf);
+                   close(fd);
+               }
          
                free_sums(s);
          
@@ -220,6 +281,11 @@ void send_files(struct file_list *flist,int f_out,int f_in)
        match_report();
 
        write_int(f_out,-1);
+       if (write_batch || read_batch) { /* dw */
+           close_batch_csums_file();
+           close_batch_delta_file();
+       }
+
 }