-/* -*- c-file-style: "linux" -*-
+/*
+ * Socket and pipe I/O utilities used in rsync.
*
- * Copyright (C) 1996-2001 by Andrew Tridgell
- * Copyright (C) Paul Mackerras 1996
- * Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
+ * Copyright (C) 1996-2001 Andrew Tridgell
+ * Copyright (C) 1996 Paul Mackerras
+ * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2003, 2004, 2005, 2006 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
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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.
*/
-/**
- * @file io.c
- *
- * Socket and pipe I/O utilities used in rsync.
- *
- * rsync provides its own multiplexing system, which is used to send
- * stderr and stdout over a single socket. We need this because
- * stdout normally carries the binary data stream, and stderr all our
- * error messages.
+/* Rsync provides its own multiplexing system, which is used to send
+ * stderr and stdout over a single socket.
*
* For historical reasons this is off during the start of the
* connection, but it's switched on quite early using
- * io_start_multiplex_out() and io_start_multiplex_in().
- **/
+ * io_start_multiplex_out() and io_start_multiplex_in(). */
#include "rsync.h"
extern int bwlimit;
extern size_t bwlimit_writemax;
-extern int verbose;
extern int io_timeout;
extern int allowed_lull;
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;
extern int protocol_version;
-extern int remove_sent_files;
+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;
-
-/**
- * The connection might be dropped at some point; perhaps because the
- * remote instance crashed. Just giving the offset on the stream is
- * not very helpful. So instead we try to make io_phase_name point to
- * something useful.
- *
- * For buffered/multiplexed I/O these names will be somewhat
- * approximate; perhaps for ease of support we would rather make the
- * buffer always flush when a single application-level I/O finishes.
- *
- * @todo Perhaps we want some simple stack functionality, but there's
- * no need to overdo it.
- **/
-const char *io_write_phase = phase_unknown;
-const char *io_read_phase = phase_unknown;
+int msgdone_cnt = 0;
/* Ignore an EOF error if non-zero. See whine_about_eof(). */
int kluge_around_eof = 0;
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;
static char *io_filesfrom_bp;
static char io_filesfrom_lastchar;
static int io_filesfrom_buflen;
-static size_t contiguous_write_len = 0;
+static int defer_forwarding_messages = 0;
static int select_timeout = SELECT_TIMEOUT;
+static int active_filecnt = 0;
+static OFF_T active_bytecnt = 0;
+
+static char int_byte_cnt[64] = {
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* (00 - 3F)/4 */
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* (40 - 7F)/4 */
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, /* (80 - BF)/4 */
+ 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 8, 9, /* (C0 - FF)/4 */
+};
-static 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;
struct msg_list_item {
struct msg_list_item *next;
- char *buf;
int len;
+ char buf[1];
};
struct msg_list {
struct msg_list_item *head, *tail;
};
-static struct msg_list msg_list;
+static struct msg_list msg2sndr;
static void flist_ndx_push(struct flist_ndx_list *lp, int ndx)
{
}
/* Add a message to the pending MSG_* list. */
-static void msg_list_add(int code, char *buf, int len)
+static void msg_list_add(struct msg_list *lst, int code, const char *buf, int len)
{
- struct msg_list_item *ml;
+ struct msg_list_item *m;
+ int sz = len + 4 + sizeof m[0] - 1;
- if (!(ml = new(struct msg_list_item)))
+ if (!(m = (struct msg_list_item *)new_array(char, sz)))
out_of_memory("msg_list_add");
- ml->next = NULL;
- if (!(ml->buf = new_array(char, len+4)))
- out_of_memory("msg_list_add");
- SIVAL(ml->buf, 0, ((code+MPLEX_BASE)<<24) | len);
- memcpy(ml->buf+4, buf, len);
- ml->len = len+4;
- if (msg_list.tail)
- msg_list.tail->next = ml;
+ m->next = NULL;
+ m->len = len + 4;
+ SIVAL(m->buf, 0, ((code+MPLEX_BASE)<<24) | len);
+ memcpy(m->buf + 4, buf, len);
+ if (lst->tail)
+ lst->tail->next = m;
else
- msg_list.head = ml;
- msg_list.tail = ml;
+ lst->head = m;
+ 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
{
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;
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);
- io_multiplex_write(MSG_DELETED, 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);
+ 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);
}
- read_loop(fd, buf, len);
- if (remove_sent_files)
- io_multiplex_write(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:
+ 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:
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;
}
break;
default:
- rprintf(FERROR, "unknown message %d:%d\n", tag, len);
+ rprintf(FERROR, "unknown message %d:%d [%s]\n",
+ tag, len, who_am_i());
exit_cleanup(RERR_STREAMIO);
}
+ no_flush--;
msg_fd_in = fd;
+ if (!--defer_forwarding_messages)
+ msg2sndr_flush();
}
-/* 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 msg_list_flush(int flush_it_all)
+/* This is used by the generator to limit how many file transfers can
+ * be active at once when --remove-source-files is specified. Without
+ * this, sender-side deletions were mostly happening at the end. */
+void increment_active_files(int ndx, int itemizing, enum logcode code)
{
- static int written = 0;
- struct timeval tv;
- fd_set fds;
+ /* TODO: tune these limits? */
+ while (active_filecnt >= (active_bytecnt >= 128*1024 ? 10 : 50)) {
+ check_for_finished_files(itemizing, code, 0);
+ if (iobuf_out_cnt)
+ io_flush(NORMAL_FLUSH);
+ else
+ read_msg_fd();
+ }
- if (msg_fd_out < 0)
- return -1;
+ active_filecnt++;
+ active_bytecnt += F_LENGTH(cur_flist->files[ndx]);
+}
- while (msg_list.head) {
- struct msg_list_item *ml = msg_list.head;
- int n = write(msg_fd_out, ml->buf + written, ml->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) == ml->len) {
- free(ml->buf);
- msg_list.head = ml->next;
- if (!msg_list.head)
- msg_list.tail = NULL;
- free(ml);
- written = 0;
+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)
+{
+ 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;
}
-void send_msg(enum msgcode code, char *buf, int len)
+int send_msg(enum msgcode code, const char *buf, int len)
{
if (msg_fd_out < 0) {
- io_multiplex_write(code, buf, len);
- return;
+ if (!defer_forwarding_messages)
+ return io_multiplex_write(code, buf, len);
+ if (!io_multiplexing_out)
+ return 0;
+ msg_list_add(&msg2sndr, code, buf, len);
+ return 1;
}
- msg_list_add(code, buf, len);
- msg_list_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);
}
{
int n, cnt = 0;
- io_flush(NORMAL_FLUSH);
+ io_flush(FULL_FLUSH);
while (cnt == 0) {
/* until we manage to read *something* */
FD_ZERO(&r_fds);
FD_ZERO(&w_fds);
FD_SET(fd, &r_fds);
- if (msg_list.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) {
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 (msg_list.head && FD_ISSET(msg_fd_out, &w_fds))
- msg_list_flush(NORMAL_FLUSH);
-
if (io_filesfrom_f_out >= 0) {
if (io_filesfrom_buflen) {
if (FD_ISSET(io_filesfrom_f_out, &w_fds)) {
continue;
/* Don't write errors on a dead socket. */
- if (fd == sock_f_in)
- close_multiplexing_out();
- rsyserr(FERROR, errno, "read error");
+ if (fd == sock_f_in) {
+ io_end_multiplex_out();
+ rsyserr(FSOCKERR, errno, "read error");
+ } else
+ rsyserr(FERROR, errno, "read error");
exit_cleanup(RERR_STREAMIO);
}
if (cnt < 0 && (errno == EWOULDBLOCK
|| errno == EINTR || errno == EAGAIN)) {
struct timeval tv;
- fd_set fds;
- FD_ZERO(&fds);
- FD_SET(fd, &fds);
+ fd_set r_fds, e_fds;
+ FD_ZERO(&r_fds);
+ FD_SET(fd, &r_fds);
+ FD_ZERO(&e_fds);
+ FD_SET(fd, &e_fds);
tv.tv_sec = select_timeout;
tv.tv_usec = 0;
- if (!select(fd+1, &fds, NULL, NULL, &tv))
+ 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);
+ }
continue;
}
if (cnt != 1)
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 io_end_buffering_out(void)
+{
+ if (!iobuf_out)
+ return;
+ io_flush(FULL_FLUSH);
+ free(iobuf_out);
+ iobuf_out = NULL;
+ iobuf_f_out = -1;
}
void maybe_flush_socket(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.
*/
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;
}
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;
read_loop(fd, line, msg_bytes);
- line[msg_bytes] = '\0';
/* A directory name was sent with the trailing null */
if (msg_bytes > 0 && !line[msg_bytes-1])
log_delete(line, S_IFDIR);
- else
+ 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) {
}
}
- 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;
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)
{
- uchar b[2];
- readfd(f, (char *)b, 2);
- return (b[1] << 8) + b[0];
+ char b[2];
+ readfd(f, b, 2);
+ return (UVAL(b, 1) << 8) + UVAL(b, 0);
}
int32 read_int(int f)
char b[4];
int32 num;
- readfd(f,b,4);
- num = IVAL(b,0);
- if (num == (int32)0xffffffff)
- return -1;
+ readfd(f, b, 4);
+ num = IVAL(b, 0);
+#if SIZEOF_INT32 > 4
+ if (num & (int32)0x80000000)
+ num |= ~(int32)0xffffffff;
+#endif
return num;
}
int64 read_longint(int f)
{
int64 num;
- char b[8];
- num = read_int(f);
+ char b[9];
+
+ if (protocol_version < 30) {
+ num = read_int(f);
- if ((int32)num != (int32)0xffffffff)
- return num;
+ if ((int32)num != (int32)0xffffffff)
+ return num;
#if SIZEOF_INT64 < 8
- rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
- exit_cleanup(RERR_UNSUPPORTED);
+ rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
+ exit_cleanup(RERR_UNSUPPORTED);
#else
- readfd(f,b,8);
- num = IVAL(b,0) | (((int64)IVAL(b,4))<<32);
+ readfd(f, b, 8);
+ num = IVAL(b,0) | (((int64)IVAL(b,4))<<32);
+#endif
+ } else {
+ int cnt;
+ readfd(f, b, 3);
+ cnt = int_byte_cnt[CVAL(b, 0) / 4];
+#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) {
+ case 3:
+ num = NVAL3(b, 0);
+ break;
+ case 4:
+ num = NVAL4(b, 0x80);
+ break;
+ case 5:
+ num = NVAL5(b, 0xC0);
+ break;
+#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;
#endif
+ default:
+ exit_cleanup(RERR_PROTOCOL); /* impossible... */
+ }
+ }
return num;
}
-void read_buf(int f,char *buf,size_t len)
+void read_buf(int f, char *buf, size_t len)
{
readfd(f,buf,len);
}
-void read_sbuf(int f,char *buf,size_t len)
+void read_sbuf(int f, char *buf, size_t len)
{
readfd(f, buf, len);
buf[len] = '\0';
void read_sum_head(int f, struct sum_struct *sum)
{
sum->count = read_int(f);
+ if (sum->count < 0) {
+ rprintf(FERROR, "Invalid checksum count %ld [%s]\n",
+ (long)sum->count, who_am_i());
+ exit_cleanup(RERR_PROTOCOL);
+ }
sum->blength = read_int(f);
if (sum->blength < 0 || sum->blength > MAX_BLOCK_SIZE) {
rprintf(FERROR, "Invalid block length %ld [%s]\n",
static void sleep_for_bwlimit(int bytes_written)
{
static struct timeval prior_tv;
- static long total_written = 0;
+ static long total_written = 0;
struct timeval tv, start_tv;
long elapsed_usec, sleep_usec;
#define ONE_SEC 1000000L /* # of microseconds in a second */
- if (!bwlimit)
+ if (!bwlimit_writemax)
return;
- total_written += bytes_written;
+ total_written += bytes_written;
gettimeofday(&start_tv, NULL);
if (prior_tv.tv_sec) {
*
* This function underlies the multiplexing system. The body of the
* application never calls this function directly. */
-static void writefd_unbuffered(int fd,char *buf,size_t len)
+static void writefd_unbuffered(int fd, const char *buf, size_t len)
{
size_t n, total = 0;
- fd_set w_fds, r_fds;
+ fd_set w_fds, r_fds, e_fds;
int maxfd, count, cnt, using_r_fds;
+ 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);
- FD_SET(fd,&w_fds);
+ FD_SET(fd, &w_fds);
+ FD_ZERO(&e_fds);
+ FD_SET(fd, &e_fds);
maxfd = fd;
- if (msg_fd_in >= 0 && len-total >= contiguous_write_len) {
+ if (msg_fd_in >= 0) {
FD_ZERO(&r_fds);
- FD_SET(msg_fd_in,&r_fds);
+ FD_SET(msg_fd_in, &r_fds);
if (msg_fd_in > maxfd)
maxfd = msg_fd_in;
using_r_fds = 1;
errno = 0;
count = select(maxfd + 1, using_r_fds ? &r_fds : NULL,
- &w_fds, NULL, &tv);
+ &w_fds, &e_fds, &tv);
if (count <= 0) {
if (count < 0 && errno == EBADF)
continue;
}
+ if (FD_ISSET(fd, &e_fds)) {
+ rsyserr(FINFO, errno,
+ "select exception on fd %d", fd);
+ }
+
if (using_r_fds && FD_ISSET(msg_fd_in, &r_fds))
read_msg_fd();
continue;
n = len - total;
- if (bwlimit && n > bwlimit_writemax)
+ if (bwlimit_writemax && n > bwlimit_writemax)
n = bwlimit_writemax;
cnt = write(fd, buf + total, n);
/* 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: phase \"%s\" [%s]",
- (long)len, io_write_phase, who_am_i());
+ "writefd_unbuffered failed to write %ld bytes [%s]",
+ (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) {
}
total += cnt;
+ defer_forwarding_messages = 1;
if (fd == sock_f_out) {
if (io_timeout || am_generator)
}
no_flush--;
-}
-
-/**
- * Write an message to a multiplexed stream. If this fails then rsync
- * exits.
- **/
-static void mplex_write(enum msgcode code, char *buf, size_t len)
-{
- char buffer[BIGPATHBUFLEN];
- size_t n = len;
-
- SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len);
-
- /* When the generator reads messages from the msg_fd_in pipe, it can
- * cause output to occur down the socket. Setting contiguous_write_len
- * prevents the reading of msg_fd_in once we actually start to write
- * this sequence of data (though we might read it before the start). */
- if (am_generator && msg_fd_in >= 0)
- contiguous_write_len = len + 4;
-
- if (n > sizeof buffer - 4)
- n = sizeof buffer - 4;
-
- memcpy(&buffer[4], buf, n);
- writefd_unbuffered(sock_f_out, buffer, n+4);
-
- len -= n;
- buf += n;
-
- if (len)
- writefd_unbuffered(sock_f_out, buf, len);
-
- if (am_generator && msg_fd_in >= 0)
- contiguous_write_len = 0;
+ if (!(defer_forwarding_messages = defer_save))
+ msg2sndr_flush();
}
void io_flush(int flush_it_all)
{
- msg_list_flush(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(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,char *buf,size_t len)
+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;
exit_cleanup(RERR_FILEIO);
}
- if (!iobuf_out || fd != sock_f_out) {
+ if (!iobuf_out || fd != iobuf_f_out) {
writefd_unbuffered(fd, buf, len);
return;
}
}
}
-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_int(int f,int32 x)
+void write_int(int f, int32 x)
{
char b[4];
- SIVAL(b,0,x);
- writefd(f,b,4);
-}
-
-void write_int_named(int f, int32 x, const char *phase)
-{
- io_write_phase = phase;
- write_int(f, x);
- io_write_phase = phase_unknown;
+ SIVAL(b, 0, x);
+ writefd(f, b, 4);
}
/*
*/
void write_longint(int f, int64 x)
{
- char b[8];
+ char b[12];
- if (x <= 0x7FFFFFFF) {
- write_int(f, (int)x);
- return;
+#if SIZEOF_INT64 < 8
+ if (x < 0 || x > 0x7FFFFFFF) {
+ rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
+ exit_cleanup(RERR_UNSUPPORTED);
}
+#endif
+ if (protocol_version < 30) {
+ char * const s = b+4;
+ SIVAL(s, 0, x);
#if SIZEOF_INT64 < 8
- rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
- exit_cleanup(RERR_UNSUPPORTED);
+ writefd(f, s, 4);
#else
- write_int(f, (int32)0xFFFFFFFF);
- SIVAL(b,0,(x&0xFFFFFFFF));
- SIVAL(b,4,((x>>32)&0xFFFFFFFF));
+ if (x <= 0x7FFFFFFF && x >= 0) {
+ writefd(f, s, 4);
+ return;
+ }
- writefd(f,b,8);
+ 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);
+ }
#endif
}
-void write_buf(int f,char *buf,size_t len)
+void write_buf(int f, const char *buf, size_t len)
{
writefd(f,buf,len);
}
/** Write a string to the connection */
-void write_sbuf(int f, char *buf)
+void write_sbuf(int f, const char *buf)
{
writefd(f, buf, strlen(buf));
}
writefd(f, (char *)&c, 1);
}
-void write_vstring(int f, char *str, int len)
+void write_vstring(int f, const char *str, int len)
{
uchar lenbuf[3], *lb = lenbuf;
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
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;
}
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;
}
/** Write an message to the multiplexed data stream. */
-int io_multiplex_write(enum msgcode code, char *buf, size_t len)
+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