Changed "remote_version" to "protocol_version".

diff --git a/checksum.c b/checksum.c
index 7484ca5..57dac48 100644 (file)
--- a/checksum.c
+++ b/checksum.c
@@ -24,7 +24,7 @@ int csum_length=2; /* initial value */
 #define CSUM_CHUNK 64
 
 int checksum_seed = 0;
-extern int remote_version;
+extern int protocol_version;
 
 /*
   a simple 32 bit checksum that can be upadted from either end
@@ -80,7 +80,7 @@ void get_checksum2(char *buf,int len,char *sum)
         * are multiples of 64.  This is fixed by calling mdfour_update()
         * even when there are no more bytes.
         */
-       if (len - i > 0 || remote_version >= 27) {
+       if (len - i > 0 || protocol_version >= 27) {
                mdfour_update(&m, (uchar *)(buf1+i), (len-i));
        }
        
@@ -120,7 +120,7 @@ void file_checksum(char *fname,char *sum,OFF_T size)
        if (len - i > 0) {
                memcpy(tmpchunk, map_ptr(buf,i,len-i), len-i);
        }
-       if (len - i > 0 || remote_version >= 27) {
+       if (len - i > 0 || protocol_version >= 27) {
                mdfour_update(&m, (uchar *)tmpchunk, (len-i));
        }
 
@@ -184,7 +184,7 @@ void sum_update(char *p, int len)
 
 void sum_end(char *sum)
 {
-       if (sumresidue || remote_version >= 27) {
+       if (sumresidue || protocol_version >= 27) {
                mdfour_update(&md, (uchar *)sumrbuf, sumresidue);
        }
 

diff --git a/exclude.c b/exclude.c
index a12e3b7..1bb042b 100644 (file)
--- a/exclude.c
+++ b/exclude.c
@@ -316,7 +316,7 @@ void add_exclude_file(struct exclude_struct ***listp, const char *fname,
 void send_exclude_list(int f)
 {
        int i;
-       extern int remote_version;
+       extern int protocol_version;
        extern int list_only, recurse;
 
        /* This is a complete hack - blame Rusty.
@@ -341,7 +341,7 @@ void send_exclude_list(int f)
                l = strlen(pattern);
                if (l == 0) continue;
                if (exclude_list[i]->include) {
-                       if (remote_version < 19) {
+                       if (protocol_version < 19) {
                                rprintf(FERROR,"remote rsync does not support include syntax - aborting\n");
                                exit_cleanup(RERR_UNSUPPORTED);
                        }

diff --git a/flist.c b/flist.c
index d417a74..7166762 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -57,7 +57,7 @@ extern int relative_paths;
 extern int implied_dirs;
 extern int copy_links;
 extern int copy_unsafe_links;
-extern int remote_version;
+extern int protocol_version;
 extern int io_error;
 extern int sanitize_paths;
 
@@ -446,7 +446,7 @@ static void send_file_entry(struct file_struct *file, int f,
 
 #if SUPPORT_HARD_LINKS
        if (preserve_hard_links && S_ISREG(file->mode)) {
-               if (remote_version < 26) {
+               if (protocol_version < 26) {
                        /* 32-bit dev_t and ino_t */
                        write_int(f, (int) file->dev);
                        write_int(f, (int) file->inode);
@@ -459,7 +459,7 @@ static void send_file_entry(struct file_struct *file, int f,
 #endif
 
        if (always_checksum) {
-               if (remote_version < 21) {
+               if (protocol_version < 21) {
                        write_buf(f, file->sum, 2);
                } else {
                        write_buf(f, file->sum, MD4_SUM_LENGTH);
@@ -579,7 +579,7 @@ static void receive_file_entry(struct file_struct **fptr,
        }
 #if SUPPORT_HARD_LINKS
        if (preserve_hard_links && S_ISREG(file->mode)) {
-               if (remote_version < 26) {
+               if (protocol_version < 26) {
                        file->dev = read_int(f);
                        file->inode = read_int(f);
                } else {
@@ -593,7 +593,7 @@ static void receive_file_entry(struct file_struct **fptr,
                file->sum = (char *) malloc(MD4_SUM_LENGTH);
                if (!file->sum)
                        out_of_memory("md4 sum");
-               if (remote_version < 21) {
+               if (protocol_version < 21) {
                        read_buf(f, file->sum, 2);
                } else {
                        read_buf(f, file->sum, MD4_SUM_LENGTH);

diff --git a/generator.c b/generator.c
index 48273f0..0a20fac 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -36,7 +36,7 @@ extern int csum_length;
 extern int ignore_times;
 extern int size_only;
 extern int io_timeout;
-extern int remote_version;
+extern int protocol_version;
 extern int always_checksum;
 extern int modify_window;
 extern char *compare_dest;
@@ -80,7 +80,7 @@ static int skip_file(char *fname,
                        }
                }
                file_checksum(fname,sum,st->st_size);
-               if (remote_version < 21) {
+               if (protocol_version < 21) {
                        return (memcmp(sum,file->sum,2) == 0);
                } else {
                        return (memcmp(sum,file->sum,MD4_SUM_LENGTH) == 0);
@@ -112,7 +112,7 @@ void write_sum_head(int f, struct sum_struct *sum)
 
        write_int(f, sum->count);
        write_int(f, sum->blength);
-       if (remote_version >= 27)
+       if (protocol_version >= 27)
                write_int(f, sum->s2length);
        write_int(f, sum->remainder);
 }
@@ -162,7 +162,7 @@ static void sum_sizes_sqroot_baarda(struct sum_struct *sum, uint64 len)
                blength = MAX(blength, BLOCK_SIZE);
        }
 
-       if (remote_version < 27) {
+       if (protocol_version < 27) {
                s2length = csum_length;
        } else if (csum_length == SUM_LENGTH) {
                s2length = SUM_LENGTH;

diff --git a/lib/mdfour.c b/lib/mdfour.c
index d8e8632..8e06bdb 100644 (file)
--- a/lib/mdfour.c
+++ b/lib/mdfour.c
@@ -117,7 +117,7 @@ static void mdfour_tail(unsigned char *in, uint32 n)
 {
        unsigned char buf[128];
        uint32 M[16];
-       extern int remote_version;
+       extern int protocol_version;
 
        /*
         * Count total number of bits, modulo 2^64
@@ -140,7 +140,7 @@ static void mdfour_tail(unsigned char *in, uint32 n)
                 * of bits modulo 2^64, which was fixed starting with
                 * protocol version 27.
                 */
-               if (remote_version >= 27) {
+               if (protocol_version >= 27) {
                        copy4(buf+60, m->totalN2);
                }
                copy64(M, buf);
@@ -153,7 +153,7 @@ static void mdfour_tail(unsigned char *in, uint32 n)
                 * of bits modulo 2^64, which was fixed starting with
                 * protocol version 27.
                 */
-               if (remote_version >= 27) {
+               if (protocol_version >= 27) {
                        copy4(buf+124, m->totalN2); 
                }
                copy64(M, buf);

diff --git a/main.c b/main.c
index 810576f..25cd106 100644 (file)
--- a/main.c
+++ b/main.c
@@ -31,6 +31,7 @@ extern int am_server;
 extern int am_sender;
 extern int am_daemon;
 extern int verbose;
+extern int protocol_version;
 
 /* there's probably never more than at most 2 outstanding child processes,
  * but set it higher just in case.
@@ -82,7 +83,6 @@ static void report(int f)
 {
        time_t t = time(NULL);
        extern int do_stats;
-       extern int remote_version;
        int send_stats;
 
        if (do_stats && verbose > 1) {
@@ -96,7 +96,7 @@ static void report(int f)
                if (f == -1 || !am_sender) return;
        }
 
-       send_stats = verbose || (remote_version >= 20);
+       send_stats = verbose || protocol_version >= 20;
        if (am_server) {
                if (am_sender && send_stats) {
                        int64 w;
@@ -342,7 +342,6 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
        char *dir = argv[0];
        extern int relative_paths;
        extern int recurse;
-       extern int remote_version;
 
        if (verbose > 2)
                rprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid());
@@ -376,7 +375,7 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
        send_files(flist,f_out,f_in);
        io_flush();
        report(f_out);
-       if (remote_version >= 24) {
+       if (protocol_version >= 24) {
                /* final goodbye message */
                read_int(f_in);
        }
@@ -395,7 +394,6 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
        extern int delete_after;
        extern int recurse;
        extern int delete_mode;
-       extern int remote_version;
 
        if (preserve_hard_links)
                init_hard_links(flist);
@@ -456,7 +454,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 
        read_int(recv_pipe[0]);
        close(recv_pipe[0]);
-       if (remote_version >= 24) {
+       if (protocol_version >= 24) {
                /* send a final goodbye message */
                write_int(f_out, -1);
        }
@@ -546,7 +544,6 @@ int child_main(int argc, char *argv[])
 void start_server(int f_in, int f_out, int argc, char *argv[])
 {
        extern int cvs_exclude;
-       extern int remote_version;
        extern int read_batch;
 
        setup_protocol(f_out, f_in);
@@ -554,7 +551,7 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
        set_nonblocking(f_in);
        set_nonblocking(f_out);
 
-       if (remote_version >= 23)
+       if (protocol_version >= 23)
                io_start_multiplex_out(f_out);
 
        if (am_sender) {
@@ -580,7 +577,6 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
        struct file_list *flist = NULL;
        int status = 0, status2 = 0;
        char *local_name = NULL;
-       extern int remote_version;
        extern pid_t cleanup_child_pid;
        extern int write_batch;
        extern int read_batch;
@@ -595,7 +591,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 
        setup_protocol(f_out,f_in);
 
-       if (remote_version >= 23)
+       if (protocol_version >= 23)
                io_start_multiplex_in(f_in);
 
        if (am_sender) {
@@ -614,7 +610,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
                        rprintf(FINFO,"file list sent\n");
 
                send_files(flist,f_out,f_in);
-               if (remote_version >= 24) {
+               if (protocol_version >= 24) {
                        /* final goodbye message */
                        read_int(f_in);
                }

diff --git a/receiver.c b/receiver.c
index aa3c659..28f631e 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -23,7 +23,7 @@
 extern int verbose;
 extern int recurse;
 extern int delete_mode;
-extern int remote_version;
+extern int protocol_version;
 extern int csum_length;
 extern struct stats stats;
 extern int dry_run;
@@ -136,7 +136,7 @@ void delete_files(struct file_list *flist)
                if (!S_ISDIR(flist->files[j]->mode) || 
                    !(flist->files[j]->flags & FLAG_DELETE)) continue;
 
-               if (remote_version < 19 &&
+               if (protocol_version < 19 &&
                    delete_already_done(flist, j)) continue;
 
                name = strdup(f_name(flist->files[j]));
@@ -152,7 +152,7 @@ void delete_files(struct file_list *flist)
                for (i=local_file_list->count-1;i>=0;i--) {
                        if (max_delete && deletion_count > max_delete) break;
                        if (!local_file_list->files[i]->basename) continue;
-                       if (remote_version < 19 &&
+                       if (protocol_version < 19 &&
                            S_ISDIR(local_file_list->files[i]->mode))
                                add_delete_entry(local_file_list->files[i]);
                        if (-1 == flist_find(flist,local_file_list->files[i])) {

diff --git a/sender.c b/sender.c
index 841e81f..f0dc1a1 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -38,16 +38,14 @@ extern int am_server;
 
 void read_sum_head(int f, struct sum_struct *sum)
 {
-       extern int remote_version;
+       extern int protocol_version;
 
        sum->count = read_int(f);
        sum->blength = read_int(f);
-       if (remote_version < 27)
-       {
+       if (protocol_version < 27)
                sum->s2length = csum_length;
-       } else {
+       else
                sum->s2length = read_int(f);
-       }
        sum->remainder = read_int(f);
 }