Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[rsync/rsync.git]
/
match.c
diff --git
a/match.c
b/match.c
index
6590178
..
33fc6e1
100644
(file)
--- a/
match.c
+++ b/
match.c
@@
-24,6
+24,8
@@
extern int csum_length;
extern int verbose;
extern int am_server;
extern int verbose;
extern int am_server;
+extern int remote_version;
+
typedef unsigned short tag;
#define TABLESIZE (1<<16)
typedef unsigned short tag;
#define TABLESIZE (1<<16)
@@
-88,46
+90,55
@@
static void build_hash_table(struct sum_struct *s)
static off_t last_match;
static off_t last_match;
-static void matched(int f,struct sum_struct *s,
char *buf,off_t len
,
+static void matched(int f,struct sum_struct *s,
struct map_struct *buf
,
int offset,int i)
{
int n = offset - last_match;
int offset,int i)
{
int n = offset - last_match;
-
+ int j;
+
if (verbose > 2)
if (i != -1)
fprintf(FERROR,"match at %d last_match=%d j=%d len=%d n=%d\n",
(int)offset,(int)last_match,i,(int)s->sums[i].len,n);
if (verbose > 2)
if (i != -1)
fprintf(FERROR,"match at %d last_match=%d j=%d len=%d n=%d\n",
(int)offset,(int)last_match,i,(int)s->sums[i].len,n);
- send_token(f,i,buf,last_match,n);
-
+ send_token(f,i,buf,last_match,n,i==-1?0:s->sums[i].len);
data_transfer += n;
data_transfer += n;
+ if (n > 0)
+ write_flush(f);
+
if (i != -1)
if (i != -1)
-
last_match = offset +
s->sums[i].len;
+
n +=
s->sums[i].len;
+ for (j=0;j<n;j+=CHUNK_SIZE) {
+ int n1 = MIN(CHUNK_SIZE,n-j);
+ sum_update(map_ptr(buf,last_match+j,n1),n1);
+ }
+
+
if (i != -1)
last_match = offset + s->sums[i].len;
if (i != -1)
last_match = offset + s->sums[i].len;
- if (n > 0)
- write_flush(f);
+
}
}
-static void hash_search(int f,struct sum_struct *s,char *buf,off_t len)
+static void hash_search(int f,struct sum_struct *s,
+ struct map_struct *buf,off_t len)
{
int offset,j,k;
int end;
char sum2[SUM_LENGTH];
uint32 s1, s2, sum;
{
int offset,j,k;
int end;
char sum2[SUM_LENGTH];
uint32 s1, s2, sum;
- char *map;
+
signed
char *map;
if (verbose > 2)
fprintf(FERROR,"hash search b=%d len=%d\n",s->n,(int)len);
k = MIN(len, s->n);
if (verbose > 2)
fprintf(FERROR,"hash search b=%d len=%d\n",s->n,(int)len);
k = MIN(len, s->n);
- map = map_ptr(buf,0,k);
+ map =
(signed char *)
map_ptr(buf,0,k);
- sum = get_checksum1(map, k);
+ sum = get_checksum1(
(char *)
map, k);
s1 = sum & 0xFFFF;
s2 = sum >> 16;
if (verbose > 3)
s1 = sum & 0xFFFF;
s2 = sum >> 16;
if (verbose > 3)
@@
-163,16
+174,16
@@
static void hash_search(int f,struct sum_struct *s,char *buf,off_t len)
if (!done_csum2) {
int l = MIN(s->n,len-offset);
if (!done_csum2) {
int l = MIN(s->n,len-offset);
- map = map_ptr(buf,offset,l);
- get_checksum2(map,l,sum2);
+ map =
(signed char *)
map_ptr(buf,offset,l);
+ get_checksum2(
(char *)
map,l,sum2);
done_csum2 = 1;
}
if (memcmp(sum2,s->sums[i].sum2,csum_length) == 0) {
done_csum2 = 1;
}
if (memcmp(sum2,s->sums[i].sum2,csum_length) == 0) {
- matched(f,s,buf,
len,
offset,i);
+ matched(f,s,buf,offset,i);
offset += s->sums[i].len - 1;
k = MIN((len-offset), s->n);
offset += s->sums[i].len - 1;
k = MIN((len-offset), s->n);
- map = map_ptr(buf,offset,k);
- sum = get_checksum1(map, k);
+ map =
(signed char *)
map_ptr(buf,offset,k);
+ sum = get_checksum1(
(char *)
map, k);
s1 = sum & 0xFFFF;
s2 = sum >> 16;
++matches;
s1 = sum & 0xFFFF;
s2 = sum >> 16;
++matches;
@@
-186,13
+197,13
@@
static void hash_search(int f,struct sum_struct *s,char *buf,off_t len)
}
/* Trim off the first byte from the checksum */
}
/* Trim off the first byte from the checksum */
- map = map_ptr(buf,offset,k+1);
- s1 -= map[0];
- s2 -= k *
map[0]
;
+ map =
(signed char *)
map_ptr(buf,offset,k+1);
+ s1 -= map[0]
+ CHAR_OFFSET
;
+ s2 -= k *
(map[0]+CHAR_OFFSET)
;
/* Add on the next byte (if there is one) to the checksum */
if (k < (len-offset)) {
/* Add on the next byte (if there is one) to the checksum */
if (k < (len-offset)) {
- s1 +=
map[k]
;
+ s1 +=
(map[k]+CHAR_OFFSET)
;
s2 += s1;
} else {
--k;
s2 += s1;
} else {
--k;
@@
-200,18
+211,23
@@
static void hash_search(int f,struct sum_struct *s,char *buf,off_t len)
} while (++offset < end);
} while (++offset < end);
- matched(f,s,buf,len,len,-1);
+ matched(f,s,buf,len,-1);
+ map_ptr(buf,len-1,1);
}
}
-void match_sums(int f,struct sum_struct *s,
char
*buf,off_t len)
+void match_sums(int f,struct sum_struct *s,
struct map_struct
*buf,off_t len)
{
{
+ char file_sum[MD4_SUM_LENGTH];
+
last_match = 0;
false_alarms = 0;
tag_hits = 0;
matches=0;
data_transfer=0;
last_match = 0;
false_alarms = 0;
tag_hits = 0;
matches=0;
data_transfer=0;
+ sum_init();
+
if (len > 0 && s->count>0) {
build_hash_table(s);
if (len > 0 && s->count>0) {
build_hash_table(s);
@@
-223,7
+239,15
@@
void match_sums(int f,struct sum_struct *s,char *buf,off_t len)
if (verbose > 2)
fprintf(FERROR,"done hash search\n");
} else {
if (verbose > 2)
fprintf(FERROR,"done hash search\n");
} else {
- matched(f,s,buf,len,len,-1);
+ matched(f,s,buf,len,-1);
+ }
+
+ sum_end(file_sum);
+
+ if (remote_version >= 14) {
+ if (verbose > 2)
+ fprintf(FERROR,"sending file_sum\n");
+ write_buf(f,file_sum,MD4_SUM_LENGTH);
}
if (targets) {
}
if (targets) {