X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9e31c4824cabb1bf173f87cbd0abe93f25ea9598..1b01b295c960fd6b9fb0c3fdb961010c22b2c898:/checksum.c

diff --git a/checksum.c b/checksum.c
index ba813586..20158363 100644
--- a/checksum.c
+++ b/checksum.c
@@ -19,11 +19,12 @@
 
 #include "rsync.h"
 
-int csum_length=SUM_LENGTH;
+int csum_length=2; /* initial value */
 
 #define CSUM_CHUNK 64
 
 int checksum_seed = 0;
+extern int remote_version;
 
 /*
   a simple 32 bit checksum that can be upadted from either end
@@ -36,11 +37,12 @@ uint32 get_checksum1(char *buf,int len)
 
     s1 = s2 = 0;
     for (i = 0; i < (len-4); i+=4) {
-	s2 += 4*(s1 + buf[i]) + 3*buf[i+1] + 2*buf[i+2] + buf[i+3];
-	s1 += (buf[i+0] + buf[i+1] + buf[i+2] + buf[i+3]); 
+	s2 += 4*(s1 + buf[i]) + 3*buf[i+1] + 2*buf[i+2] + buf[i+3] + 
+	  10*CHAR_OFFSET;
+	s1 += (buf[i+0] + buf[i+1] + buf[i+2] + buf[i+3] + 4*CHAR_OFFSET); 
     }
     for (; i < len; i++) {
-	s1 += buf[i]; s2 += s1;
+	s1 += (buf[i]+CHAR_OFFSET); s2 += s1;
     }
     return (s1 & 0xffff) + (s2 << 16);
 }
@@ -127,6 +129,10 @@ void file_checksum(char *fname,char *sum,off_t size)
 
 void checksum_init(void)
 {
+  if (remote_version >= 14)
+    csum_length = 2; /* adaptive */
+  else
+    csum_length = SUM_LENGTH;
 }
 
 
@@ -137,13 +143,22 @@ static char sumrbuf[CSUM_CHUNK];
 
 void sum_init(void)
 {
-  MDbegin(&sumMD);
+  char s[4];
+  MDbegin(&sumMD);  
   sumresidue=0;
+  SIVAL(s,0,checksum_seed);
+  sum_update(s,4);
 }
 
 void sum_update(char *p,int len)
 {
   int i;
+  if (len + sumresidue < CSUM_CHUNK) {
+    bcopy(p,sumrbuf+sumresidue,len);
+    sumresidue += len;
+    return;
+  }
+
   if (sumresidue) {
     i = MIN(CSUM_CHUNK-sumresidue,len);
     bcopy(p,sumrbuf+sumresidue,i);
@@ -177,22 +192,3 @@ void sum_end(char *sum)
 }
 
 
-#ifdef CHECKSUM_MAIN
- int main(int argc,char *argv[])
-{
-  char sum[SUM_LENGTH];
-  int i,j;
-
-  checksum_init();
-
-  for (i=1;i<argc;i++) {
-    struct stat st;
-    if (stat(argv[i],&st) == 0) {
-      file_checksum(argv[i],sum,st.st_size);
-      for (j=0;j<SUM_LENGTH;j++)
-	printf("%02X",(unsigned char)sum[j]);
-      printf("  %s\n",argv[i]);
-    }
-  }
-}
-#endif