* Copyright (C) 1996-2001 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003, 2004, 2005, 2006, 2007 Wayne Davison
+ * Copyright (C) 2003-2007 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
static int active_filecnt = 0;
static OFF_T active_bytecnt = 0;
-static char int_byte_cnt[64] = {
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* (00 - 3F)/4 */
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* (40 - 7F)/4 */
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, /* (80 - BF)/4 */
- 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 8, 9, /* (C0 - FF)/4 */
+static char int_byte_extra[64] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* (00 - 3F)/4 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* (40 - 7F)/4 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* (80 - BF)/4 */
+ 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 5, 6, /* (C0 - FF)/4 */
};
static void readfd(int fd, char *buffer, size_t N);
struct msg_list_item *head, *tail;
};
-static struct msg_list msg2sndr;
+static struct msg_list msg_queue;
static void flist_ndx_push(struct flist_ndx_list *lp, int ndx)
{
lst->tail = m;
}
-static void msg2sndr_flush(void)
+static void msg_flush(void)
{
- while (msg2sndr.head && io_multiplexing_out) {
- struct msg_list_item *m = msg2sndr.head;
- if (!(msg2sndr.head = m->next))
- msg2sndr.tail = NULL;
- stats.total_written += m->len;
- defer_forwarding_messages = 1;
- writefd_unbuffered(sock_f_out, m->buf, m->len);
- defer_forwarding_messages = 0;
- free(m);
+ if (am_generator) {
+ while (msg_queue.head && io_multiplexing_out) {
+ struct msg_list_item *m = msg_queue.head;
+ if (!(msg_queue.head = m->next))
+ msg_queue.tail = NULL;
+ stats.total_written += m->len;
+ defer_forwarding_messages++;
+ writefd_unbuffered(sock_f_out, m->buf, m->len);
+ defer_forwarding_messages--;
+ free(m);
+ }
+ } else {
+ while (msg_queue.head) {
+ struct msg_list_item *m = msg_queue.head;
+ if (!(msg_queue.head = m->next))
+ msg_queue.tail = NULL;
+ defer_forwarding_messages++;
+ writefd_unbuffered(msg_fd_out, m->buf, m->len);
+ defer_forwarding_messages--;
+ free(m);
+ }
}
}
}
if (len) {
readfd(fd, buf, len);
- stats.total_read = read_longint(fd);
+ stats.total_read = read_varlong(fd, 3);
}
msgdone_cnt++;
break;
no_flush--;
msg_fd_in = fd;
if (!--defer_forwarding_messages)
- msg2sndr_flush();
+ msg_flush();
}
/* This is used by the generator to limit how many file transfers can
}
active_filecnt++;
- active_bytecnt += F_LENGTH(cur_flist->files[ndx]);
+ active_bytecnt += F_LENGTH(cur_flist->files[ndx - cur_flist->ndx_start]);
}
static void decrement_active_files(int ndx)
defer_forwarding_messages++;
writefd_unbuffered(fd, buf, len);
if (!--defer_forwarding_messages)
- msg2sndr_flush();
+ msg_flush();
}
}
return io_multiplex_write(code, buf, len);
if (!io_multiplexing_out)
return 0;
- msg_list_add(&msg2sndr, code, buf, len);
+ msg_list_add(&msg_queue, code, buf, len);
return 1;
}
- mplex_write(msg_fd_out, code, buf, len);
+ if (flist_forward_from >= 0)
+ msg_list_add(&msg_queue, code, buf, len);
+ else
+ mplex_write(msg_fd_out, code, buf, len);
return 1;
}
iobuf_f_out = -1;
}
-void maybe_flush_socket(void)
+void maybe_flush_socket(int important)
{
- if (iobuf_out && iobuf_out_cnt && time(NULL) - last_io_out >= 5)
+ if (iobuf_out && iobuf_out_cnt
+ && (important || time(NULL) - last_io_out >= 5))
io_flush(NORMAL_FLUSH);
}
return num;
}
-int64 read_longint(int f)
+int32 read_varint(int f)
{
- int64 num;
- char b[9];
+ union {
+ char b[5];
+ int32 x;
+ } u;
+ uchar ch;
+ int extra;
- if (protocol_version < 30) {
- num = read_int(f);
+ u.x = 0;
+ readfd(f, (char*)&ch, 1);
+ extra = int_byte_extra[ch / 4];
+ if (extra) {
+ uchar bit = ((uchar)1<<(8-extra));
+ if (extra >= (int)sizeof u.b) {
+ rprintf(FERROR, "Overflow in read_varint()\n");
+ exit_cleanup(RERR_STREAMIO);
+ }
+ readfd(f, u.b, extra);
+ u.b[extra] = ch & (bit-1);
+ } else
+ u.b[0] = ch;
+#if CAREFUL_ALIGNMENT
+ u.x = IVAL(u.b,0);
+#endif
+#if SIZEOF_INT32 > 4
+ if (u.x & (int32)0x80000000)
+ u.x |= ~(int32)0xffffffff;
+#endif
+ return u.x;
+}
- if ((int32)num != (int32)0xffffffff)
- return num;
+int64 read_varlong(int f, uchar min_bytes)
+{
+ union {
+ char b[9];
+ int64 x;
+ } u;
+ char b2[8];
+ int extra;
#if SIZEOF_INT64 < 8
- rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
- exit_cleanup(RERR_UNSUPPORTED);
+ memset(u.b, 0, 8);
#else
- readfd(f, b, 8);
- num = IVAL(b,0) | (((int64)IVAL(b,4))<<32);
+ u.x = 0;
#endif
- } else {
- int cnt;
- readfd(f, b, 3);
- cnt = int_byte_cnt[CVAL(b, 0) / 4];
+ readfd(f, b2, min_bytes);
+ memcpy(u.b, b2+1, min_bytes-1);
+ extra = int_byte_extra[CVAL(b2, 0) / 4];
+ if (extra) {
+ uchar bit = ((uchar)1<<(8-extra));
+ if (min_bytes + extra > (int)sizeof u.b) {
+ rprintf(FERROR, "Overflow in read_varlong()\n");
+ exit_cleanup(RERR_STREAMIO);
+ }
+ readfd(f, u.b + min_bytes - 1, extra);
+ u.b[min_bytes + extra - 1] = CVAL(b2, 0) & (bit-1);
#if SIZEOF_INT64 < 8
- if (cnt > 5 || (cnt == 5 && (CVAL(b,0)&0x3F || CVAL(b,1)&0x80))) {
+ if (min_bytes + extra > 5 || u.b[4] || CVAL(u.b,3) & 0x80) {
rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
exit_cleanup(RERR_UNSUPPORTED);
}
#endif
- if (cnt > 3)
- readfd(f, b + 3, cnt - 3);
- switch (cnt) {
- case 3:
- num = NVAL3(b, 0);
- break;
- case 4:
- num = NVAL4(b, 0x80);
- break;
- case 5:
- num = NVAL5(b, 0xC0);
- break;
+ } else
+ u.b[min_bytes + extra - 1] = CVAL(b2, 0);
+#if SIZEOF_INT64 < 8
+ u.x = IVAL(u.b,0);
+#elif CAREFUL_ALIGNMENT
+ u.x = IVAL(u.b,0) | (((int64)IVAL(u.b,4))<<32);
+#endif
+ return u.x;
+}
+
+int64 read_longint(int f)
+{
#if SIZEOF_INT64 >= 8
- case 6:
- num = NVAL6(b, 0xE0);
- break;
- case 7:
- num = NVAL7(b, 0xF0);
- break;
- case 8:
- num = NVAL8(b, 0xF8);
- break;
- case 9:
- num = NVAL8(b+1, 0);
- break;
+ char b[9];
#endif
- default:
- exit_cleanup(RERR_PROTOCOL); /* impossible... */
- }
- }
+ int32 num = read_int(f);
- return num;
+ if (num != (int32)0xffffffff)
+ return num;
+
+#if SIZEOF_INT64 < 8
+ rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
+ exit_cleanup(RERR_UNSUPPORTED);
+#else
+ readfd(f, b, 8);
+ return IVAL(b,0) | (((int64)IVAL(b,4))<<32);
+#endif
}
void read_buf(int f, char *buf, size_t len)
exit_cleanup(RERR_PROTOCOL);
}
sum->s2length = protocol_version < 27 ? csum_length : (int)read_int(f);
- if (sum->s2length < 0 || sum->s2length > MD4_SUM_LENGTH) {
+ if (sum->s2length < 0 || sum->s2length > MAX_DIGEST_LEN) {
rprintf(FERROR, "Invalid checksum length %d [%s]\n",
sum->s2length, who_am_i());
exit_cleanup(RERR_PROTOCOL);
size_t n, total = 0;
fd_set w_fds, r_fds, e_fds;
int maxfd, count, cnt, using_r_fds;
- int defer_save = defer_forwarding_messages;
+ int defer_inc = 0;
struct timeval tv;
if (no_flush++)
- defer_forwarding_messages = 1;
+ defer_forwarding_messages++, defer_inc++;
while (total < len) {
FD_ZERO(&w_fds);
}
total += cnt;
- defer_forwarding_messages = 1;
+ defer_forwarding_messages++, defer_inc++;
if (fd == sock_f_out) {
if (io_timeout || am_generator)
}
no_flush--;
- if (!(defer_forwarding_messages = defer_save))
- msg2sndr_flush();
+ if (!(defer_forwarding_messages -= defer_inc))
+ msg_flush();
}
void io_flush(int flush_it_all)
{
- if (flush_it_all && !defer_forwarding_messages)
- msg2sndr_flush();
-
if (!iobuf_out_cnt || no_flush)
return;
else
writefd_unbuffered(iobuf_f_out, iobuf_out, iobuf_out_cnt);
iobuf_out_cnt = 0;
+
+ if (flush_it_all && !defer_forwarding_messages)
+ msg_flush();
}
static void writefd(int fd, const char *buf, size_t len)
writefd(f, b, 4);
}
-/*
- * Note: int64 may actually be a 32-bit type if ./configure couldn't find any
- * 64-bit types on this platform.
- */
-void write_longint(int f, int64 x)
+void write_varint(int f, int32 x)
{
- char b[12];
+ char b[5];
+ uchar bit;
+ int cnt = 4;
-#if SIZEOF_INT64 < 8
- if (x < 0 || x > 0x7FFFFFFF) {
+ SIVAL(b, 1, x);
+
+ while (cnt > 1 && b[cnt] == 0)
+ cnt--;
+ bit = ((uchar)1<<(7-cnt+1));
+ if (CVAL(b, cnt) >= bit) {
+ cnt++;
+ *b = ~(bit-1);
+ } else if (cnt > 1)
+ *b = b[cnt] | ~(bit*2-1);
+ else
+ *b = b[cnt];
+
+ writefd(f, b, cnt);
+}
+
+void write_varlong(int f, int64 x, uchar min_bytes)
+{
+ char b[9];
+ uchar bit;
+ int cnt = 8;
+
+ SIVAL(b, 1, x);
+#if SIZEOF_INT64 >= 8
+ SIVAL(b, 5, x >> 32);
+#else
+ if (x <= 0x7FFFFFFF && x >= 0)
+ memset(b + 5, 0, 4);
+ else {
rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
exit_cleanup(RERR_UNSUPPORTED);
}
#endif
- if (protocol_version < 30) {
- char * const s = b+4;
- SIVAL(s, 0, x);
-#if SIZEOF_INT64 < 8
+ while (cnt > min_bytes && b[cnt] == 0)
+ cnt--;
+ bit = ((uchar)1<<(7-cnt+min_bytes));
+ if (CVAL(b, cnt) >= bit) {
+ cnt++;
+ *b = ~(bit-1);
+ } else if (cnt > min_bytes)
+ *b = b[cnt] | ~(bit*2-1);
+ else
+ *b = b[cnt];
+
+ writefd(f, b, cnt);
+}
+
+/*
+ * Note: int64 may actually be a 32-bit type if ./configure couldn't find any
+ * 64-bit types on this platform.
+ */
+void write_longint(int f, int64 x)
+{
+ char b[12], * const s = b+4;
+
+ SIVAL(s, 0, x);
+ if (x <= 0x7FFFFFFF && x >= 0) {
writefd(f, s, 4);
-#else
- if (x <= 0x7FFFFFFF && x >= 0) {
- writefd(f, s, 4);
- return;
- }
+ return;
+ }
- memset(b, 0xFF, 4);
- SIVAL(s, 4, x >> 32);
- writefd(f, b, 12);
- } else if (x < 0) {
- goto all_bits;
-#endif
- } else if (x < ((int32)1<<(3*8-1))) {
- b[0] = (char)(x >> 16);
- b[1] = (char)(x >> 8);
- b[2] = (char)x;
- writefd(f, b, 3);
- } else if (x < ((int64)1<<(4*8-2))) {
- b[0] = (char)((x >> 24) | 0x80);
- b[1] = (char)(x >> 16);
- b[2] = (char)(x >> 8);
- b[3] = (char)x;
- writefd(f, b, 4);
#if SIZEOF_INT64 < 8
- } else {
- b[0] = 0xC0;
- b[1] = (char)(x >> 24);
- b[2] = (char)(x >> 16);
- b[3] = (char)(x >> 8);
- b[4] = (char)x;
- writefd(f, b, 5);
- }
+ rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
+ exit_cleanup(RERR_UNSUPPORTED);
#else
- } else if (x < ((int64)1<<(5*8-3))) {
- b[0] = (char)((x >> 32) | 0xC0);
- b[1] = (char)(x >> 24);
- b[2] = (char)(x >> 16);
- b[3] = (char)(x >> 8);
- b[4] = (char)x;
- writefd(f, b, 5);
- } else if (x < ((int64)1<<(6*8-4))) {
- b[0] = (char)((x >> 40) | 0xE0);
- b[1] = (char)(x >> 32);
- b[2] = (char)(x >> 24);
- b[3] = (char)(x >> 16);
- b[4] = (char)(x >> 8);
- b[5] = (char)x;
- writefd(f, b, 6);
- } else if (x < ((int64)1<<(7*8-5))) {
- b[0] = (char)((x >> 48) | 0xF0);
- b[1] = (char)(x >> 40);
- b[2] = (char)(x >> 32);
- b[3] = (char)(x >> 24);
- b[4] = (char)(x >> 16);
- b[5] = (char)(x >> 8);
- b[6] = (char)x;
- writefd(f, b, 7);
- } else if (x < ((int64)1<<(8*8-6))) {
- b[0] = (char)((x >> 56) | 0xF8);
- b[1] = (char)(x >> 48);
- b[2] = (char)(x >> 40);
- b[3] = (char)(x >> 32);
- b[4] = (char)(x >> 24);
- b[5] = (char)(x >> 16);
- b[6] = (char)(x >> 8);
- b[7] = (char)x;
- writefd(f, b, 8);
- } else {
- all_bits:
- b[0] = (char)0xFC;
- b[1] = (char)(x >> 56);
- b[2] = (char)(x >> 48);
- b[3] = (char)(x >> 40);
- b[4] = (char)(x >> 32);
- b[5] = (char)(x >> 24);
- b[6] = (char)(x >> 16);
- b[7] = (char)(x >> 8);
- b[8] = (char)x;
- writefd(f, b, 9);
- }
+ memset(b, 0xFF, 4);
+ SIVAL(s, 4, x >> 32);
+ writefd(f, b, 12);
#endif
}
else if (diff < 0 || diff > 0x7FFF) {
b[cnt++] = (char)0xFE;
b[cnt++] = (char)((ndx >> 24) | 0x80);
- b[cnt++] = (char)(ndx >> 16);
- b[cnt++] = (char)(ndx >> 8);
b[cnt++] = (char)ndx;
+ b[cnt++] = (char)(ndx >> 8);
+ b[cnt++] = (char)(ndx >> 16);
} else {
b[cnt++] = (char)0xFE;
b[cnt++] = (char)(diff >> 8);
if (CVAL(b, 0) == 0xFE) {
readfd(f, b, 2);
if (CVAL(b, 0) & 0x80) {
- readfd(f, b+2, 2);
- num = NVAL4(b, 0x80);
+ b[3] = CVAL(b, 0) & ~0x80;
+ b[0] = b[1];
+ readfd(f, b+1, 2);
+ num = IVAL(b, 0);
} else
- num = NVAL2(b, 0) + *prev_ptr;
+ num = (UVAL(b,0)<<8) + UVAL(b,1) + *prev_ptr;
} else
- num = CVAL(b, 0) + *prev_ptr;
+ num = UVAL(b, 0) + *prev_ptr;
*prev_ptr = num;
if (prev_ptr == &prev_negative)
num = -num;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff