X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/482f48cca9055325330094991378561b603f988f..f31514adb780899d886df63edd79ac3d48363f2f:/io.c diff --git a/io.c b/io.c index 3821e54f..25574409 100644 --- a/io.c +++ b/io.c @@ -4,12 +4,11 @@ * Copyright (C) 1996-2001 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2001, 2002 Martin Pool - * Copyright (C) 2003, 2004, 2005, 2006 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 @@ -41,7 +40,10 @@ extern int am_server; extern int am_daemon; extern int am_sender; extern int am_generator; +extern int inc_recurse; +extern int io_error; extern int eol_nulls; +extern int flist_eof; extern int read_batch; extern int csum_length; extern int checksum_seed; @@ -50,12 +52,12 @@ extern int remove_source_files; extern int preserve_hard_links; extern char *filesfrom_host; extern struct stats stats; -extern struct file_list *the_file_list; +extern struct file_list *cur_flist, *first_flist; const char phase_unknown[] = "unknown"; int ignore_timeout = 0; int batch_fd = -1; -int batch_gen_fd = -1; +int msgdone_cnt = 0; /* Ignore an EOF error if non-zero. See whine_about_eof(). */ int kluge_around_eof = 0; @@ -65,6 +67,18 @@ int msg_fd_out = -1; int sock_f_in = -1; int sock_f_out = -1; +static int iobuf_f_in = -1; +static char *iobuf_in; +static size_t iobuf_in_siz; +static size_t iobuf_in_ndx; +static size_t iobuf_in_remaining; + +static int iobuf_f_out = -1; +static char *iobuf_out; +static int iobuf_out_cnt; + +int flist_forward_from = -1; + static int io_multiplexing_out; static int io_multiplexing_in; static time_t last_io_in; @@ -85,26 +99,18 @@ static int select_timeout = SELECT_TIMEOUT; static int active_filecnt = 0; static OFF_T active_bytecnt = 0; -static char int_byte_cnt[256] = { - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* 00 - 0F */ - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* 10 - 1F */ - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* 20 - 2F */ - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* 30 - 3F */ - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* 40 - 4F */ - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* 50 - 5F */ - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* 60 - 6F */ - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* 70 - 7F */ - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, /* 80 - 8F */ - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, /* 90 - 9F */ - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, /* A0 - AF */ - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, /* B0 - BF */ - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, /* C0 - CF */ - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, /* D0 - DF */ - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, /* E0 - EF */ - 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, /* F0 - FF */ +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 void read_loop(int fd, char *buf, size_t len); +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); struct flist_ndx_item { struct flist_ndx_item *next; @@ -127,7 +133,7 @@ struct msg_list { struct msg_list_item *head, *tail; }; -static struct msg_list msg2genr, msg2sndr; +static struct msg_list msg2sndr; static void flist_ndx_push(struct flist_ndx_list *lp, int ndx) { @@ -241,6 +247,20 @@ static void msg_list_add(struct msg_list *lst, int code, const char *buf, int le 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); + } +} + /* Read a message from the MSG_* fd and handle it. This is called either * during the early stages of being a local sender (up through the sending * of the file list) or when we're the generator (to fetch the messages @@ -249,14 +269,17 @@ static void read_msg_fd(void) { char buf[2048]; size_t n; + struct file_list *flist; int fd = msg_fd_in; int tag, len; /* Temporarily disable msg_fd_in. This is needed to avoid looping back * to this routine from writefd_unbuffered(). */ + no_flush++; msg_fd_in = -1; + defer_forwarding_messages++; - read_loop(fd, buf, 4); + readfd(fd, buf, 4); tag = IVAL(buf, 0); len = tag & 0xFFFFFF; @@ -264,49 +287,76 @@ static void read_msg_fd(void) switch (tag) { case MSG_DONE: - if (len != 0 || !am_generator) { - rprintf(FERROR, "invalid message %d:%d\n", tag, len); + if (len < 0 || len > 1 || !am_generator) { + invalid_msg: + rprintf(FERROR, "invalid message %d:%d [%s%s]\n", + tag, len, who_am_i(), + inc_recurse ? "/inc" : ""); exit_cleanup(RERR_STREAMIO); } - flist_ndx_push(&redo_list, -1); + if (len) { + readfd(fd, buf, len); + stats.total_read = read_longint(fd); + } + msgdone_cnt++; break; case MSG_REDO: - if (len != 4 || !am_generator) { - rprintf(FERROR, "invalid message %d:%d\n", tag, len); - exit_cleanup(RERR_STREAMIO); - } - read_loop(fd, buf, 4); + 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); + break; + case MSG_FLIST: + if (len != 4 || !am_generator || !inc_recurse) + goto invalid_msg; + readfd(fd, buf, 4); + /* Read extra file list from receiver. */ + assert(iobuf_in != NULL); + assert(iobuf_f_in == fd); + flist = recv_file_list(fd); + flist->parent_ndx = IVAL(buf,0); + break; + case MSG_FLIST_EOF: + if (len != 0 || !am_generator || !inc_recurse) + goto invalid_msg; + flist_eof = 1; break; case MSG_DELETED: - if (len >= (int)sizeof buf || !am_generator) { - rprintf(FERROR, "invalid message %d:%d\n", tag, len); - exit_cleanup(RERR_STREAMIO); - } - read_loop(fd, buf, len); + if (len >= (int)sizeof buf || !am_generator) + goto invalid_msg; + readfd(fd, buf, len); send_msg(MSG_DELETED, buf, len); break; case MSG_SUCCESS: - if (len != 4 || !am_generator) { - rprintf(FERROR, "invalid message %d:%d\n", tag, len); - exit_cleanup(RERR_STREAMIO); - } - read_loop(fd, buf, len); + 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); + 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); break; case MSG_SOCKERR: - if (!am_generator) { - rprintf(FERROR, "invalid message %d:%d\n", tag, len); - exit_cleanup(RERR_STREAMIO); - } - close_multiplexing_out(); + case MSG_CLIENT: + if (!am_generator) + goto invalid_msg; + if (tag == MSG_SOCKERR) + io_end_multiplex_out(); /* FALL THROUGH */ case MSG_INFO: case MSG_ERROR: @@ -315,7 +365,7 @@ static void read_msg_fd(void) n = len; if (n >= sizeof buf) n = sizeof buf - 1; - read_loop(fd, buf, n); + readfd(fd, buf, n); rwrite((enum logcode)tag, buf, n); len -= n; } @@ -326,7 +376,10 @@ static void read_msg_fd(void) exit_cleanup(RERR_STREAMIO); } + no_flush--; msg_fd_in = fd; + if (!--defer_forwarding_messages) + msg2sndr_flush(); } /* This is used by the generator to limit how many file transfers can @@ -336,58 +389,75 @@ void increment_active_files(int ndx, int itemizing, enum logcode code) { /* TODO: tune these limits? */ while (active_filecnt >= (active_bytecnt >= 128*1024 ? 10 : 50)) { - if (hlink_list.head) - check_for_finished_hlinks(itemizing, code); - read_msg_fd(); + check_for_finished_files(itemizing, code, 0); + if (iobuf_out_cnt) + io_flush(NORMAL_FLUSH); + else + read_msg_fd(); } active_filecnt++; - active_bytecnt += the_file_list->files[ndx]->length; + active_bytecnt += F_LENGTH(cur_flist->files[ndx - cur_flist->ndx_start]); } -void decrement_active_files(int ndx) +static void decrement_active_files(int ndx) { + struct file_list *flist = flist_for_ndx(ndx); + assert(flist != NULL); active_filecnt--; - active_bytecnt -= the_file_list->files[ndx]->length; + active_bytecnt -= F_LENGTH(flist->files[ndx - flist->ndx_start]); } -/* Try to push messages off the list onto the wire. If we leave with more - * to do, return 0. On error, return -1. If everything flushed, return 1. - * This is only active in the receiver. */ -static int msg2genr_flush(int flush_it_all) +static void decrement_flist_in_progress(int ndx, int redo) { - static int written = 0; - struct timeval tv; - fd_set fds; + struct file_list *flist = cur_flist ? cur_flist : first_flist; - if (msg_fd_out < 0) - return -1; - - while (msg2genr.head) { - struct msg_list_item *m = msg2genr.head; - int n = write(msg_fd_out, m->buf + written, m->len - written); - if (n < 0) { - if (errno == EINTR) - continue; - if (errno != EWOULDBLOCK && errno != EAGAIN) - return -1; - if (!flush_it_all) - return 0; - FD_ZERO(&fds); - FD_SET(msg_fd_out, &fds); - tv.tv_sec = select_timeout; - tv.tv_usec = 0; - if (!select(msg_fd_out+1, NULL, &fds, NULL, &tv)) - check_timeout(); - } else if ((written += n) == m->len) { - msg2genr.head = m->next; - if (!msg2genr.head) - msg2genr.tail = NULL; - free(m); - written = 0; + 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) +{ + char buffer[1024]; + size_t n = len; + + SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len); + + if (n > sizeof buffer - 4) + n = 0; + else + memcpy(buffer + 4, buf, n); + + writefd_unbuffered(fd, buffer, n+4); + + len -= n; + buf += n; + + if (len) { + defer_forwarding_messages++; + writefd_unbuffered(fd, buf, len); + if (!--defer_forwarding_messages) + msg2sndr_flush(); } - return 1; } int send_msg(enum msgcode code, const char *buf, int len) @@ -400,21 +470,27 @@ int send_msg(enum msgcode code, const char *buf, int len) msg_list_add(&msg2sndr, code, buf, len); return 1; } - msg_list_add(&msg2genr, code, buf, len); - msg2genr_flush(NORMAL_FLUSH); + mplex_write(msg_fd_out, code, buf, len); return 1; } -int get_redo_num(int itemizing, enum logcode code) +void send_msg_int(enum msgcode code, int num) { - while (1) { - if (hlink_list.head) - check_for_finished_hlinks(itemizing, code); - if (redo_list.head) - break; + char numbuf[4]; + SIVAL(numbuf, 0, num); + send_msg(code, numbuf, 4); +} + +void wait_for_receiver(void) +{ + if (iobuf_out_cnt) + io_flush(NORMAL_FLUSH); + else read_msg_fd(); - } +} +int get_redo_num(void) +{ return flist_ndx_pop(&redo_list); } @@ -487,7 +563,7 @@ static int read_timeout(int fd, char *buf, size_t len) { int n, cnt = 0; - io_flush(NORMAL_FLUSH); + io_flush(FULL_FLUSH); while (cnt == 0) { /* until we manage to read *something* */ @@ -499,11 +575,6 @@ static int read_timeout(int fd, char *buf, size_t len) FD_ZERO(&r_fds); FD_ZERO(&w_fds); FD_SET(fd, &r_fds); - if (msg2genr.head) { - FD_SET(msg_fd_out, &w_fds); - if (msg_fd_out > maxfd) - maxfd = msg_fd_out; - } if (io_filesfrom_f_out >= 0) { int new_fd; if (io_filesfrom_buflen == 0) { @@ -530,15 +601,14 @@ static int read_timeout(int fd, char *buf, size_t len) count = select(maxfd + 1, &r_fds, &w_fds, NULL, &tv); if (count <= 0) { - if (errno == EBADF) + if (errno == EBADF) { + defer_forwarding_messages = 0; exit_cleanup(RERR_SOCKETIO); + } check_timeout(); continue; } - if (msg2genr.head && FD_ISSET(msg_fd_out, &w_fds)) - msg2genr_flush(NORMAL_FLUSH); - if (io_filesfrom_f_out >= 0) { if (io_filesfrom_buflen) { if (FD_ISSET(io_filesfrom_f_out, &w_fds)) { @@ -616,7 +686,7 @@ static int read_timeout(int fd, char *buf, size_t len) /* Don't write errors on a dead socket. */ if (fd == sock_f_in) { - close_multiplexing_out(); + io_end_multiplex_out(); rsyserr(FSOCKERR, errno, "read error"); } else rsyserr(FERROR, errno, "read error"); @@ -687,42 +757,57 @@ int read_filesfrom_line(int fd, char *fname) return s - fname; } -static char *iobuf_out; -static int iobuf_out_cnt; - -void io_start_buffering_out(void) +int io_start_buffering_out(int f_out) { - if (iobuf_out) - return; + if (iobuf_out) { + assert(f_out == iobuf_f_out); + return 0; + } if (!(iobuf_out = new_array(char, IO_BUFFER_SIZE))) out_of_memory("io_start_buffering_out"); iobuf_out_cnt = 0; + iobuf_f_out = f_out; + return 1; } -static char *iobuf_in; -static size_t iobuf_in_siz; - -void io_start_buffering_in(void) +int io_start_buffering_in(int f_in) { - if (iobuf_in) - return; + if (iobuf_in) { + assert(f_in == iobuf_f_in); + return 0; + } iobuf_in_siz = 2 * IO_BUFFER_SIZE; if (!(iobuf_in = new_array(char, iobuf_in_siz))) out_of_memory("io_start_buffering_in"); + iobuf_f_in = f_in; + return 1; } -void io_end_buffering(void) +void io_end_buffering_in(void) { - io_flush(NORMAL_FLUSH); - if (!io_multiplexing_out) { - free(iobuf_out); - iobuf_out = NULL; - } + if (!iobuf_in) + return; + free(iobuf_in); + iobuf_in = NULL; + iobuf_in_ndx = 0; + iobuf_in_remaining = 0; + iobuf_f_in = -1; } -void maybe_flush_socket(void) +void io_end_buffering_out(void) { - if (iobuf_out && iobuf_out_cnt && time(NULL) - last_io_out >= 5) + if (!iobuf_out) + return; + io_flush(FULL_FLUSH); + free(iobuf_out); + iobuf_out = NULL; + iobuf_f_out = -1; +} + +void maybe_flush_socket(int important) +{ + if (iobuf_out && iobuf_out_cnt + && (important || time(NULL) - last_io_out >= 5)) io_flush(NORMAL_FLUSH); } @@ -732,14 +817,31 @@ void maybe_send_keepalive(void) if (!iobuf_out || !iobuf_out_cnt) { if (protocol_version < 29) return; /* there's nothing we can do */ - write_int(sock_f_out, the_file_list->count); - write_shortint(sock_f_out, ITEM_IS_NEW); + if (protocol_version >= 30) + send_msg(MSG_NOOP, "", 0); + else { + write_int(sock_f_out, cur_flist->count); + write_shortint(sock_f_out, ITEM_IS_NEW); + } } if (iobuf_out) io_flush(NORMAL_FLUSH); } } +void start_flist_forward(int f_in) +{ + assert(iobuf_out != NULL); + assert(iobuf_f_out == msg_fd_out); + flist_forward_from = f_in; +} + +void stop_flist_forward() +{ + flist_forward_from = -1; + io_flush(FULL_FLUSH); +} + /** * Continue trying to read len bytes - don't return until len has been * read. @@ -762,26 +864,24 @@ static void read_loop(int fd, char *buf, size_t len) */ static int readfd_unbuffered(int fd, char *buf, size_t len) { - static size_t remaining; - static size_t iobuf_in_ndx; size_t msg_bytes; int tag, cnt = 0; char line[BIGPATHBUFLEN]; - if (!iobuf_in || fd != sock_f_in) + if (!iobuf_in || fd != iobuf_f_in) return read_timeout(fd, buf, len); - if (!io_multiplexing_in && remaining == 0) { - remaining = read_timeout(fd, iobuf_in, iobuf_in_siz); + if (!io_multiplexing_in && iobuf_in_remaining == 0) { + iobuf_in_remaining = read_timeout(fd, iobuf_in, iobuf_in_siz); iobuf_in_ndx = 0; } while (cnt == 0) { - if (remaining) { - len = MIN(len, remaining); + if (iobuf_in_remaining) { + len = MIN(len, iobuf_in_remaining); memcpy(buf, iobuf_in + iobuf_in_ndx, len); iobuf_in_ndx += len; - remaining -= len; + iobuf_in_remaining -= len; cnt = len; break; } @@ -801,9 +901,19 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) iobuf_in_siz = msg_bytes; } read_loop(fd, iobuf_in, msg_bytes); - remaining = msg_bytes; + iobuf_in_remaining = msg_bytes; iobuf_in_ndx = 0; break; + case MSG_NOOP: + if (am_sender) + maybe_send_keepalive(); + break; + case MSG_IO_ERROR: + if (msg_bytes != 4) + goto invalid_msg; + read_loop(fd, line, msg_bytes); + io_error |= IVAL(line, 0); + break; case MSG_DELETED: if (msg_bytes >= sizeof line) goto overflow; @@ -818,6 +928,7 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) break; case MSG_SUCCESS: if (msg_bytes != 4) { + invalid_msg: rprintf(FERROR, "invalid multi-message %d:%ld [%s]\n", tag, (long)msg_bytes, who_am_i()); exit_cleanup(RERR_STREAMIO); @@ -825,6 +936,12 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) read_loop(fd, line, msg_bytes); successful_send(IVAL(line, 0)); break; + case MSG_NO_SEND: + if (msg_bytes != 4) + goto invalid_msg; + read_loop(fd, line, msg_bytes); + send_msg_int(MSG_NO_SEND, IVAL(line, 0)); + break; case MSG_INFO: case MSG_ERROR: if (msg_bytes >= sizeof line) { @@ -844,17 +961,14 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) } } - if (remaining == 0) + if (iobuf_in_remaining == 0) io_flush(NORMAL_FLUSH); return cnt; } -/** - * Do a buffered read from @p fd. Don't return until all @p n bytes - * have been read. If all @p n can't be read then exit with an - * error. - **/ +/* Do a buffered read from fd. Don't return until all N bytes have + * been read. If all N can't be read then exit with an error. */ static void readfd(int fd, char *buffer, size_t N) { int cnt; @@ -870,17 +984,51 @@ static void readfd(int fd, char *buffer, size_t N) exit_cleanup(RERR_FILEIO); } + if (fd == flist_forward_from) + writefd(iobuf_f_out, buffer, total); + if (fd == sock_f_in) stats.total_read += total; } -int read_shortint(int f) +unsigned short read_shortint(int f) { char b[2]; readfd(f, b, 2); 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]; @@ -916,7 +1064,13 @@ int64 read_longint(int f) } else { int cnt; readfd(f, b, 3); - cnt = int_byte_cnt[CVAL(b, 0)]; + cnt = int_byte_cnt[CVAL(b, 0) / 4] + 2; +#if SIZEOF_INT64 < 8 + if (cnt > 5 || (cnt == 5 && (CVAL(b,0)&0x3F || CVAL(b,1)&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) { @@ -929,6 +1083,7 @@ int64 read_longint(int f) case 5: num = NVAL5(b, 0xC0); break; +#if SIZEOF_INT64 >= 8 case 6: num = NVAL6(b, 0xE0); break; @@ -941,8 +1096,9 @@ int64 read_longint(int f) case 9: num = NVAL8(b+1, 0); break; +#endif default: - exit_cleanup(RERR_PROTOCOL); // XXX impossible + exit_cleanup(RERR_PROTOCOL); /* impossible... */ } } @@ -1003,7 +1159,7 @@ void read_sum_head(int f, struct sum_struct *sum) 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); @@ -1102,7 +1258,8 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) int defer_save = defer_forwarding_messages; struct timeval tv; - no_flush++; + if (no_flush++) + defer_forwarding_messages = 1; while (total < len) { FD_ZERO(&w_fds); @@ -1162,7 +1319,10 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) /* Don't try to write errors back across the stream. */ if (fd == sock_f_out) - close_multiplexing_out(); + io_end_multiplex_out(); + /* Don't try to write errors down a failing msg pipe. */ + if (am_server && fd == msg_fd_out) + exit_cleanup(RERR_STREAMIO); rsyserr(FERROR, errno, "writefd_unbuffered failed to write %ld bytes [%s]", (long)len, who_am_i()); @@ -1187,78 +1347,28 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) } } - defer_forwarding_messages = defer_save; no_flush--; -} - -static void msg2sndr_flush(void) -{ - if (defer_forwarding_messages) - return; - - 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); - } -} - -/** - * Write an message to a multiplexed stream. If this fails then rsync - * exits. - **/ -static void mplex_write(enum msgcode code, const char *buf, size_t len) -{ - char buffer[1024]; - size_t n = len; - - SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len); - - if (n > sizeof buffer - 4) - n = 0; - else - memcpy(buffer + 4, buf, n); - - writefd_unbuffered(sock_f_out, buffer, n+4); - - len -= n; - buf += n; - - if (len) { - defer_forwarding_messages = 1; - writefd_unbuffered(sock_f_out, buf, len); - defer_forwarding_messages = 0; + if (!(defer_forwarding_messages = defer_save)) msg2sndr_flush(); - } } void io_flush(int flush_it_all) { - msg2genr_flush(flush_it_all); - msg2sndr_flush(); + if (flush_it_all && !defer_forwarding_messages) + msg2sndr_flush(); if (!iobuf_out_cnt || no_flush) return; if (io_multiplexing_out) - mplex_write(MSG_DATA, iobuf_out, iobuf_out_cnt); + mplex_write(sock_f_out, MSG_DATA, iobuf_out, iobuf_out_cnt); else - writefd_unbuffered(sock_f_out, iobuf_out, iobuf_out_cnt); + writefd_unbuffered(iobuf_f_out, iobuf_out, iobuf_out_cnt); iobuf_out_cnt = 0; } static void writefd(int fd, const char *buf, size_t len) { - if (fd == msg_fd_out) { - rprintf(FERROR, "Internal error: wrong write used in receiver.\n"); - exit_cleanup(RERR_PROTOCOL); - } - if (fd == sock_f_out) stats.total_written += len; @@ -1267,7 +1377,7 @@ static void writefd(int fd, const char *buf, size_t len) exit_cleanup(RERR_FILEIO); } - if (!iobuf_out || fd != sock_f_out) { + if (!iobuf_out || fd != iobuf_f_out) { writefd_unbuffered(fd, buf, len); return; } @@ -1286,12 +1396,43 @@ static void writefd(int fd, const char *buf, size_t len) } } -void write_shortint(int f, int x) +void write_shortint(int f, unsigned short x) { - uchar b[2]; - b[0] = x; - b[1] = x >> 8; - writefd(f, (char *)b, 2); + char b[2]; + b[0] = (char)x; + b[1] = (char)(x >> 8); + writefd(f, b, 2); +} + +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); + } } void write_int(int f, int32 x) @@ -1334,65 +1475,74 @@ void write_longint(int f, int64 x) goto all_bits; #endif } else if (x < ((int32)1<<(3*8-1))) { - b[0] = (x >> 16); - b[1] = x >> 8; - b[2] = x; + 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] = (x >> 24) | 0x80; - b[1] = x >> 16; - b[2] = x >> 8; - b[3] = x; + 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] = (x >> 32) | 0xC0; - b[1] = x >> 24; - b[2] = x >> 16; - b[3] = x >> 8; - b[4] = x; + 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); -#if SIZEOF_INT64 >= 8 } else if (x < ((int64)1<<(6*8-4))) { - b[0] = (x >> 40) | 0xE0; - b[1] = x >> 32; - b[2] = x >> 24; - b[3] = x >> 16; - b[4] = x >> 8; - b[5] = x; + 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] = (x >> 48) | 0xF0; - b[1] = x >> 40; - b[2] = x >> 32; - b[3] = x >> 24; - b[4] = x >> 16; - b[5] = x >> 8; - b[6] = x; + 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] = (x >> 56) | 0xF8; - b[1] = x >> 48; - b[2] = x >> 40; - b[3] = x >> 32; - b[4] = x >> 24; - b[5] = x >> 16; - b[6] = x >> 8; - b[7] = x; + 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] = 0xFC; - b[1] = x >> 56; - b[2] = x >> 48; - b[3] = x >> 40; - b[4] = x >> 32; - b[5] = x >> 24; - b[6] = x >> 16; - b[7] = x >> 8; - b[8] = x; + 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); -#endif } +#endif } void write_buf(int f, const char *buf, size_t len) @@ -1431,6 +1581,86 @@ void write_vstring(int f, const char *str, int len) writefd(f, str, len); } +/* Send a file-list index using a byte-reduction method. */ +void write_ndx(int f, int32 ndx) +{ + static int32 prev_positive = -1, prev_negative = 1; + int32 diff, cnt = 0; + char b[6]; + + if (protocol_version < 30 || read_batch) { + write_int(f, ndx); + return; + } + + /* Send NDX_DONE as a single-byte 0 with no side effects. Send + * negative nums as a positive after sending a leading 0xFF. */ + if (ndx >= 0) { + diff = ndx - prev_positive; + prev_positive = ndx; + } else if (ndx == NDX_DONE) { + *b = 0; + writefd(f, b, 1); + return; + } else { + b[cnt++] = (char)0xFF; + ndx = -ndx; + diff = ndx - prev_negative; + prev_negative = ndx; + } + + /* A diff of 1 - 253 is sent as a one-byte diff; a diff of 254 - 32767 + * or 0 is sent as a 0xFE + a two-byte diff; otherwise we send 0xFE + * & all 4 bytes of the (non-negative) num with the high-bit set. */ + if (diff < 0xFE && diff > 0) + b[cnt++] = (char)diff; + 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; + } else { + b[cnt++] = (char)0xFE; + b[cnt++] = (char)(diff >> 8); + b[cnt++] = (char)diff; + } + writefd(f, b, cnt); +} + +/* Receive a file-list index using a byte-reduction method. */ +int32 read_ndx(int f) +{ + static int32 prev_positive = -1, prev_negative = 1; + int32 *prev_ptr, num; + char b[4]; + + if (protocol_version < 30) + return read_int(f); + + readfd(f, b, 1); + if (CVAL(b, 0) == 0xFF) { + readfd(f, b, 1); + prev_ptr = &prev_negative; + } else if (CVAL(b, 0) == 0) + return NDX_DONE; + else + prev_ptr = &prev_positive; + if (CVAL(b, 0) == 0xFE) { + readfd(f, b, 2); + if (CVAL(b, 0) & 0x80) { + readfd(f, b+2, 2); + num = NVAL4(b, 0x80); + } else + num = NVAL2(b, 0) + *prev_ptr; + } else + num = CVAL(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 @@ -1481,7 +1711,7 @@ void io_printf(int fd, const char *format, ...) void io_start_multiplex_out(void) { io_flush(NORMAL_FLUSH); - io_start_buffering_out(); + io_start_buffering_out(sock_f_out); io_multiplexing_out = 1; } @@ -1489,7 +1719,7 @@ void io_start_multiplex_out(void) void io_start_multiplex_in(void) { io_flush(NORMAL_FLUSH); - io_start_buffering_in(); + io_start_buffering_in(sock_f_in); io_multiplexing_in = 1; } @@ -1498,28 +1728,27 @@ int io_multiplex_write(enum msgcode code, const char *buf, size_t len) { if (!io_multiplexing_out) return 0; - io_flush(NORMAL_FLUSH); stats.total_written += (len+4); - mplex_write(code, buf, len); + mplex_write(sock_f_out, code, buf, len); return 1; } -void close_multiplexing_in(void) +void io_end_multiplex_in(void) { io_multiplexing_in = 0; + io_end_buffering_in(); } /** Stop output multiplexing. */ -void close_multiplexing_out(void) +void io_end_multiplex_out(void) { io_multiplexing_out = 0; + io_end_buffering_out(); } void start_write_batch(int fd) { - write_stream_flags(batch_fd); - /* Some communication has already taken place, but we don't * enable batch writing until here so that we can write a * canonical record of the communication even though the