X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/13c5fc0e1462307270145b8528e96a8cebfdcdc0..4762db4fc90e0bd0c04c9ba7c50123d378427fd0:/compat.c

diff --git a/compat.c b/compat.c
index f53c433f..f89fb513 100644
--- a/compat.c
+++ b/compat.c
@@ -17,14 +17,16 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-/* compatability routines for older rsync protocol versions */
+/**
+ * @file compat.c
+ *
+ * Compatibility routines for older rsync protocol versions.
+ **/
 
 #include "rsync.h"
 
 extern int am_server;
 
-extern int csum_length;
-
 extern int preserve_links;
 extern int preserve_perms;
 extern int preserve_devices;
@@ -38,16 +40,17 @@ extern int checksum_seed;
 extern int remote_version;
 extern int verbose;
 
+extern int read_batch;  /* dw */
+extern int write_batch;  /* dw */
+
 void setup_protocol(int f_out,int f_in)
 {
 	if (remote_version == 0) {
 		if (am_server) {
 			remote_version = read_int(f_in);
 			write_int(f_out,PROTOCOL_VERSION);
-			write_flush(f_out);
 		} else {
 			write_int(f_out,PROTOCOL_VERSION);
-			write_flush(f_out);
 			remote_version = read_int(f_in);
 		}
 	}
@@ -55,22 +58,21 @@ void setup_protocol(int f_out,int f_in)
 	if (remote_version < MIN_PROTOCOL_VERSION ||
 	    remote_version > MAX_PROTOCOL_VERSION) {
 		rprintf(FERROR,"protocol version mismatch - is your shell clean?\n");
-		exit_cleanup(1);
+		rprintf(FERROR,"(see the rsync man page for an explanation)\n");
+		exit_cleanup(RERR_PROTOCOL);
 	}	
-	
-	if (verbose > 2)
-		rprintf(FINFO, "local_version=%d remote_version=%d\n",
-			PROTOCOL_VERSION, remote_version);
-	
-	if (remote_version >= 12) {
-		if (am_server) {
+	if (remote_version < OLD_PROTOCOL_VERSION)
+		rprintf(FINFO,"%s is very old version of rsync, upgrade recommended.\n",
+			am_server ? "Server" : "Client");
+
+	if (am_server) {
+		if (read_batch || write_batch) /* dw */
+			checksum_seed = 32761;
+		else
 			checksum_seed = time(NULL);
-			write_int(f_out,checksum_seed);
-		} else {
-			checksum_seed = read_int(f_in);
-		}
+		write_int(f_out,checksum_seed);
+	} else {
+		checksum_seed = read_int(f_in);
 	}
-	
-	checksum_init();
 }