X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/332cf6df7c32dbaa47cbfe515121da7bd53974e8..7a7810aa2f14476d319eee537ba69bfe21d3a926:/io.c diff --git a/io.c b/io.c index 1c858802..ce6495ad 100644 --- a/io.c +++ b/io.c @@ -4,11 +4,12 @@ * Copyright (C) 1996-2001 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2001, 2002 Martin Pool - * Copyright (C) 2003-2007 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 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 @@ -16,8 +17,7 @@ * 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 @@ -28,6 +28,8 @@ * io_start_multiplex_out() and io_start_multiplex_in(). */ #include "rsync.h" +#include "ifuncs.h" +#include "inums.h" /** If no timeout is specified then use a 60 second select timeout */ #define SELECT_TIMEOUT 60 @@ -35,7 +37,6 @@ extern int bwlimit; extern size_t bwlimit_writemax; extern int io_timeout; -extern int allowed_lull; extern int am_server; extern int am_daemon; extern int am_sender; @@ -44,20 +45,25 @@ extern int inc_recurse; extern int io_error; extern int eol_nulls; extern int flist_eof; +extern int file_total; +extern int file_old_total; +extern int list_only; extern int read_batch; -extern int csum_length; +extern int protect_args; extern int checksum_seed; extern int protocol_version; extern int remove_source_files; extern int preserve_hard_links; -extern char *filesfrom_host; +extern BOOL extra_flist_sending_enabled; extern struct stats stats; -extern struct file_list *cur_flist, *first_flist; +extern struct file_list *cur_flist; #ifdef ICONV_OPTION +extern int filesfrom_convert; extern iconv_t ic_send, ic_recv; #endif -const char phase_unknown[] = "unknown"; +int csum_length = SHORT_SUM_LENGTH; /* initial value */ +int allowed_lull = 0; int ignore_timeout = 0; int batch_fd = -1; int msgdone_cnt = 0; @@ -93,17 +99,16 @@ static int write_batch_monitor_out = -1; static int io_filesfrom_f_in = -1; static int io_filesfrom_f_out = -1; -static char io_filesfrom_buf[2048]; +static xbuf ff_buf = EMPTY_XBUF; +static char ff_lastchar; #ifdef ICONV_OPTION -static char iconv_buf[sizeof io_filesfrom_buf / 2]; +static xbuf iconv_buf = EMPTY_XBUF; #endif -static char *io_filesfrom_bp; -static char io_filesfrom_lastchar; -static int io_filesfrom_buflen; -static int defer_forwarding_messages = 0; +static int defer_forwarding_messages = 0, keep_defer_forwarding = 0; static int select_timeout = SELECT_TIMEOUT; static int active_filecnt = 0; static OFF_T active_bytecnt = 0; +static int first_message = 1; 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 */ @@ -112,23 +117,18 @@ static char int_byte_extra[64] = { 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 5, 6, /* (C0 - FF)/4 */ }; +#define REMOTE_OPTION_ERROR "rsync: on remote machine: -" +#define REMOTE_OPTION_ERROR2 ": unknown option" + +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); +static void read_a_msg(int fd); -struct flist_ndx_item { - struct flist_ndx_item *next; - int ndx; -}; - -struct flist_ndx_list { - struct flist_ndx_item *head, *tail; -}; - -static struct flist_ndx_list redo_list, hlink_list; +static flist_ndx_list redo_list, hlink_list; struct msg_list_item { struct msg_list_item *next; @@ -142,37 +142,44 @@ struct msg_list { static struct msg_list msg_queue; -static void flist_ndx_push(struct flist_ndx_list *lp, int ndx) -{ - struct flist_ndx_item *item; - - if (!(item = new(struct flist_ndx_item))) - out_of_memory("flist_ndx_push"); - item->next = NULL; - item->ndx = ndx; - if (lp->tail) - lp->tail->next = item; - else - lp->head = item; - lp->tail = item; -} - -static int flist_ndx_pop(struct flist_ndx_list *lp) +static void got_flist_entry_status(enum festatus status, const char *buf) { - struct flist_ndx_item *next; - int ndx; + int ndx = IVAL(buf, 0); + struct file_list *flist = flist_for_ndx(ndx, "got_flist_entry_status"); - if (!lp->head) - return -1; + if (remove_source_files) { + active_filecnt--; + active_bytecnt -= F_LENGTH(flist->files[ndx - flist->ndx_start]); + } - ndx = lp->head->ndx; - next = lp->head->next; - free(lp->head); - lp->head = next; - if (!next) - lp->tail = NULL; + if (inc_recurse) + flist->in_progress--; - return ndx; + 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); + flist->in_progress++; + } + } + break; + case FES_REDO: + if (read_batch) { + if (inc_recurse) + flist->in_progress++; + break; + } + if (inc_recurse) + flist->to_redo++; + flist_ndx_push(&redo_list, ndx); + break; + case FES_NO_SEND: + break; + } } static void check_timeout(void) @@ -254,155 +261,63 @@ static void msg_list_add(struct msg_list *lst, int code, const char *buf, int le lst->tail = m; } +static inline int flush_a_msg(int fd) +{ + 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(fd, tag, m->buf + 4, len, m->convert); + defer_forwarding_messages--; + + free(m); + + return len; +} + 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); - } + while (msg_queue.head && io_multiplexing_out) + stats.total_written += flush_a_msg(sock_f_out) + 4; } 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); - } + while (msg_queue.head) + (void)flush_a_msg(msg_fd_out); } } -/* 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 - * from the receiver). */ -static void read_msg_fd(void) +static void check_for_d_option_error(const char *msg) { - 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++; + static char rsync263_opts[] = "BCDHIKLPRSTWabceghlnopqrtuvxz"; + char *colon; + int saw_d = 0; - readfd(fd, buf, 4); - tag = IVAL(buf, 0); + if (*msg != 'r' + || strncmp(msg, REMOTE_OPTION_ERROR, sizeof REMOTE_OPTION_ERROR - 1) != 0) + return; - len = tag & 0xFFFFFF; - tag = (tag >> 24) - MPLEX_BASE; + msg += sizeof REMOTE_OPTION_ERROR - 1; + if (*msg == '-' || (colon = strchr(msg, ':')) == NULL + || strncmp(colon, REMOTE_OPTION_ERROR2, sizeof REMOTE_OPTION_ERROR2 - 1) != 0) + return; - switch (tag) { - case MSG_DONE: - 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); - } - if (len) { - readfd(fd, buf, len); - stats.total_read = read_varlong(fd, 3); - } - msgdone_cnt++; - break; - case MSG_REDO: - 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) - goto invalid_msg; - readfd(fd, 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, 0); - } - 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: - 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: - case MSG_LOG: - while (len) { - n = len; - if (n >= sizeof buf) - n = sizeof buf - 1; - readfd(fd, buf, n); - rwrite((enum logcode)tag, buf, n, !am_generator); - len -= n; - } - break; - default: - rprintf(FERROR, "unknown message %d:%d [%s]\n", - tag, len, who_am_i()); - exit_cleanup(RERR_STREAMIO); + for ( ; *msg != ':'; msg++) { + if (*msg == 'd') + saw_d = 1; + else if (*msg == 'e') + break; + else if (strchr(rsync263_opts, *msg) == NULL) + return; } - no_flush--; - msg_fd_in = fd; - if (!--defer_forwarding_messages) - msg_flush(); + if (saw_d) { + rprintf(FWARNING, + "*** Try using \"--old-d\" if remote rsync is <= 2.6.3 ***\n"); + } } /* This is used by the generator to limit how many file transfers can @@ -410,104 +325,65 @@ static void read_msg_fd(void) * this, sender-side deletions were mostly happening at the end. */ void increment_active_files(int ndx, int itemizing, enum logcode code) { - /* TODO: tune these limits? */ - while (active_filecnt >= (active_bytecnt >= 128*1024 ? 10 : 50)) { + while (1) { + /* TODO: tune these limits? */ + int limit = active_bytecnt >= 128*1024 ? 10 : 50; + if (active_filecnt < limit) + break; check_for_finished_files(itemizing, code, 0); + if (active_filecnt < limit) + break; if (iobuf_out_cnt) io_flush(NORMAL_FLUSH); else - read_msg_fd(); + read_a_msg(msg_fd_in); } active_filecnt++; 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, int convert) { char buffer[BIGPATHBUFLEN]; /* Oversized for use by iconv code. */ size_t n = len; - SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len); - #ifdef ICONV_OPTION - if (convert && ic_send == (iconv_t)-1) -#endif - convert = 0; + /* We need to convert buf before doing anything else so that we + * can include the (converted) byte length in the message header. */ + if (convert && ic_send != (iconv_t)-1) { + xbuf outbuf, inbuf; + + INIT_XBUF(outbuf, buffer + 4, 0, sizeof buffer - 4); + INIT_XBUF(inbuf, (char*)buf, len, (size_t)-1); + + iconvbufs(ic_send, &inbuf, &outbuf, + ICB_INCLUDE_BAD | ICB_INCLUDE_INCOMPLETE); + if (inbuf.len > 0) { + rprintf(FERROR, "overflowed conversion buffer in mplex_write"); + exit_cleanup(RERR_UNSUPPORTED); + } - if (convert || n > 1024 - 4) /* BIGPATHBUFLEN can handle 1024 bytes */ - n = 0; + n = len = outbuf.len; + } else +#endif + if (n > 1024 - 4) /* BIGPATHBUFLEN can handle 1024 bytes */ + n = 0; /* We'd rather do 2 writes than too much memcpy(). */ else memcpy(buffer + 4, buf, n); + SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len); + + keep_defer_forwarding++; /* defer_forwarding_messages++ on return */ writefd_unbuffered(fd, buffer, n+4); + keep_defer_forwarding--; - len -= n; - buf += n; + if (len > n) + writefd_unbuffered(fd, buf+n, len-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) - msg_flush(); - } + if (!--defer_forwarding_messages && !no_flush) + msg_flush(); } int send_msg(enum msgcode code, const char *buf, int len, int convert) @@ -520,7 +396,7 @@ int send_msg(enum msgcode code, const char *buf, int len, int convert) msg_list_add(&msg_queue, code, buf, len, convert); return 1; } - if (flist_forward_from >= 0) + if (defer_forwarding_messages) msg_list_add(&msg_queue, code, buf, len, convert); else mplex_write(msg_fd_out, code, buf, len, convert); @@ -536,10 +412,9 @@ void send_msg_int(enum msgcode code, int num) void wait_for_receiver(void) { - if (iobuf_out_cnt) - io_flush(NORMAL_FLUSH); - else - read_msg_fd(); + if (io_flush(FULL_FLUSH)) + return; + read_a_msg(msg_fd_in); } int get_redo_num(void) @@ -558,17 +433,19 @@ int get_hlink_num(void) * things at the same time: send the sender a list of what files we're * processing and read the incoming file+info list from the sender. We do * this by augmenting the read_timeout() function to copy this data. It - * uses the io_filesfrom_buf to read a block of data from f_in (when it is - * ready, since it might be a pipe) and then blast it out f_out (when it - * is ready to receive more data). + * uses ff_buf to read a block of data from f_in (when it is ready, since + * it might be a pipe) and then blast it out f_out (when it is ready to + * receive more data). */ void io_set_filesfrom_fds(int f_in, int f_out) { io_filesfrom_f_in = f_in; io_filesfrom_f_out = f_out; - io_filesfrom_bp = io_filesfrom_buf; - io_filesfrom_lastchar = '\0'; - io_filesfrom_buflen = 0; + alloc_xbuf(&ff_buf, 2048); +#ifdef ICONV_OPTION + if (protect_args) + alloc_xbuf(&iconv_buf, 1024); +#endif } /* It's almost always an error to get an EOF when we're trying to read from the @@ -595,14 +472,13 @@ static void whine_about_eof(int fd) } rprintf(FERROR, RSYNC_NAME ": connection unexpectedly closed " - "(%.0f bytes received so far) [%s]\n", - (double)stats.total_read, who_am_i()); + "(%s bytes received so far) [%s]\n", + big_num(stats.total_read), who_am_i()); exit_cleanup(RERR_STREAMIO); } -/** - * Read from a socket with I/O timeout. return the number of bytes +/* Read from a socket with I/O timeout. return the number of bytes * read. If no bytes can be read then exit, never return a number <= 0. * * TODO: If the remote shell connection fails, then current versions @@ -610,8 +486,7 @@ static void whine_about_eof(int fd) * fairly common mistake to try to use rsh when ssh is required, we * should trap that: if we fail to read any data at all, we should * give a better explanation. We can tell whether the connection has - * started by looking e.g. at whether the remote version is known yet. - */ + * started by looking e.g. at whether the remote version is known yet. */ static int read_timeout(int fd, char *buf, size_t len) { int n, cnt = 0; @@ -630,7 +505,7 @@ static int read_timeout(int fd, char *buf, size_t len) FD_SET(fd, &r_fds); if (io_filesfrom_f_out >= 0) { int new_fd; - if (io_filesfrom_buflen == 0) { + if (ff_buf.len == 0) { if (io_filesfrom_f_in >= 0) { FD_SET(io_filesfrom_f_in, &r_fds); new_fd = io_filesfrom_f_in; @@ -646,7 +521,16 @@ static int read_timeout(int fd, char *buf, size_t len) maxfd = new_fd; } - tv.tv_sec = select_timeout; + if (extra_flist_sending_enabled && !defer_forwarding_messages) { + if (file_total - file_old_total < MAX_FILECNT_LOOKAHEAD + && file_total - file_old_total >= MIN_FILECNT_LOOKAHEAD) + tv.tv_sec = 0; + else { + extra_flist_sending_enabled = False; + tv.tv_sec = select_timeout; + } + } else + tv.tv_sec = select_timeout; tv.tv_usec = 0; errno = 0; @@ -658,56 +542,75 @@ static int read_timeout(int fd, char *buf, size_t len) defer_forwarding_messages = 0; exit_cleanup(RERR_SOCKETIO); } - check_timeout(); + if (extra_flist_sending_enabled && !defer_forwarding_messages) { + extra_flist_sending_enabled = False; + send_extra_file_list(sock_f_out, -1); + extra_flist_sending_enabled = !flist_eof; + } else + check_timeout(); continue; } if (io_filesfrom_f_out >= 0) { - if (io_filesfrom_buflen) { + if (ff_buf.len) { if (FD_ISSET(io_filesfrom_f_out, &w_fds)) { int l = write(io_filesfrom_f_out, - io_filesfrom_bp, - io_filesfrom_buflen); + ff_buf.buf + ff_buf.pos, + ff_buf.len); if (l > 0) { - if (!(io_filesfrom_buflen -= l)) - io_filesfrom_bp = io_filesfrom_buf; + if (!(ff_buf.len -= l)) + ff_buf.pos = 0; else - io_filesfrom_bp += l; - } else { + ff_buf.pos += l; + } else if (errno != EINTR) { /* XXX should we complain? */ io_filesfrom_f_out = -1; } } } else if (io_filesfrom_f_in >= 0) { if (FD_ISSET(io_filesfrom_f_in, &r_fds)) { - int l = read(io_filesfrom_f_in, - io_filesfrom_buf, - sizeof io_filesfrom_buf); +#ifdef ICONV_OPTION + xbuf *ibuf = filesfrom_convert ? &iconv_buf : &ff_buf; +#else + xbuf *ibuf = &ff_buf; +#endif + int l = read(io_filesfrom_f_in, ibuf->buf, ibuf->size); 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 */ + memcpy(ff_buf.buf, "\0\0", 2); + ff_buf.len = ff_lastchar? 2 : 1; + ff_buf.pos = 0; + io_filesfrom_f_in = -1; + } } else { +#ifdef ICONV_OPTION + if (filesfrom_convert) { + iconv_buf.pos = 0; + iconv_buf.len = l; + iconvbufs(ic_send, &iconv_buf, &ff_buf, + ICB_EXPAND_OUT|ICB_INCLUDE_BAD|ICB_INCLUDE_INCOMPLETE); + l = ff_buf.len; + } +#endif if (!eol_nulls) { - char *s = io_filesfrom_buf + l; + char *s = ff_buf.buf + l; /* Transform CR and/or LF into '\0' */ - while (s-- > io_filesfrom_buf) { + while (s-- > ff_buf.buf) { if (*s == '\n' || *s == '\r') *s = '\0'; } } - if (!io_filesfrom_lastchar) { + if (!ff_lastchar) { /* Last buf ended with a '\0', so don't * let this buf start with one. */ - while (l && !*io_filesfrom_bp) - io_filesfrom_bp++, l--; + while (l && ff_buf.buf[ff_buf.pos] == '\0') + ff_buf.pos++, l--; } if (!l) - io_filesfrom_bp = io_filesfrom_buf; + ff_buf.pos = 0; else { - char *f = io_filesfrom_bp; + char *f = ff_buf.buf + ff_buf.pos; char *t = f; char *eob = f + l; /* Eliminate any multi-'\0' runs. */ @@ -717,9 +620,9 @@ static int read_timeout(int fd, char *buf, size_t len) f++, l--; } } - io_filesfrom_lastchar = f[-1]; + ff_lastchar = f[-1]; } - io_filesfrom_buflen = l; + ff_buf.len = l; } } } @@ -733,14 +636,14 @@ static int read_timeout(int fd, char *buf, size_t len) if (n <= 0) { if (n == 0) whine_about_eof(fd); /* Doesn't return. */ - if (errno == EINTR || errno == EWOULDBLOCK - || errno == EAGAIN) + if (errno == EINTR || errno == EWOULDBLOCK || errno == EAGAIN) continue; /* Don't write errors on a dead socket. */ if (fd == sock_f_in) { - io_end_multiplex_out(); - rsyserr(FSOCKERR, errno, "read error"); + if (am_sender) + io_multiplexing_out = 0; + rsyserr(FERROR_SOCKET, errno, "read error"); } else rsyserr(FERROR, errno, "read error"); exit_cleanup(RERR_STREAMIO); @@ -757,17 +660,24 @@ static int read_timeout(int fd, char *buf, size_t len) 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 flags) { - char ch, *s, *eob = fname + MAXPATHLEN - 1; + char ch, *s, *eob; int cnt; - int reading_remotely = filesfrom_host != NULL; - int nulls = eol_nulls || reading_remotely; + +#ifdef ICONV_OPTION + if (flags & RL_CONVERT && iconv_buf.size < bufsiz) + realloc_xbuf(&iconv_buf, bufsiz + 1024); +#endif start: - s = fname; +#ifdef ICONV_OPTION + s = flags & RL_CONVERT ? iconv_buf.buf : buf; +#else + s = buf; +#endif + eob = s + bufsiz - 1; while (1) { cnt = read(fd, &ch, 1); if (cnt < 0 && (errno == EWOULDBLOCK @@ -782,17 +692,15 @@ int read_filesfrom_line(int fd, char *fname) 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 (flags & RL_EOL_NULLS ? ch == '\0' : (ch == '\r' || ch == '\n')) { + /* Skip empty lines if dumping comments. */ + if (flags & RL_DUMP_COMMENTS && s == buf) continue; break; } @@ -801,11 +709,76 @@ int read_filesfrom_line(int fd, char *fname) } *s = '\0'; - /* Dump comments. */ - if (*fname == '#' || *fname == ';') + if (flags & RL_DUMP_COMMENTS && (*buf == '#' || *buf == ';')) goto start; - return s - fname; +#ifdef ICONV_OPTION + if (flags & RL_CONVERT) { + xbuf outbuf; + INIT_XBUF(outbuf, buf, 0, bufsiz); + iconv_buf.pos = 0; + iconv_buf.len = s - iconv_buf.buf; + iconvbufs(ic_recv, &iconv_buf, &outbuf, + ICB_INCLUDE_BAD | ICB_INCLUDE_INCOMPLETE); + outbuf.buf[outbuf.len] = '\0'; + return outbuf.len; + } +#endif + + return s - buf; +} + +void 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; + int rl_flags = (rl_nulls ? RL_EOL_NULLS : 0); + +#ifdef ICONV_OPTION + rl_flags |= (protect_args && ic_recv != (iconv_t)-1 ? RL_CONVERT : 0); +#endif + + if (!(argv = new_array(char *, maxargs))) + out_of_memory("read_args"); + if (mod_name && !protect_args) + argv[argc++] = "rsyncd"; + + while (1) { + if (read_line(f_in, buf, bufsiz, rl_flags) == 0) + break; + + if (argc == maxargs-1) { + 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; + } + } + argv[argc] = NULL; + + glob_expand(NULL, NULL, NULL, NULL); + + *argc_p = argc; + *argv_p = argv; } int io_start_buffering_out(int f_out) @@ -871,7 +844,7 @@ void maybe_send_keepalive(void) if (protocol_version >= 30) 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); } } @@ -893,10 +866,8 @@ void stop_flist_forward() io_flush(FULL_FLUSH); } -/** - * Continue trying to read len bytes - don't return until len has been - * read. - **/ +/* Continue trying to read len bytes until all have been read. + * Used to read raw bytes from a multiplexed source. */ static void read_loop(int fd, char *buf, size_t len) { while (len) { @@ -907,17 +878,209 @@ static void read_loop(int fd, char *buf, size_t len) } } -/** - * Read from the file descriptor handling multiplexing - return number - * of bytes read. - * - * Never returns <= 0. - */ -static int readfd_unbuffered(int fd, char *buf, size_t len) +/* Read a message from a multiplexed source. */ +static void read_a_msg(int fd) { - size_t msg_bytes; - int tag, cnt = 0; char line[BIGPATHBUFLEN]; + size_t msg_bytes; + int tag, flist_parent = -1, save_msg_fd_in = msg_fd_in; + + /* Temporarily disable msg_fd_in. This is needed to avoid looping back + * to this routine from writefd_unbuffered(). */ + msg_fd_in = -1; + + read_loop(fd, line, 4); + tag = IVAL(line, 0); + + msg_bytes = tag & 0xFFFFFF; + tag = (tag >> 24) - MPLEX_BASE; + + no_flush++; + + switch (tag) { + case MSG_DATA: + if (msg_bytes > iobuf_in_siz) { + if (!(iobuf_in = realloc_array(iobuf_in, char, msg_bytes))) + out_of_memory("read_a_msg"); + iobuf_in_siz = msg_bytes; + } + read_loop(fd, iobuf_in, msg_bytes); + iobuf_in_remaining = msg_bytes; + iobuf_in_ndx = 0; + break; + case MSG_DONE: + if (msg_bytes > 1 || !am_generator) + goto invalid_msg; + if (msg_bytes) { + read_loop(fd, line, 1); + stats.total_read = read_varlong(fd, 3); + } + msgdone_cnt++; + break; + case MSG_REDO: + if (msg_bytes != 4 || !am_generator) + goto invalid_msg; + read_loop(fd, line, 4); + got_flist_entry_status(FES_REDO, line); + break; + case MSG_FLIST: + if (msg_bytes != 4 || !am_generator || !inc_recurse) + goto invalid_msg; + read_loop(fd, line, 4); + /* Read extra file list from receiver. */ + if (DEBUG_GTE(FLIST, 2)) { + rprintf(FINFO, "[%s] receiving flist for dir %d\n", + who_am_i(), IVAL(line, 0)); + } + flist_parent = IVAL(line, 0); + break; + case MSG_FLIST_EOF: + if (msg_bytes != 0 || !am_generator || !inc_recurse) + goto invalid_msg; + flist_eof = 1; + break; + case MSG_IO_ERROR: + if (msg_bytes != 4 || am_sender) + goto invalid_msg; + read_loop(fd, line, 4); + io_error |= IVAL(line, 0); + if (!am_generator) + send_msg_int(MSG_IO_ERROR, IVAL(line, 0)); + break; + case MSG_NOOP: + if (am_sender) + maybe_send_keepalive(); + break; + case MSG_DEL_STATS: + if (msg_bytes) + goto invalid_msg; + read_del_stats(fd); + if (am_sender && am_server) + write_del_stats(sock_f_out); + break; + case MSG_DELETED: + if (msg_bytes >= sizeof line) + goto overflow; + if (am_generator) { + read_loop(fd, line, msg_bytes); + send_msg(MSG_DELETED, line, msg_bytes, 1); + break; + } +#ifdef ICONV_OPTION + if (ic_recv != (iconv_t)-1) { + xbuf outbuf, inbuf; + char ibuf[512]; + int add_null = 0; + + INIT_CONST_XBUF(outbuf, line); + INIT_XBUF(inbuf, ibuf, 0, (size_t)-1); + + while (msg_bytes) { + inbuf.len = msg_bytes > sizeof ibuf + ? sizeof ibuf : msg_bytes; + read_loop(fd, inbuf.buf, inbuf.len); + if (!(msg_bytes -= inbuf.len) + && !ibuf[inbuf.len-1]) + inbuf.len--, add_null = 1; + if (iconvbufs(ic_send, &inbuf, &outbuf, + ICB_INCLUDE_BAD | ICB_INCLUDE_INCOMPLETE) < 0) + goto overflow; + } + if (add_null) { + if (outbuf.len == outbuf.size) + goto overflow; + outbuf.buf[outbuf.len++] = '\0'; + } + msg_bytes = outbuf.len; + } 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); + else { + line[msg_bytes] = '\0'; + log_delete(line, S_IFREG); + } + break; + case MSG_SUCCESS: + if (msg_bytes != 4) { + invalid_msg: + rprintf(FERROR, "invalid multi-message %d:%lu [%s%s]\n", + tag, (unsigned long)msg_bytes, who_am_i(), + inc_recurse ? "/inc" : ""); + exit_cleanup(RERR_STREAMIO); + } + read_loop(fd, line, 4); + if (am_generator) + got_flist_entry_status(FES_SUCCESS, line); + else + successful_send(IVAL(line, 0)); + break; + case MSG_NO_SEND: + if (msg_bytes != 4) + goto invalid_msg; + read_loop(fd, line, 4); + if (am_generator) + got_flist_entry_status(FES_NO_SEND, line); + else + send_msg_int(MSG_NO_SEND, IVAL(line, 0)); + break; + case MSG_ERROR_SOCKET: + case MSG_ERROR_UTF8: + case MSG_CLIENT: + case MSG_LOG: + if (!am_generator) + goto invalid_msg; + if (tag == MSG_ERROR_SOCKET) + io_multiplexing_out = 0; + /* FALL THROUGH */ + case MSG_INFO: + case MSG_ERROR: + case MSG_ERROR_XFER: + case MSG_WARNING: + if (msg_bytes >= sizeof line) { + overflow: + rprintf(FERROR, + "multiplexing overflow %d:%lu [%s%s]\n", + tag, (unsigned long)msg_bytes, who_am_i(), + inc_recurse ? "/inc" : ""); + exit_cleanup(RERR_STREAMIO); + } + read_loop(fd, line, msg_bytes); + rwrite((enum logcode)tag, line, msg_bytes, !am_generator); + if (first_message) { + if (list_only && !am_sender && tag == 1) { + line[msg_bytes] = '\0'; + check_for_d_option_error(line); + } + first_message = 0; + } + break; + default: + rprintf(FERROR, "unexpected tag %d [%s%s]\n", + tag, who_am_i(), inc_recurse ? "/inc" : ""); + exit_cleanup(RERR_STREAMIO); + } + + msg_fd_in = save_msg_fd_in; + no_flush--; + + if (flist_parent >= 0) { + struct file_list *flist = recv_file_list(fd); + flist->parent_ndx = flist_parent; +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links) + match_hard_links(flist); +#endif + } +} + +/* Read from the file descriptor handling multiplexing and return the + * number of bytes read. Never returns <= 0. */ +static int readfd_unbuffered(int fd, char *buf, size_t len) +{ + int cnt = 0; if (!iobuf_in || fd != iobuf_f_in) return read_timeout(fd, buf, len); @@ -936,103 +1099,7 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) cnt = len; break; } - - read_loop(fd, line, 4); - tag = IVAL(line, 0); - - msg_bytes = tag & 0xFFFFFF; - tag = (tag >> 24) - MPLEX_BASE; - - switch (tag) { - case MSG_DATA: - if (msg_bytes > iobuf_in_siz) { - if (!(iobuf_in = realloc_array(iobuf_in, char, - msg_bytes))) - out_of_memory("readfd_unbuffered"); - iobuf_in_siz = msg_bytes; - } - read_loop(fd, iobuf_in, 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; -#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); - else { - line[msg_bytes] = '\0'; - log_delete(line, S_IFREG); - } - 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); - } - 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) { - overflow: - rprintf(FERROR, - "multiplexing overflow %d:%ld [%s]\n", - tag, (long)msg_bytes, who_am_i()); - exit_cleanup(RERR_STREAMIO); - } - read_loop(fd, line, msg_bytes); - rwrite((enum logcode)tag, line, msg_bytes, 1); - break; - default: - rprintf(FERROR, "unexpected tag %d [%s]\n", - tag, who_am_i()); - exit_cleanup(RERR_STREAMIO); - } + read_a_msg(fd); } if (iobuf_in_remaining == 0) @@ -1219,6 +1286,7 @@ int read_vstring(int f, char *buf, int bufsize) * called by both the sender and the receiver. */ void read_sum_head(int f, struct sum_struct *sum) { + int32 max_blength = protocol_version < 30 ? OLD_MAX_BLOCK_SIZE : MAX_BLOCK_SIZE; sum->count = read_int(f); if (sum->count < 0) { rprintf(FERROR, "Invalid checksum count %ld [%s]\n", @@ -1226,7 +1294,7 @@ void read_sum_head(int f, struct sum_struct *sum) exit_cleanup(RERR_PROTOCOL); } sum->blength = read_int(f); - if (sum->blength < 0 || sum->blength > MAX_BLOCK_SIZE) { + if (sum->blength < 0 || sum->blength > max_blength) { rprintf(FERROR, "Invalid block length %ld [%s]\n", (long)sum->blength, who_am_i()); exit_cleanup(RERR_PROTOCOL); @@ -1317,6 +1385,22 @@ static void sleep_for_bwlimit(int bytes_written) total_written = (sleep_usec - elapsed_usec) * bwlimit / (ONE_SEC/1024); } +static const char *what_fd_is(int fd) +{ + static char buf[20]; + + if (fd == sock_f_out) + return "socket"; + else if (fd == msg_fd_out) + return "message fd"; + else if (fd == batch_fd) + return "batch file"; + else { + snprintf(buf, sizeof buf, "fd %d", fd); + return buf; + } +} + /* Write len bytes to the file descriptor fd, looping as necessary to get * the job done and also (in certain circumstances) reading any data on * msg_fd_in to avoid deadlock. @@ -1341,7 +1425,7 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) FD_SET(fd, &e_fds); maxfd = fd; - if (msg_fd_in >= 0) { + if (msg_fd_in >= 0 && iobuf_in_remaining == 0) { FD_ZERO(&r_fds); FD_SET(msg_fd_in, &r_fds); if (msg_fd_in > maxfd) @@ -1364,13 +1448,11 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) 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(); + read_a_msg(msg_fd_in); if (!FD_ISSET(fd, &w_fds)) continue; @@ -1392,20 +1474,20 @@ 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) - io_end_multiplex_out(); + io_multiplexing_out = 0; /* 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()); + "writefd_unbuffered failed to write %ld bytes to %s [%s]", + (long)len, what_fd_is(fd), 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) { + char buf[1024]; set_io_timeout(30); ignore_timeout = 0; - readfd_unbuffered(sock_f_in, io_filesfrom_buf, - sizeof io_filesfrom_buf); + readfd_unbuffered(iobuf_f_in, buf, sizeof buf); } exit_cleanup(RERR_STREAMIO); } @@ -1421,23 +1503,34 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) } no_flush--; - if (!(defer_forwarding_messages -= defer_inc)) + if (keep_defer_forwarding) + defer_inc--; + if (!(defer_forwarding_messages -= defer_inc) && !no_flush) msg_flush(); } -void io_flush(int flush_it_all) +int io_flush(int flush_it_all) { - if (!iobuf_out_cnt || no_flush) - return; + int flushed_something = 0; - if (io_multiplexing_out) - 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 (no_flush) + return 0; - if (flush_it_all && !defer_forwarding_messages) + if (iobuf_out_cnt) { + if (io_multiplexing_out) + mplex_write(iobuf_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; + flushed_something = 1; + } + + if (flush_it_all && !defer_forwarding_messages && msg_queue.head) { msg_flush(); + flushed_something = 1; + } + + return flushed_something; } static void writefd(int fd, const char *buf, size_t len) @@ -1445,10 +1538,8 @@ static void writefd(int fd, const char *buf, size_t len) if (fd == sock_f_out) stats.total_written += len; - if (fd == write_batch_monitor_out) { - if ((size_t)write(batch_fd, buf, len) != len) - exit_cleanup(RERR_FILEIO); - } + if (fd == write_batch_monitor_out) + writefd_unbuffered(batch_fd, buf, len); if (!iobuf_out || fd != iobuf_f_out) { writefd_unbuffered(fd, buf, len); @@ -1680,16 +1771,13 @@ int32 read_ndx(int f) 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) @@ -1698,11 +1786,11 @@ int read_line(int f, char *buf, size_t maxlen) break; if (buf[0] != '\r') { buf++; - maxlen--; + bufsiz--; } } *buf = '\0'; - return maxlen > 0; + return bufsiz > 0; } void io_printf(int fd, const char *format, ...) @@ -1727,18 +1815,18 @@ void io_printf(int fd, const char *format, ...) } /** Setup for multiplexing a MSG_* stream with the data stream. */ -void io_start_multiplex_out(void) +void io_start_multiplex_out(int f) { io_flush(NORMAL_FLUSH); - io_start_buffering_out(sock_f_out); + io_start_buffering_out(f); io_multiplexing_out = 1; } /** Setup for multiplexing a MSG_* stream with the data stream. */ -void io_start_multiplex_in(void) +void io_start_multiplex_in(int f) { io_flush(NORMAL_FLUSH); - io_start_buffering_in(sock_f_in); + io_start_buffering_in(f); io_multiplexing_in = 1; } @@ -1749,7 +1837,7 @@ int io_multiplex_write(enum msgcode code, const char *buf, size_t len, int conve return 0; io_flush(NORMAL_FLUSH); stats.total_written += (len+4); - mplex_write(sock_f_out, code, buf, len, convert); + mplex_write(iobuf_f_out, code, buf, len, convert); return 1; } @@ -1774,6 +1862,8 @@ void start_write_batch(int fd) * actual communication so far depends on whether a daemon * is involved. */ write_int(batch_fd, protocol_version); + if (protocol_version >= 30) + write_byte(batch_fd, inc_recurse); write_int(batch_fd, checksum_seed); if (am_sender)