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 csum_length;
extern int checksum_seed;
extern int protocol_version;
-extern char *remote_filesfrom_file;
+extern int remove_sent_files;
+extern int preserve_hard_links;
+extern char *filesfrom_host;
extern struct stats stats;
+extern struct file_list *the_file_list;
const char phase_unknown[] = "unknown";
int select_timeout = SELECT_TIMEOUT;
int msg_fd_in = -1;
int msg_fd_out = -1;
+int sock_f_in = -1;
+int sock_f_out = -1;
static int io_multiplexing_out;
static int io_multiplexing_in;
-static int sock_f_in = -1;
-static int sock_f_out = -1;
static time_t last_io;
static int no_flush;
static char *io_filesfrom_bp;
static char io_filesfrom_lastchar;
static int io_filesfrom_buflen;
+static size_t contiguous_write_len = 0;
static void read_loop(int fd, char *buf, size_t len);
-struct redo_list {
- struct redo_list *next;
- int num;
+struct flist_ndx_item {
+ struct flist_ndx_item *next;
+ int ndx;
};
-static struct redo_list *redo_list_head;
-static struct redo_list *redo_list_tail;
+struct flist_ndx_list {
+ struct flist_ndx_item *head, *tail;
+};
+
+static struct flist_ndx_list redo_list, hlink_list;
struct msg_list {
struct msg_list *next;
static struct msg_list *msg_list_head;
static struct msg_list *msg_list_tail;
-static void redo_list_add(int num)
+static void flist_ndx_push(struct flist_ndx_list *lp, int ndx)
{
- struct redo_list *rl;
-
- if (!(rl = new(struct redo_list)))
- exit_cleanup(RERR_MALLOC);
- rl->next = NULL;
- rl->num = num;
- if (redo_list_tail)
- redo_list_tail->next = rl;
+ 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
- redo_list_head = rl;
- redo_list_tail = rl;
+ lp->head = item;
+ lp->tail = item;
+}
+
+static int flist_ndx_pop(struct flist_ndx_list *lp)
+{
+ struct flist_ndx_item *next;
+ int ndx;
+
+ if (!lp->head)
+ return -1;
+
+ ndx = lp->head->ndx;
+ next = lp->head->next;
+ free(lp->head);
+ lp->head = next;
+ if (!next)
+ lp->tail = NULL;
+
+ return ndx;
}
static void check_timeout(void)
struct msg_list *ml;
if (!(ml = new(struct msg_list)))
- exit_cleanup(RERR_MALLOC);
+ out_of_memory("msg_list_add");
ml->next = NULL;
if (!(ml->buf = new_array(char, len+4)))
- exit_cleanup(RERR_MALLOC);
+ 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;
int tag, len;
/* Temporarily disable msg_fd_in. This is needed to avoid looping back
- * to this routine from read_timeout() and writefd_unbuffered(). */
+ * to this routine from writefd_unbuffered(). */
msg_fd_in = -1;
read_loop(fd, buf, 4);
rprintf(FERROR, "invalid message %d:%d\n", tag, len);
exit_cleanup(RERR_STREAMIO);
}
- redo_list_add(-1);
+ flist_ndx_push(&redo_list, -1);
break;
case MSG_REDO:
if (len != 4 || !am_generator) {
exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, buf, 4);
- redo_list_add(IVAL(buf,0));
+ flist_ndx_push(&redo_list, IVAL(buf,0));
break;
case MSG_DELETED:
if (len >= (int)sizeof buf || !am_generator) {
exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, buf, len);
- io_multiplex_write(MSG_SUCCESS, 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));
break;
case MSG_INFO:
case MSG_ERROR:
return 1;
}
-int get_redo_num(void)
+int get_redo_num(int itemizing, enum logcode code)
{
- struct redo_list *next;
- int num;
-
- while (!redo_list_head)
+ while (1) {
+ if (hlink_list.head)
+ check_for_finished_hlinks(itemizing, code);
+ if (redo_list.head)
+ break;
read_msg_fd();
+ }
- num = redo_list_head->num;
- next = redo_list_head->next;
- free(redo_list_head);
- redo_list_head = next;
- if (!next)
- redo_list_tail = NULL;
+ return flist_ndx_pop(&redo_list);
+}
- return num;
+int get_hlink_num(void)
+{
+ return flist_ndx_pop(&hlink_list);
}
/**
FD_ZERO(&r_fds);
FD_ZERO(&w_fds);
FD_SET(fd, &r_fds);
- if (msg_fd_in >= 0) {
- FD_SET(msg_fd_in, &r_fds);
- if (msg_fd_in > maxfd)
- maxfd = msg_fd_in;
- } else if (msg_list_head) {
+ if (msg_list_head) {
FD_SET(msg_fd_out, &w_fds);
if (msg_fd_out > maxfd)
maxfd = msg_fd_out;
continue;
}
- if (msg_fd_in >= 0 && FD_ISSET(msg_fd_in, &r_fds))
- read_msg_fd();
- else if (msg_list_head && FD_ISSET(msg_fd_out, &w_fds))
+ if (msg_list_head && FD_ISSET(msg_fd_out, &w_fds))
msg_list_push(NORMAL_FLUSH);
if (io_filesfrom_f_out >= 0) {
len -= n;
ret += n;
- if (io_timeout && fd == sock_f_in)
+ if (fd == sock_f_in && (io_timeout || am_generator))
last_io = time(NULL);
}
{
char ch, *s, *eob = fname + MAXPATHLEN - 1;
int cnt;
- int reading_remotely = remote_filesfrom_file != NULL;
+ int reading_remotely = filesfrom_host != NULL;
int nulls = eol_nulls || reading_remotely;
start:
}
-void maybe_send_keepalive(int allowed_lull, int ndx)
+void maybe_flush_socket(void)
+{
+ if (iobuf_out && iobuf_out_cnt && time(NULL) - last_io >= 5)
+ io_flush(NORMAL_FLUSH);
+}
+
+
+void maybe_send_keepalive(void)
{
if (time(NULL) - last_io >= allowed_lull) {
if (!iobuf_out || !iobuf_out_cnt) {
if (protocol_version < 29)
return; /* there's nothing we can do */
- write_int(sock_f_out, ndx);
+ write_int(sock_f_out, the_file_list->count);
write_shortint(sock_f_out, ITEM_IS_NEW);
}
if (iobuf_out)
static size_t remaining;
static size_t iobuf_in_ndx;
int tag, ret = 0;
- char line[MAXPATHLEN+1];
+#if MAXPATHLEN < 4096
+ char line[4096+1024];
+#else
+ char line[MAXPATHLEN+1024];
+#endif
if (!iobuf_in || fd != sock_f_in)
return read_timeout(fd, buf, len);
break;
case MSG_SUCCESS:
if (remaining != 4) {
- rprintf(FERROR, "invalid multi-message %d:%ld\n",
- tag, (long)remaining);
+ rprintf(FERROR, "invalid multi-message %d:%ld [%s]\n",
+ tag, (long)remaining, who_am_i());
exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, line, remaining);
case MSG_ERROR:
if (remaining >= sizeof line) {
rprintf(FERROR,
- "[%s] multiplexing overflow %d:%ld\n\n",
- who_am_i(), tag, (long)remaining);
+ "multiplexing overflow %d:%ld [%s]\n",
+ tag, (long)remaining, who_am_i());
exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, line, remaining);
remaining = 0;
break;
default:
- rprintf(FERROR, "[%s] unexpected tag %d\n",
- who_am_i(), tag);
+ rprintf(FERROR, "unexpected tag %d [%s]\n",
+ tag, who_am_i());
exit_cleanup(RERR_STREAMIO);
}
}
void read_sbuf(int f,char *buf,size_t len)
{
readfd(f, buf, len);
- buf[len] = 0;
+ buf[len] = '\0';
}
uchar read_byte(int f)
return c;
}
+int read_vstring(int f, char *buf, int bufsize)
+{
+ int len = read_byte(f);
+
+ if (len & 0x80)
+ len = (len & ~0x80) * 0x100 + read_byte(f);
+
+ if (len >= bufsize) {
+ rprintf(FERROR, "over-long vstring received (%d > %d)\n",
+ len, bufsize - 1);
+ return -1;
+ }
+
+ if (len)
+ readfd(f, buf, len);
+ buf[len] = '\0';
+ return len;
+}
+
/* Populate a sum_struct with values from the socket. This is
* called by both the sender and the receiver. */
void read_sum_head(int f, struct sum_struct *sum)
sum->count = read_int(f);
sum->blength = read_int(f);
if (sum->blength < 0 || sum->blength > MAX_BLOCK_SIZE) {
- rprintf(FERROR, "[%s] Invalid block length %ld\n",
- who_am_i(), (long)sum->blength);
+ rprintf(FERROR, "Invalid block length %ld [%s]\n",
+ (long)sum->blength, who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
sum->s2length = protocol_version < 27 ? csum_length : (int)read_int(f);
if (sum->s2length < 0 || sum->s2length > MD4_SUM_LENGTH) {
- rprintf(FERROR, "[%s] Invalid checksum length %d\n",
- who_am_i(), sum->s2length);
+ rprintf(FERROR, "Invalid checksum length %d [%s]\n",
+ sum->s2length, who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
sum->remainder = read_int(f);
if (sum->remainder < 0 || sum->remainder > sum->blength) {
- rprintf(FERROR, "[%s] Invalid remainder length %ld\n",
- who_am_i(), (long)sum->remainder);
+ rprintf(FERROR, "Invalid remainder length %ld [%s]\n",
+ (long)sum->remainder, who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
}
/* Write len bytes to the file descriptor fd, looping as necessary to get
- * the job done and also (in the generator) reading any data on msg_fd_in
- * (to avoid deadlock).
+ * the job done and also (in certain circumstnces) reading any data on
+ * msg_fd_in to avoid deadlock.
*
* This function underlies the multiplexing system. The body of the
* application never calls this function directly. */
{
size_t n, total = 0;
fd_set w_fds, r_fds;
- int maxfd, count, ret;
+ int maxfd, count, ret, using_r_fds;
struct timeval tv;
no_flush++;
FD_SET(fd,&w_fds);
maxfd = fd;
- if (msg_fd_in >= 0) {
+ if (msg_fd_in >= 0 && len-total >= contiguous_write_len) {
FD_ZERO(&r_fds);
FD_SET(msg_fd_in,&r_fds);
if (msg_fd_in > maxfd)
maxfd = msg_fd_in;
- }
+ using_r_fds = 1;
+ } else
+ using_r_fds = 0;
if (fd != sock_f_out && iobuf_out_cnt && no_flush == 1) {
FD_SET(sock_f_out, &w_fds);
if (sock_f_out > maxfd)
tv.tv_usec = 0;
errno = 0;
- count = select(maxfd + 1, msg_fd_in >= 0 ? &r_fds : NULL,
+ count = select(maxfd + 1, using_r_fds ? &r_fds : NULL,
&w_fds, NULL, &tv);
if (count <= 0) {
continue;
}
- if (msg_fd_in >= 0 && FD_ISSET(msg_fd_in, &r_fds))
+ if (using_r_fds && FD_ISSET(msg_fd_in, &r_fds))
read_msg_fd();
- if (!FD_ISSET(fd, &w_fds)) {
- if (fd != sock_f_out && iobuf_out_cnt) {
- no_flush--;
- io_flush(NORMAL_FLUSH);
- no_flush++;
- }
+ if (!FD_ISSET(fd, &w_fds))
continue;
- }
n = len - total;
if (bwlimit && n > bwlimit_writemax)
total += ret;
if (fd == sock_f_out) {
- if (io_timeout)
+ if (io_timeout || am_generator)
last_io = time(NULL);
sleep_for_bwlimit(ret);
}
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;
if (len)
writefd_unbuffered(sock_f_out, buf, len);
+
+ if (am_generator && msg_fd_in >= 0)
+ contiguous_write_len = 0;
}
writefd(f,buf,len);
}
-
/** Write a string to the connection */
void write_sbuf(int f, char *buf)
{
writefd(f, buf, strlen(buf));
}
-
void write_byte(int f, uchar c)
{
writefd(f, (char *)&c, 1);
}
+void write_vstring(int f, char *str, int len)
+{
+ uchar lenbuf[3], *lb = lenbuf;
+
+ if (len > 0x7F) {
+ if (len > 0x7FFF) {
+ rprintf(FERROR,
+ "attempting to send over-long vstring (%d > %d)\n",
+ len, 0x7FFF);
+ exit_cleanup(RERR_PROTOCOL);
+ }
+ *lb++ = len / 0x100 + 0x80;
+ }
+ *lb = len;
+
+ writefd(f, (char*)lenbuf, lb - lenbuf + 1);
+ if (len)
+ writefd(f, str, len);
+}
+
/**
* Read a line of up to @p maxlen characters into @p buf (not counting
git.samba.org / rsync.git / blobdiff