Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a hang that can happen when the sender is sending an extra file-list
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
407568d
..
a2bf010
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-29,6
+29,7
@@
extern int dry_run;
extern int list_only;
extern int dry_run;
extern int list_only;
+extern int io_timeout;
extern int am_root;
extern int am_server;
extern int am_sender;
extern int am_root;
extern int am_server;
extern int am_sender;
@@
-43,6
+44,7
@@
extern int kluge_around_eof;
extern int got_xfer_error;
extern int msgs2stderr;
extern int module_id;
extern int got_xfer_error;
extern int msgs2stderr;
extern int module_id;
+extern int read_only;
extern int copy_links;
extern int copy_dirlinks;
extern int copy_unsafe_links;
extern int copy_links;
extern int copy_dirlinks;
extern int copy_unsafe_links;
@@
-71,6
+73,8
@@
extern int send_msgs_to_gen;
extern pid_t cleanup_child_pid;
extern size_t bwlimit_writemax;
extern unsigned int module_dirlen;
extern pid_t cleanup_child_pid;
extern size_t bwlimit_writemax;
extern unsigned int module_dirlen;
+extern BOOL flist_receiving_enabled;
+extern BOOL shutting_down;
extern struct stats stats;
extern char *stdout_format;
extern char *logfile_format;
extern struct stats stats;
extern char *stdout_format;
extern char *logfile_format;
@@
-402,7
+406,7
@@
static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
cmd = rsh_env;
if (!cmd)
cmd = RSYNC_RSH;
cmd = rsh_env;
if (!cmd)
cmd = RSYNC_RSH;
- cmd = strdup(cmd); /*
MEMORY LEAK
*/
+ cmd = strdup(cmd); /*
MEMORY LEAK
*/
if (!cmd)
goto oom;
if (!cmd)
goto oom;
@@
-724,6
+728,8
@@
static void read_final_goodbye(int f_in, int f_out)
uchar fnamecmp_type;
char xname[MAXPATHLEN];
uchar fnamecmp_type;
char xname[MAXPATHLEN];
+ shutting_down = True;
+
if (protocol_version < 29)
i = read_int(f_in);
else {
if (protocol_version < 29)
i = read_int(f_in);
else {
@@
-764,7
+770,7
@@
static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
exit_cleanup(RERR_SYNTAX);
return;
}
exit_cleanup(RERR_SYNTAX);
return;
}
- if (am_daemon &&
lp_read_only(module_id)
&& remove_source_files) {
+ if (am_daemon &&
read_only
&& remove_source_files) {
rprintf(FERROR,
"ERROR: --remove-%s-files cannot be used with a read-only module\n",
remove_source_files == 1 ? "source" : "sent");
rprintf(FERROR,
"ERROR: --remove-%s-files cannot be used with a read-only module\n",
remove_source_files == 1 ? "source" : "sent");
@@
-847,7
+853,7
@@
static int do_recv(int f_in, int f_out, char *local_name)
close(error_pipe[0]);
/* We can't let two processes write to the socket at one time. */
close(error_pipe[0]);
/* We can't let two processes write to the socket at one time. */
- io_end_multiplex_out(
False
);
+ io_end_multiplex_out(
MPLX_SWITCHING
);
if (f_in != f_out)
close(f_out);
sock_f_out = -1;
if (f_in != f_out)
close(f_out);
sock_f_out = -1;
@@
-893,8
+899,9
@@
static int do_recv(int f_in, int f_out, char *local_name)
}
am_generator = 1;
}
am_generator = 1;
+ flist_receiving_enabled = True;
- io_end_multiplex_in(
False
);
+ io_end_multiplex_in(
MPLX_SWITCHING
);
if (write_batch && !am_server)
stop_write_batch();
if (write_batch && !am_server)
stop_write_batch();
@@
-919,6
+926,7
@@
static int do_recv(int f_in, int f_out, char *local_name)
handle_stats(-1);
io_flush(FULL_FLUSH);
handle_stats(-1);
io_flush(FULL_FLUSH);
+ shutting_down = True;
if (protocol_version >= 24) {
/* send a final goodbye message */
write_ndx(f_out, NDX_DONE);
if (protocol_version >= 24) {
/* send a final goodbye message */
write_ndx(f_out, NDX_DONE);
@@
-950,7
+958,7
@@
static void do_server_recv(int f_in, int f_out, int argc, char *argv[])
argc, (long)getpid());
}
argc, (long)getpid());
}
- if (am_daemon &&
lp_read_only(module_id)
) {
+ if (am_daemon &&
read_only
) {
rprintf(FERROR,"ERROR: module is read only\n");
exit_cleanup(RERR_SYNTAX);
return;
rprintf(FERROR,"ERROR: module is read only\n");
exit_cleanup(RERR_SYNTAX);
return;
@@
-1050,11
+1058,15
@@
void start_server(int f_in, int f_out, int argc, char *argv[])
if (protocol_version >= 23)
io_start_multiplex_out(f_out);
if (protocol_version >= 23)
io_start_multiplex_out(f_out);
+ if (am_daemon && io_timeout && protocol_version >= 31)
+ send_msg_int(MSG_IO_TIMEOUT, io_timeout);
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
if (need_messages_from_generator)
io_start_multiplex_in(f_in);
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
if (need_messages_from_generator)
io_start_multiplex_in(f_in);
+ else
+ io_start_buffering_in(f_in);
recv_filter_list(f_in);
do_server_sender(f_in, f_out, argc, argv);
} else
recv_filter_list(f_in);
do_server_sender(f_in, f_out, argc, argv);
} else
@@
-1103,6
+1115,8
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
io_start_buffering_out(f_out);
if (protocol_version >= 31 || (!filesfrom_host && protocol_version >= 23))
io_start_multiplex_in(f_in);
io_start_buffering_out(f_out);
if (protocol_version >= 31 || (!filesfrom_host && protocol_version >= 23))
io_start_multiplex_in(f_in);
+ else
+ io_start_buffering_in(f_in);
send_filter_list(f_out);
if (filesfrom_host)
filesfrom_fd = f_in;
send_filter_list(f_out);
if (filesfrom_host)
filesfrom_fd = f_in;
@@
-1138,6
+1152,8
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
io_start_multiplex_in(f_in);
if (need_messages_from_generator)
io_start_multiplex_out(f_out);
io_start_multiplex_in(f_in);
if (need_messages_from_generator)
io_start_multiplex_out(f_out);
+ else
+ io_start_buffering_out(f_out);
}
send_filter_list(read_batch ? -1 : f_out);
}
send_filter_list(read_batch ? -1 : f_out);