*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-2008 Wayne Davison
+ * Copyright (C) 2003-2009 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*/
#include "rsync.h"
+#include "inums.h"
extern int checksum_seed;
extern int append_mode;
+extern int checksum_len;
int updating_basis_file;
+char sender_file_sum[MAX_DIGEST_LEN];
static int false_alarms;
static int hash_hits;
int32 n = (int32)(offset - last_match); /* max value: block_size (int32) */
int32 j;
- if (DEBUG_GTE(CHKSUM, 2) && i >= 0) {
+ if (DEBUG_GTE(DELTASUM, 2) && i >= 0) {
rprintf(FINFO,
"match at %s last_match=%s j=%d len=%ld n=%ld\n",
- big_num(offset, 0), big_num(last_match, 0), i,
+ big_num(offset), big_num(last_match), i,
(long)s->sums[i].len, (long)n);
}
* coding of the output to work more efficiently. */
want_i = 0;
- if (DEBUG_GTE(CHKSUM, 2)) {
+ if (DEBUG_GTE(DELTASUM, 2)) {
rprintf(FINFO, "hash search b=%ld len=%s\n",
- (long)s->blength, big_num(len, 0));
+ (long)s->blength, big_num(len));
}
k = (int32)MIN(len, (OFF_T)s->blength);
sum = get_checksum1((char *)map, k);
s1 = sum & 0xFFFF;
s2 = sum >> 16;
- if (DEBUG_GTE(CHKSUM, 3))
+ if (DEBUG_GTE(DELTASUM, 3))
rprintf(FINFO, "sum=%.8x k=%ld\n", sum, (long)k);
offset = 0;
end = len + 1 - s->sums[s->count-1].len;
- if (DEBUG_GTE(CHKSUM, 3)) {
+ if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO, "hash search s->blength=%ld len=%s count=%s\n",
- (long)s->blength, big_num(len, 0), big_num(s->count, 0));
+ (long)s->blength, big_num(len), big_num(s->count));
}
do {
int done_csum2 = 0;
int32 i;
- if (DEBUG_GTE(CHKSUM, 4)) {
+ if (DEBUG_GTE(DELTASUM, 4)) {
rprintf(FINFO, "offset=%s sum=%04x%04x\n",
- big_num(offset, 0), s2 & 0xFFFF, s1 & 0xFFFF);
+ big_num(offset), s2 & 0xFFFF, s1 & 0xFFFF);
}
if (tablesize == TRADITIONAL_TABLESIZE) {
&& !(s->sums[i].flags & SUMFLG_SAME_OFFSET))
continue;
- if (DEBUG_GTE(CHKSUM, 3)) {
+ if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO,
"potential match at %s i=%ld sum=%08x\n",
- big_num(offset, 0), (long)i, sum);
+ big_num(offset), (long)i, sum);
}
if (!done_csum2) {
**/
void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
{
- char file_sum[MAX_DIGEST_LEN];
- int sum_len;
-
last_match = 0;
false_alarms = 0;
hash_hits = 0;
if (len > 0 && s->count > 0) {
build_hash_table(s);
- if (DEBUG_GTE(CHKSUM, 2))
+ if (DEBUG_GTE(DELTASUM, 2))
rprintf(FINFO,"built hash table\n");
hash_search(f, s, buf, len);
- if (DEBUG_GTE(CHKSUM, 2))
+ if (DEBUG_GTE(DELTASUM, 2))
rprintf(FINFO,"done hash search\n");
} else {
OFF_T j;
matched(f, s, buf, len, -1);
}
- sum_len = sum_end(file_sum);
- /* If we had a read error, send a bad checksum. */
- if (buf && buf->status != 0)
- file_sum[0]++;
+ if (sum_end(sender_file_sum) != checksum_len)
+ overflow_exit("checksum_len"); /* Impossible... */
+
+ /* If we had a read error, send a bad checksum. We use all bits
+ * off as long as the checksum doesn't happen to be that, in
+ * which case we turn the last 0 bit into a 1. */
+ if (buf && buf->status != 0) {
+ int i;
+ for (i = 0; i < checksum_len && sender_file_sum[i] == 0; i++) {}
+ memset(sender_file_sum, 0, checksum_len);
+ if (i == checksum_len)
+ sender_file_sum[i-1]++;
+ }
- if (DEBUG_GTE(CHKSUM, 2))
+ if (DEBUG_GTE(DELTASUM, 2))
rprintf(FINFO,"sending file_sum\n");
- write_buf(f, file_sum, sum_len);
+ write_buf(f, sender_file_sum, checksum_len);
- if (DEBUG_GTE(CHKSUM, 2))
+ if (DEBUG_GTE(DELTASUM, 2)) {
rprintf(FINFO, "false_alarms=%d hash_hits=%d matches=%d\n",
false_alarms, hash_hits, matches);
+ }
total_hash_hits += hash_hits;
total_false_alarms += false_alarms;
void match_report(void)
{
- if (!DEBUG_GTE(CHKSUM, 1))
+ if (!DEBUG_GTE(DELTASUM, 1))
return;
rprintf(FINFO,
"total: matches=%d hash_hits=%d false_alarms=%d data=%s\n",
total_matches, total_hash_hits, total_false_alarms,
- big_num(stats.literal_data, 0));
+ big_num(stats.literal_data));
}