#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
(inspired by Mark Adler's Adler-32 checksum)
*/
-uint32 get_checksum1(char *buf,int len)
+uint32 get_checksum1(char *buf1,int len)
{
int i;
uint32 s1, s2;
+ schar *buf = (schar *)buf1;
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);
}
-static void sum_put(MDstruct *md,char *sum)
+void get_checksum2(char *buf,int len,char *sum)
{
- SIVAL(sum,0,md->buffer[0]);
- if (csum_length <= 4) return;
- SIVAL(sum,4,md->buffer[1]);
- if (csum_length <= 8) return;
- SIVAL(sum,8,md->buffer[2]);
- if (csum_length <= 12) return;
- SIVAL(sum,12,md->buffer[3]);
+ int i;
+ static char *buf1;
+ static int len1;
+ struct mdfour m;
+
+ if (len > len1) {
+ if (buf1) free(buf1);
+ buf1 = (char *)malloc(len+4);
+ len1 = len;
+ if (!buf1) out_of_memory("get_checksum2");
+ }
+
+ mdfour_begin(&m);
+
+ memcpy(buf1,buf,len);
+ if (checksum_seed) {
+ SIVAL(buf1,len,checksum_seed);
+ len += 4;
+ }
+
+ for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
+ mdfour_update(&m, (uchar *)(buf1+i), CSUM_CHUNK);
+ }
+ if (len - i > 0) {
+ mdfour_update(&m, (uchar *)(buf1+i), (len-i));
+ }
+
+ mdfour_result(&m, (uchar *)sum);
}
-void get_checksum2(char *buf,int len,char *sum)
+void file_checksum(char *fname,char *sum,OFF_T size)
{
- int i;
- MDstruct MD;
- static char *buf1 = NULL;
- static int len1 = 0;
-
- if (len > len1) {
- if (buf1) free(buf1);
- buf1 = (char *)malloc(len+4);
- len1 = len;
- if (!buf1) out_of_memory("get_checksum2");
- }
-
- MDbegin(&MD);
-
- bcopy(buf,buf1,len);
- if (checksum_seed) {
- SIVAL(buf1,len,checksum_seed);
- len += 4;
- }
-
- for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
- MDupdate(&MD, buf1+i, CSUM_CHUNK*8);
- }
- MDupdate(&MD, buf1+i, (len-i)*8);
-
- sum_put(&MD,sum);
+ OFF_T i;
+ struct map_struct *buf;
+ int fd;
+ OFF_T len = size;
+ char tmpchunk[CSUM_CHUNK];
+ struct mdfour m;
+
+ memset(sum,0,csum_length);
+
+ fd = open(fname,O_RDONLY);
+ if (fd == -1) return;
+
+ buf = map_file(fd,size);
+
+ mdfour_begin(&m);
+
+ for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
+ memcpy(tmpchunk, map_ptr(buf,i,CSUM_CHUNK), CSUM_CHUNK);
+ mdfour_update(&m, (uchar *)tmpchunk, CSUM_CHUNK);
+ }
+
+ if (len - i > 0) {
+ memcpy(tmpchunk, map_ptr(buf,i,len-i), len-i);
+ mdfour_update(&m, (uchar *)tmpchunk, (len-i));
+ }
+
+ mdfour_result(&m, (uchar *)sum);
+
+ close(fd);
+ unmap_file(buf);
}
-void file_checksum(char *fname,char *sum,off_t size)
+void checksum_init(void)
{
- int i;
- MDstruct MD;
- struct map_struct *buf;
- int fd;
- int len = size;
- char tmpchunk[CSUM_CHUNK];
-
- bzero(sum,csum_length);
-
- fd = open(fname,O_RDONLY);
- if (fd == -1) return;
-
- buf = map_file(fd,size);
-
- MDbegin(&MD);
+ if (remote_version >= 14)
+ csum_length = 2; /* adaptive */
+ else
+ csum_length = SUM_LENGTH;
+}
- for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
- bcopy(map_ptr(buf,i,CSUM_CHUNK),tmpchunk,CSUM_CHUNK);
- MDupdate(&MD, tmpchunk, CSUM_CHUNK*8);
- }
- bcopy(map_ptr(buf,i,len-i),tmpchunk,len-i);
- MDupdate(&MD, tmpchunk, (len-i)*8);
- sum_put(&MD,sum);
+static int sumresidue;
+static char sumrbuf[CSUM_CHUNK];
+static struct mdfour md;
- close(fd);
- unmap_file(buf);
+void sum_init(void)
+{
+ char s[4];
+ mdfour_begin(&md);
+ sumresidue=0;
+ SIVAL(s,0,checksum_seed);
+ sum_update(s,4);
}
-
-void checksum_init(void)
+void sum_update(char *p,int len)
{
+ int i;
+ if (len + sumresidue < CSUM_CHUNK) {
+ memcpy(sumrbuf+sumresidue, p, len);
+ sumresidue += len;
+ return;
+ }
+
+ if (sumresidue) {
+ i = MIN(CSUM_CHUNK-sumresidue,len);
+ memcpy(sumrbuf+sumresidue,p,i);
+ mdfour_update(&md, (uchar *)sumrbuf, (i+sumresidue));
+ len -= i;
+ p += i;
+ }
+
+ for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
+ memcpy(sumrbuf,p+i,CSUM_CHUNK);
+ mdfour_update(&md, (uchar *)sumrbuf, CSUM_CHUNK);
+ }
+
+ if (len - i > 0) {
+ sumresidue = len-i;
+ memcpy(sumrbuf,p+i,sumresidue);
+ } else {
+ sumresidue = 0;
+ }
}
-
-#ifdef CHECKSUM_MAIN
- int main(int argc,char *argv[])
+void sum_end(char *sum)
{
- 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]);
- }
- }
+ if (sumresidue) {
+ mdfour_update(&md, (uchar *)sumrbuf, sumresidue);
+ }
+
+ mdfour_result(&md, (uchar *)sum);
}
-#endif
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff