* 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 version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
*/
/* Rsync provides its own multiplexing system, which is used to send
extern int protocol_version;
extern int remove_source_files;
extern int preserve_hard_links;
-extern char *filesfrom_host;
extern struct stats stats;
extern struct file_list *cur_flist, *first_flist;
+#ifdef ICONV_OPTION
+extern iconv_t ic_send, ic_recv;
+#endif
const char phase_unknown[] = "unknown";
int ignore_timeout = 0;
static int io_filesfrom_f_in = -1;
static int io_filesfrom_f_out = -1;
static char io_filesfrom_buf[2048];
+#ifdef ICONV_OPTION
+static char iconv_buf[sizeof io_filesfrom_buf / 2];
+#endif
static char *io_filesfrom_bp;
static char io_filesfrom_lastchar;
static int io_filesfrom_buflen;
static int active_filecnt = 0;
static OFF_T active_bytecnt = 0;
-static char int_byte_cnt[64] = {
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* (00 - 3F)/4 */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* (40 - 7F)/4 */
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* (80 - BF)/4 */
- 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 6, 7, /* (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 */
};
+enum festatus { FES_SUCCESS, FES_REDO, FES_NO_SEND };
+
static void readfd(int fd, char *buffer, size_t N);
static void writefd(int fd, const char *buf, size_t len);
static void writefd_unbuffered(int fd, const char *buf, size_t len);
-static void decrement_active_files(int ndx);
-static void decrement_flist_in_progress(int ndx, int redo);
+static void mplex_write(int fd, enum msgcode code, const char *buf, size_t len, int convert);
struct flist_ndx_item {
struct flist_ndx_item *next;
struct msg_list_item {
struct msg_list_item *next;
- int len;
+ char convert;
char buf[1];
};
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)
{
return ndx;
}
+static void got_flist_entry_status(enum festatus status, const char *buf)
+{
+ int ndx = IVAL(buf, 0);
+ struct file_list *flist = flist_for_ndx(ndx);
+
+ assert(flist != NULL);
+ assert(ndx >= flist->ndx_start);
+
+ if (remove_source_files) {
+ active_filecnt--;
+ active_bytecnt -= F_LENGTH(flist->files[ndx - flist->ndx_start]);
+ }
+
+ if (inc_recurse)
+ flist->in_progress--;
+
+ switch (status) {
+ case FES_SUCCESS:
+ if (remove_source_files)
+ send_msg(MSG_SUCCESS, buf, 4, 0);
+ if (preserve_hard_links) {
+ struct file_struct *file = flist->files[ndx - flist->ndx_start];
+ if (F_IS_HLINKED(file))
+ flist_ndx_push(&hlink_list, ndx);
+ }
+ break;
+ case FES_REDO:
+ if (inc_recurse)
+ flist->to_redo++;
+ flist_ndx_push(&redo_list, ndx);
+ break;
+ case FES_NO_SEND:
+ break;
+ }
+}
+
static void check_timeout(void)
{
time_t t;
}
/* Add a message to the pending MSG_* list. */
-static void msg_list_add(struct msg_list *lst, int code, const char *buf, int len)
+static void msg_list_add(struct msg_list *lst, int code, const char *buf, int len, int convert)
{
struct msg_list_item *m;
int sz = len + 4 + sizeof m[0] - 1;
if (!(m = (struct msg_list_item *)new_array(char, sz)))
out_of_memory("msg_list_add");
m->next = NULL;
- m->len = len + 4;
+ m->convert = convert;
SIVAL(m->buf, 0, ((code+MPLEX_BASE)<<24) | len);
memcpy(m->buf + 4, buf, len);
if (lst->tail)
lst->tail = m;
}
-static void msg2sndr_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);
+static void msg_flush(void)
+{
+ if (am_generator) {
+ while (msg_queue.head && io_multiplexing_out) {
+ struct msg_list_item *m = msg_queue.head;
+ int len = IVAL(m->buf, 0) & 0xFFFFFF;
+ int tag = *((uchar*)m->buf+3) - MPLEX_BASE;
+ if (!(msg_queue.head = m->next))
+ msg_queue.tail = NULL;
+ stats.total_written += len + 4;
+ defer_forwarding_messages++;
+ mplex_write(sock_f_out, tag, m->buf + 4, len, m->convert);
+ defer_forwarding_messages--;
+ free(m);
+ }
+ } else {
+ while (msg_queue.head) {
+ struct msg_list_item *m = msg_queue.head;
+ int len = IVAL(m->buf, 0) & 0xFFFFFF;
+ int tag = *((uchar*)m->buf+3) - MPLEX_BASE;
+ if (!(msg_queue.head = m->next))
+ msg_queue.tail = NULL;
+ defer_forwarding_messages++;
+ mplex_write(msg_fd_out, tag, m->buf + 4, len, m->convert);
+ 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;
if (len != 4 || !am_generator)
goto invalid_msg;
readfd(fd, buf, 4);
- if (remove_source_files)
- decrement_active_files(IVAL(buf,0));
- flist_ndx_push(&redo_list, IVAL(buf,0));
- if (inc_recurse)
- decrement_flist_in_progress(IVAL(buf,0), 1);
+ got_flist_entry_status(FES_REDO, buf);
break;
case MSG_FLIST:
if (len != 4 || !am_generator || !inc_recurse)
/* Read extra file list from receiver. */
assert(iobuf_in != NULL);
assert(iobuf_f_in == fd);
+ if (verbose > 3) {
+ rprintf(FINFO, "[%s] receiving flist for dir %d\n",
+ who_am_i(), IVAL(buf,0));
+ }
flist = recv_file_list(fd);
flist->parent_ndx = IVAL(buf,0);
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links)
+ match_hard_links(flist);
+#endif
break;
case MSG_FLIST_EOF:
if (len != 0 || !am_generator || !inc_recurse)
if (len >= (int)sizeof buf || !am_generator)
goto invalid_msg;
readfd(fd, buf, len);
- send_msg(MSG_DELETED, buf, len);
+ send_msg(MSG_DELETED, buf, len, 1);
break;
case MSG_SUCCESS:
if (len != 4 || !am_generator)
goto invalid_msg;
- readfd(fd, buf, len);
- if (remove_source_files) {
- decrement_active_files(IVAL(buf,0));
- send_msg(MSG_SUCCESS, buf, len);
- }
- if (preserve_hard_links)
- flist_ndx_push(&hlink_list, IVAL(buf,0));
- if (inc_recurse)
- decrement_flist_in_progress(IVAL(buf,0), 0);
+ readfd(fd, buf, 4);
+ got_flist_entry_status(FES_SUCCESS, buf);
break;
case MSG_NO_SEND:
if (len != 4 || !am_generator)
goto invalid_msg;
- readfd(fd, buf, len);
- if (inc_recurse)
- decrement_flist_in_progress(IVAL(buf,0), 0);
+ readfd(fd, buf, 4);
+ got_flist_entry_status(FES_NO_SEND, buf);
break;
case MSG_SOCKERR:
case MSG_CLIENT:
if (n >= sizeof buf)
n = sizeof buf - 1;
readfd(fd, buf, n);
- rwrite((enum logcode)tag, buf, n);
+ rwrite((enum logcode)tag, buf, n, !am_generator);
len -= n;
}
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_bytecnt += F_LENGTH(cur_flist->files[ndx - cur_flist->ndx_start]);
}
-static void decrement_active_files(int ndx)
-{
- struct file_list *flist = flist_for_ndx(ndx);
- assert(flist != NULL);
- active_filecnt--;
- active_bytecnt -= F_LENGTH(flist->files[ndx - flist->ndx_start]);
-}
-
-static void decrement_flist_in_progress(int ndx, int redo)
-{
- struct file_list *flist = cur_flist ? cur_flist : first_flist;
-
- while (ndx < flist->ndx_start) {
- if (flist == first_flist) {
- invalid_ndx:
- rprintf(FERROR,
- "Invalid file index: %d (%d - %d) [%s]\n",
- ndx, first_flist->ndx_start,
- first_flist->prev->ndx_start + first_flist->prev->count - 1,
- who_am_i());
- exit_cleanup(RERR_PROTOCOL);
- }
- flist = flist->prev;
- }
- while (ndx >= flist->ndx_start + flist->count) {
- if (!(flist = flist->next))
- goto invalid_ndx;
- }
-
- flist->in_progress--;
- if (redo)
- flist->to_redo++;
-}
-
/* Write an message to a multiplexed stream. If this fails, rsync exits. */
-static void mplex_write(int fd, enum msgcode code, const char *buf, size_t len)
+static void mplex_write(int fd, enum msgcode code, const char *buf, size_t len, int convert)
{
- char buffer[1024];
+ char buffer[BIGPATHBUFLEN]; /* Oversized for use by iconv code. */
size_t n = len;
SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len);
- if (n > sizeof buffer - 4)
+#ifdef ICONV_OPTION
+ if (convert && ic_send == (iconv_t)-1)
+#endif
+ convert = 0;
+
+ if (convert || n > 1024 - 4) /* BIGPATHBUFLEN can handle 1024 bytes */
n = 0;
else
memcpy(buffer + 4, buf, n);
len -= n;
buf += n;
+#ifdef ICONV_OPTION
+ if (convert) {
+ iconv(ic_send, NULL, 0, NULL, 0);
+ defer_forwarding_messages++;
+ while (len) {
+ ICONV_CONST char *ibuf = (ICONV_CONST char *)buf;
+ char *obuf = buffer;
+ size_t ocnt = sizeof buffer;
+ while (len && iconv(ic_send, &ibuf,&len,
+ &obuf,&ocnt) == (size_t)-1) {
+ if (errno == E2BIG || !ocnt)
+ break;
+ *obuf++ = *ibuf++;
+ ocnt--, len--;
+ }
+ n = obuf - buffer;
+ writefd_unbuffered(fd, buffer, n);
+ }
+ if (!--defer_forwarding_messages)
+ msg_flush();
+ } else
+#endif
if (len) {
defer_forwarding_messages++;
writefd_unbuffered(fd, buf, len);
if (!--defer_forwarding_messages)
- msg2sndr_flush();
+ msg_flush();
}
}
-int send_msg(enum msgcode code, const char *buf, int len)
+int send_msg(enum msgcode code, const char *buf, int len, int convert)
{
if (msg_fd_out < 0) {
if (!defer_forwarding_messages)
- return io_multiplex_write(code, buf, len);
+ return io_multiplex_write(code, buf, len, convert);
if (!io_multiplexing_out)
return 0;
- msg_list_add(&msg2sndr, code, buf, len);
+ msg_list_add(&msg_queue, code, buf, len, convert);
return 1;
}
- mplex_write(msg_fd_out, code, buf, len);
+ if (flist_forward_from >= 0)
+ msg_list_add(&msg_queue, code, buf, len, convert);
+ else
+ mplex_write(msg_fd_out, code, buf, len, convert);
return 1;
}
{
char numbuf[4];
SIVAL(numbuf, 0, num);
- send_msg(code, numbuf, 4);
+ send_msg(code, numbuf, 4, 0);
}
void wait_for_receiver(void)
io_filesfrom_bp = io_filesfrom_buf;
else
io_filesfrom_bp += l;
- } else {
+ } else if (errno != EINTR) {
/* XXX should we complain? */
io_filesfrom_f_out = -1;
}
io_filesfrom_buf,
sizeof io_filesfrom_buf);
if (l <= 0) {
- /* Send end-of-file marker */
- io_filesfrom_buf[0] = '\0';
- io_filesfrom_buf[1] = '\0';
- io_filesfrom_buflen = io_filesfrom_lastchar? 2 : 1;
- io_filesfrom_f_in = -1;
+ if (l == 0 || errno != EINTR) {
+ /* Send end-of-file marker */
+ io_filesfrom_buf[0] = '\0';
+ io_filesfrom_buf[1] = '\0';
+ io_filesfrom_buflen = io_filesfrom_lastchar? 2 : 1;
+ io_filesfrom_f_in = -1;
+ }
} else {
if (!eol_nulls) {
char *s = io_filesfrom_buf + l;
return cnt;
}
-/**
- * Read a line into the "fname" buffer (which must be at least MAXPATHLEN
- * characters long).
- */
-int read_filesfrom_line(int fd, char *fname)
+/* Read a line into the "buf" buffer. */
+int read_line(int fd, char *buf, size_t bufsiz, int dump_comments, int rl_nulls)
{
- char ch, *s, *eob = fname + MAXPATHLEN - 1;
+ char ch, *s, *eob = buf + bufsiz - 1;
int cnt;
- int reading_remotely = filesfrom_host != NULL;
- int nulls = eol_nulls || reading_remotely;
start:
- s = fname;
+ s = buf;
while (1) {
cnt = read(fd, &ch, 1);
if (cnt < 0 && (errno == EWOULDBLOCK
tv.tv_usec = 0;
if (!select(fd+1, &r_fds, NULL, &e_fds, &tv))
check_timeout();
- if (FD_ISSET(fd, &e_fds)) {
- rsyserr(FINFO, errno,
- "select exception on fd %d", fd);
- }
+ /*if (FD_ISSET(fd, &e_fds))
+ rprintf(FINFO, "select exception on fd %d\n", fd); */
continue;
}
if (cnt != 1)
break;
- if (nulls? !ch : (ch == '\r' || ch == '\n')) {
- /* Skip empty lines if reading locally. */
- if (!reading_remotely && s == fname)
+ if (rl_nulls ? ch == '\0' : (ch == '\r' || ch == '\n')) {
+ /* Skip empty lines if dumping comments. */
+ if (dump_comments && s == buf)
continue;
break;
}
}
*s = '\0';
- /* Dump comments. */
- if (*fname == '#' || *fname == ';')
+ if (dump_comments && (*buf == '#' || *buf == ';'))
goto start;
- return s - fname;
+ return s - buf;
+}
+
+int read_args(int f_in, char *mod_name, char *buf, size_t bufsiz, int rl_nulls,
+ char ***argv_p, int *argc_p, char **request_p)
+{
+ int maxargs = MAX_ARGS;
+ int dot_pos = 0;
+ int argc = 0;
+ char **argv, *p;
+
+ if (!(argv = new_array(char *, maxargs)))
+ out_of_memory("read_args");
+ if (mod_name)
+ argv[argc++] = "rsyncd";
+
+ while (1) {
+ if (read_line(f_in, buf, bufsiz, 0, rl_nulls) == 0)
+ break;
+
+ if (argc == maxargs) {
+ maxargs += MAX_ARGS;
+ if (!(argv = realloc_array(argv, char *, maxargs)))
+ out_of_memory("read_args");
+ }
+
+ if (dot_pos) {
+ if (request_p) {
+ *request_p = strdup(buf);
+ request_p = NULL;
+ }
+ if (mod_name)
+ glob_expand_module(mod_name, buf, &argv, &argc, &maxargs);
+ else
+ glob_expand(buf, &argv, &argc, &maxargs);
+ } else {
+ if (!(p = strdup(buf)))
+ out_of_memory("read_args");
+ argv[argc++] = p;
+ if (*p == '.' && p[1] == '\0')
+ dot_pos = argc;
+ }
+ }
+
+ *argc_p = argc;
+ *argv_p = argv;
+
+ return dot_pos ? dot_pos : argc;
}
int io_start_buffering_out(int f_out)
if (protocol_version < 29)
return; /* there's nothing we can do */
if (protocol_version >= 30)
- send_msg(MSG_NOOP, "", 0);
+ send_msg(MSG_NOOP, "", 0, 0);
else {
- write_int(sock_f_out, cur_flist->count);
+ write_int(sock_f_out, cur_flist->used);
write_shortint(sock_f_out, ITEM_IS_NEW);
}
}
case MSG_DELETED:
if (msg_bytes >= sizeof line)
goto overflow;
- read_loop(fd, line, msg_bytes);
+#ifdef ICONV_OPTION
+ if (ic_recv != (iconv_t)-1) {
+ ICONV_CONST char *ibuf;
+ char *obuf = line;
+ size_t icnt, ocnt = sizeof line - 1;
+ int add_null = 0;
+ iconv(ic_send, NULL, 0, NULL, 0);
+ while (msg_bytes) {
+ icnt = msg_bytes > sizeof iconv_buf
+ ? sizeof iconv_buf : msg_bytes;
+ read_loop(fd, iconv_buf, icnt);
+ if (!(msg_bytes -= icnt) && !iconv_buf[icnt-1])
+ icnt--, add_null = 1;
+ ibuf = (ICONV_CONST char *)iconv_buf;
+ if (iconv(ic_send, &ibuf,&icnt,
+ &obuf,&ocnt) == (size_t)-1)
+ goto overflow; // XXX
+ }
+ if (add_null)
+ *obuf++ = '\0';
+ msg_bytes = obuf - line;
+ } else
+#endif
+ read_loop(fd, line, msg_bytes);
/* A directory name was sent with the trailing null */
if (msg_bytes > 0 && !line[msg_bytes-1])
log_delete(line, S_IFDIR);
exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, line, msg_bytes);
- rwrite((enum logcode)tag, line, msg_bytes);
+ rwrite((enum logcode)tag, line, msg_bytes, 1);
break;
default:
rprintf(FERROR, "unexpected tag %d [%s]\n",
return (UVAL(b, 1) << 8) + UVAL(b, 0);
}
-int32 read_varint(int f)
-{
- int32 num;
- char b[5];
- int cnt;
- readfd(f, b, 1);
- cnt = int_byte_cnt[CVAL(b, 0) / 4];
- if (cnt > 1)
- readfd(f, b + 1, cnt - 1);
- switch (cnt) {
- case 1:
- num = NVAL1(b, 0);
- break;
- case 2:
- num = NVAL2(b, 0x80);
- break;
- case 3:
- num = NVAL3(b, 0xC0);
- break;
- case 4:
- num = NVAL4(b, 0xE0);
- break;
- case 5:
- num = NVAL4(b+1, 0);
- break;
- default:
- exit_cleanup(RERR_PROTOCOL); /* impossible... */
- }
- return num;
-}
-
int32 read_int(int f)
{
char b[4];
return num;
}
-int64 read_longint(int f)
+int32 read_varint(int f)
{
- int64 num;
- char b[9];
-
- if (protocol_version < 30) {
- num = read_int(f);
+ union {
+ char b[5];
+ int32 x;
+ } u;
+ uchar ch;
+ int extra;
+
+ 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] + 2;
+ 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)
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);
continue;
}
- if (FD_ISSET(fd, &e_fds)) {
- rsyserr(FINFO, errno,
- "select exception on fd %d", fd);
- }
+ /*if (FD_ISSET(fd, &e_fds))
+ rprintf(FINFO, "select exception on fd %d\n", fd); */
if (using_r_fds && FD_ISSET(msg_fd_in, &r_fds))
read_msg_fd();
(long)len, who_am_i());
/* If the other side is sending us error messages, try
* to grab any messages they sent before they died. */
- while (fd == sock_f_out && io_multiplexing_in) {
+ while (!am_server && fd == sock_f_out && io_multiplexing_in) {
set_io_timeout(30);
ignore_timeout = 0;
readfd_unbuffered(sock_f_in, io_filesfrom_buf,
}
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;
if (io_multiplexing_out)
- mplex_write(sock_f_out, MSG_DATA, iobuf_out, iobuf_out_cnt);
+ mplex_write(sock_f_out, MSG_DATA, iobuf_out, iobuf_out_cnt, 0);
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, 2);
}
+void write_int(int f, int32 x)
+{
+ char b[4];
+ SIVAL(b, 0, x);
+ writefd(f, b, 4);
+}
+
void write_varint(int f, int32 x)
{
char b[5];
- if ((uint32)x < ((uint32)1<<(1*8-1))) {
- b[0] = (char)x;
- writefd(f, b, 1);
- } else if ((uint32)x < ((uint32)1<<(2*8-2))) {
- b[0] = (char)(x >> 8) | 0x80;
- b[1] = (char)x;
- writefd(f, b, 2);
- } else if ((uint32)x < ((uint32)1<<(3*8-3))) {
- b[0] = (char)(x >> 16) | 0xC0;
- b[1] = (char)(x >> 8);
- b[2] = (char)x;
- writefd(f, b, 3);
- } else if ((uint32)x < ((uint32)1<<(4*8-4))) {
- b[0] = (char)(x >> 24) | 0xE0;
- b[1] = (char)(x >> 16);
- b[2] = (char)(x >> 8);
- b[3] = (char)x;
- writefd(f, b, 4);
- } else {
- b[0] = 0xF0;
- b[1] = (char)(x >> 24);
- b[2] = (char)(x >> 16);
- b[3] = (char)(x >> 8);
- b[4] = (char)x;
- writefd(f, b, 5);
- }
+ uchar bit;
+ int cnt = 4;
+
+ 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_int(int f, int32 x)
+void write_varlong(int f, int64 x, uchar min_bytes)
{
- char b[4];
- SIVAL(b, 0, x);
- writefd(f, b, 4);
+ 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
+
+ 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);
}
/*
*/
void write_longint(int f, int64 x)
{
- char b[12];
+ char b[12], * const s = b+4;
-#if SIZEOF_INT64 < 8
- if (x < 0 || x > 0x7FFFFFFF) {
- rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
- exit_cleanup(RERR_UNSUPPORTED);
+ SIVAL(s, 0, x);
+ if (x <= 0x7FFFFFFF && x >= 0) {
+ writefd(f, s, 4);
+ return;
}
-#endif
- if (protocol_version < 30) {
- char * const s = b+4;
- SIVAL(s, 0, x);
#if SIZEOF_INT64 < 8
- writefd(f, s, 4);
+ rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
+ exit_cleanup(RERR_UNSUPPORTED);
#else
- if (x <= 0x7FFFFFFF && x >= 0) {
- writefd(f, s, 4);
- 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);
- }
-#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;
return num;
}
-/**
- * Read a line of up to @p maxlen characters into @p buf (not counting
- * the trailing null). Strips the (required) trailing newline and all
- * carriage returns.
- *
- * @return 1 for success; 0 for I/O error or truncation.
- **/
-int read_line(int f, char *buf, size_t maxlen)
+/* Read a line of up to bufsiz-1 characters into buf. Strips
+ * the (required) trailing newline and all carriage returns.
+ * Returns 1 for success; 0 for I/O error or truncation. */
+int read_line_old(int f, char *buf, size_t bufsiz)
{
- while (maxlen) {
+ bufsiz--; /* leave room for the null */
+ while (bufsiz > 0) {
buf[0] = 0;
read_buf(f, buf, 1);
if (buf[0] == 0)
break;
if (buf[0] != '\r') {
buf++;
- maxlen--;
+ bufsiz--;
}
}
*buf = '\0';
- return maxlen > 0;
+ return bufsiz > 0;
}
void io_printf(int fd, const char *format, ...)
}
/** Write an message to the multiplexed data stream. */
-int io_multiplex_write(enum msgcode code, const char *buf, size_t len)
+int io_multiplex_write(enum msgcode code, const char *buf, size_t len, int convert)
{
if (!io_multiplexing_out)
return 0;
io_flush(NORMAL_FLUSH);
stats.total_written += (len+4);
- mplex_write(sock_f_out, code, buf, len);
+ mplex_write(sock_f_out, code, buf, len, convert);
return 1;
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff