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 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;
struct flist_ndx_item *head, *tail;
};
-static struct flist_ndx_list redo_list;
+static struct flist_ndx_list redo_list, hlink_list;
struct msg_list {
struct msg_list *next;
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)
{
- while (!redo_list.head) {
+ while (1) {
+ if (hlink_list.head)
+ check_for_finished_hlinks(itemizing, code);
+ if (redo_list.head)
+ break;
read_msg_fd();
}
return flist_ndx_pop(&redo_list);
}
+int get_hlink_num(void)
+{
+ return flist_ndx_pop(&hlink_list);
+}
+
/**
* When we're the receiver and we have a local --files-from list of names
* that needs to be sent over the socket to the sender, we have to do two
len -= n;
ret += n;
- if (io_timeout && fd == sock_f_in)
+ if (fd == sock_f_in && (io_timeout || am_generator))
last_io = time(NULL);
}
}
-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);
}
}
if (len >= bufsize) {
rprintf(FERROR, "over-long vstring received (%d > %d)\n",
len, bufsize - 1);
- exit_cleanup(RERR_PROTOCOL);
+ return -1;
}
if (len)
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);
}
}
{
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(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);
}