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
Some uid/gid fixes for (id_t)-1 and other large ID values.
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
7aadfcb
..
600ad84
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-63,7
+63,7
@@
static struct sum_struct *receive_sums(int f)
{
struct sum_struct *s;
int32 i;
{
struct sum_struct *s;
int32 i;
- int lull_mod = allowed_lull * 5;
+ int lull_mod =
protocol_version >= 31 ? 0 :
allowed_lull * 5;
OFF_T offset = 0;
if (!(s = new(struct sum_struct)))
OFF_T offset = 0;
if (!(s = new(struct sum_struct)))
@@
-104,8
+104,8
@@
static struct sum_struct *receive_sums(int f)
s->sums[i].len = s->blength;
offset += s->sums[i].len;
s->sums[i].len = s->blength;
offset += s->sums[i].len;
- if (
allowed_lull
&& !(i % lull_mod))
- maybe_send_keepalive();
+ if (
lull_mod
&& !(i % lull_mod))
+ maybe_send_keepalive(
time(NULL), True
);
if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO,
if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO,
@@
-337,7
+337,7
@@
void send_files(int f_in, int f_out)
rsyserr(FERROR_XFER, errno, "fstat failed");
free_sums(s);
close(fd);
rsyserr(FERROR_XFER, errno, "fstat failed");
free_sums(s);
close(fd);
- exit_cleanup(RERR_
PROTOCOL
);
+ exit_cleanup(RERR_
FILEIO
);
}
if (st.st_size) {
}
if (st.st_size) {