* Copyright (C) 1996-2001 Andrew Tridgell <tridge@samba.org>
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2008 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 as published by
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 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 read_batch;
extern int write_batch;
extern int batch_fd;
+extern int sock_f_in;
+extern int sock_f_out;
extern int filesfrom_fd;
extern int connect_timeout;
+extern int send_msgs_to_gen;
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 char *shell_cmd;
extern char *batch_name;
extern char *password_file;
+extern char *backup_dir;
extern char curr_dir[MAXPATHLEN];
+extern char backup_dir_buf[MAXPATHLEN];
extern char *basis_dir[MAX_BASIS_DIRS+1];
extern struct file_list *first_flist;
-extern struct filter_list_struct daemon_filter_list;
+extern filter_rule_list daemon_filter_list;
uid_t our_uid;
-int am_generator = 0;
+gid_t our_gid;
+int am_receiver = 0; /* Only set to 1 after the receiver/generator fork. */
+int am_generator = 0; /* Only set to 1 after the receiver/generator fork. */
int local_server = 0;
int daemon_over_rsh = 0;
mode_t orig_umask = 0;
pid_t wait_process(pid_t pid, int *status_ptr, int flags)
{
pid_t waited_pid;
-
+
do {
waited_pid = waitpid(pid, status_ptr, flags);
} while (waited_pid == -1 && errno == EINTR);
void write_del_stats(int f)
{
- if (!INFO_GTE(STATS, 2) || protocol_version < 31)
- return;
+ if (read_batch)
+ write_int(f, NDX_DEL_STATS);
+ else
+ write_ndx(f, NDX_DEL_STATS);
write_varint(f, stats.deleted_files - stats.deleted_dirs
- stats.deleted_symlinks - stats.deleted_devices
- stats.deleted_specials);
void read_del_stats(int f)
{
- if (!INFO_GTE(STATS, 2) || protocol_version < 31)
- return;
stats.deleted_files = read_varint(f);
stats.deleted_files += stats.deleted_dirs = read_varint(f);
stats.deleted_files += stats.deleted_symlinks = read_varint(f);
write_varlong30(f, stats.flist_buildtime, 3);
write_varlong30(f, stats.flist_xfertime, 3);
}
- write_del_stats(f);
}
return;
}
stats.flist_buildtime = read_varlong30(f, 3);
stats.flist_xfertime = read_varlong30(f, 3);
}
- if (!read_batch)
- read_del_stats(f);
} else if (write_batch) {
/* The --read-batch process is going to be a client
* receiver, so we need to give it the stats. */
write_varlong30(batch_fd, stats.flist_buildtime, 3);
write_varlong30(batch_fd, stats.flist_xfertime, 3);
}
- /* We don't write the del stats into the batch file -- they
- * come from the generator when reading the batch. */
}
}
int *f_in_p, int *f_out_p)
{
int i, argc = 0;
- char *args[MAX_ARGS];
+ char *args[MAX_ARGS], *need_to_free = NULL;
pid_t pid;
int dash_l_set = 0;
cmd = rsh_env;
if (!cmd)
cmd = RSYNC_RSH;
- cmd = strdup(cmd); /* MEMORY LEAK */
+ cmd = need_to_free = strdup(cmd);
if (!cmd)
goto oom;
rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
exit_cleanup(RERR_SYNTAX);
}
- args[argc++] = *remote_argv++;
+ if (**remote_argv == '-') {
+ if (asprintf(args + argc++, "./%s", *remote_argv++) < 0)
+ out_of_memory("do_cmd");
+ } else
+ args[argc++] = *remote_argv++;
remote_argc--;
}
}
#ifdef ICONV_CONST
setup_iconv();
#endif
- if (protect_args)
+ if (protect_args && !daemon_over_rsh)
send_protected_args(*f_out_p, args);
}
+ if (need_to_free)
+ free(need_to_free);
+
return pid;
oom:
if (!dest_path || list_only)
return NULL;
+ /* Treat an empty string as a copy into the current directory. */
+ if (!*dest_path)
+ dest_path = ".";
+
if (daemon_filter_list.head) {
char *slash = strrchr(dest_path, '/');
if (slash && (slash[1] == '\0' || (slash[1] == '.' && slash[2] == '\0')))
exit_cleanup(RERR_SYNTAX);
}
- if (mkdir_defmode(dest_path) != 0) {
+ if (do_mkdir(dest_path, ACCESSPERMS) != 0) {
rsyserr(FERROR, errno, "mkdir %s failed",
full_fname(dest_path));
exit_cleanup(RERR_FILEIO);
}
/* This is only called by the sender. */
-static void read_final_goodbye(int f_in)
+static void read_final_goodbye(int f_in, int f_out)
{
int i, iflags, xlen;
uchar fnamecmp_type;
char xname[MAXPATHLEN];
+ shutting_down = True;
+
if (protocol_version < 29)
i = read_int(f_in);
else {
- i = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
- xname, &xlen);
+ i = read_ndx_and_attrs(f_in, f_out, &iflags, &fnamecmp_type, xname, &xlen);
+ if (protocol_version >= 31 && i == NDX_DONE) {
+ if (am_sender)
+ write_ndx(f_out, NDX_DONE);
+ else {
+ if (batch_gen_fd >= 0) {
+ while (read_int(batch_gen_fd) != NDX_DEL_STATS) {}
+ read_del_stats(batch_gen_fd);
+ }
+ write_int(f_out, NDX_DONE);
+ }
+ i = read_ndx_and_attrs(f_in, f_out, &iflags, &fnamecmp_type, xname, &xlen);
+ }
}
if (i != NDX_DONE) {
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");
io_flush(FULL_FLUSH);
handle_stats(f_out);
if (protocol_version >= 24)
- read_final_goodbye(f_in);
+ read_final_goodbye(f_in, f_out);
io_flush(FULL_FLUSH);
exit_cleanup(0);
}
exit_cleanup(RERR_IPC);
}
- io_flush(NORMAL_FLUSH);
+ if (backup_dir) {
+ int ret = make_path(backup_dir_buf, MKP_DROP_NAME); /* drops trailing slash */
+ if (ret < 0)
+ exit_cleanup(RERR_SYNTAX);
+ if (ret)
+ rprintf(FINFO, "Created backup_dir %s\n", backup_dir_buf);
+ else if (INFO_GTE(BACKUP, 1))
+ rprintf(FINFO, "backup_dir is %s\n", backup_dir_buf);
+ }
+
+ io_flush(FULL_FLUSH);
if ((pid = do_fork()) == -1) {
rsyserr(FERROR, errno, "fork failed in do_recv");
}
if (pid == 0) {
+ am_receiver = 1;
+ send_msgs_to_gen = am_server;
+
close(error_pipe[0]);
+
+ /* We can't let two processes write to the socket at one time. */
+ io_end_multiplex_out(MPLX_SWITCHING);
if (f_in != f_out)
close(f_out);
+ sock_f_out = -1;
+ f_out = error_pipe[1];
- /* we can't let two processes write to the socket at one time */
- io_end_multiplex_out();
+ bwlimit_writemax = 0; /* receiver doesn't need to do this */
- /* set place to send errors */
- set_msg_fd_out(error_pipe[1]);
- io_start_buffering_out(error_pipe[1]);
+ if (read_batch)
+ io_start_buffering_in(f_in);
+ io_start_multiplex_out(f_out);
- recv_files(f_in, local_name);
+ recv_files(f_in, f_out, local_name);
io_flush(FULL_FLUSH);
handle_stats(f_in);
output_needs_newline = 0;
}
- send_msg(MSG_DONE, "", 1, 0);
- write_varlong(error_pipe[1], stats.total_read, 3);
+ write_int(f_out, NDX_DONE);
+ send_msg(MSG_STATS, (char*)&stats.total_read, sizeof stats.total_read, 0);
io_flush(FULL_FLUSH);
/* Handle any keep-alive packets from the post-processing work
* that the generator does. */
if (protocol_version >= 29) {
- int iflags, xlen;
- uchar fnamecmp_type;
- char xname[MAXPATHLEN];
-
kluge_around_eof = -1;
/* This should only get stopped via a USR2 signal. */
- read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
- xname, &xlen);
+ read_final_goodbye(f_in, f_out);
rprintf(FERROR, "Invalid packet at end of run [%s]\n",
who_am_i());
}
am_generator = 1;
+ flist_receiving_enabled = True;
- io_end_multiplex_in();
+ io_end_multiplex_in(MPLX_SWITCHING);
if (write_batch && !am_server)
stop_write_batch();
close(error_pipe[1]);
if (f_in != f_out)
close(f_in);
+ sock_f_in = -1;
+ f_in = error_pipe[0];
io_start_buffering_out(f_out);
-
- set_msg_fd_in(error_pipe[0]);
- io_start_buffering_in(error_pipe[0]);
+ io_start_multiplex_in(f_in);
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && inc_recurse) {
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);
}
io_flush(FULL_FLUSH);
- set_msg_fd_in(-1);
kill(pid, SIGUSR2);
wait_process_with_flush(pid, &exit_code);
return exit_code;
char *local_name = NULL;
int negated_levels;
- if (filesfrom_fd >= 0 && !msgs2stderr) {
+ if (filesfrom_fd >= 0 && !msgs2stderr && protocol_version < 31) {
/* We can't mix messages with files-from data on the socket,
* so temporarily turn off info/debug messages. */
negate_output_levels();
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;
}
if (protocol_version >= 30)
- io_start_multiplex_in();
+ io_start_multiplex_in(f_in);
else
io_start_buffering_in(f_in);
recv_filter_list(f_in);
* need the IO routines to automatically write out the names
* onto our f_out socket as we read the file-list. This
* avoids both deadlock and extra delays/buffers. */
- io_set_filesfrom_fds(filesfrom_fd, f_out);
+ start_filesfrom_forwarding(filesfrom_fd);
filesfrom_fd = -1;
}
if (daemon_filter_list.head) {
char **dir_p;
- struct filter_list_struct *elp = &daemon_filter_list;
+ filter_rule_list *elp = &daemon_filter_list;
for (dir_p = basis_dir; *dir_p; dir_p++) {
char *dir = *dir_p;
setup_protocol(f_out, f_in);
if (protocol_version >= 23)
- io_start_multiplex_out();
+ 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();
+ 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
exit_cleanup(0);
}
-
-/*
- * This is called once the connection has been negotiated. It is used
- * for rsyncd, remote-shell, and local connections.
- */
+/* This is called once the connection has been negotiated. It is used
+ * for rsyncd, remote-shell, and local connections. */
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
{
struct file_list *flist = NULL;
sender_keeps_checksum = 1;
if (protocol_version >= 30)
- io_start_multiplex_out();
+ io_start_multiplex_out(f_out);
else
io_start_buffering_out(f_out);
- if (!filesfrom_host)
- set_msg_fd_in(f_in);
+ 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;
if (write_batch && !am_server)
start_write_batch(f_out);
flist = send_file_list(f_out, argc, argv);
- set_msg_fd_in(-1);
if (DEBUG_GTE(FLIST, 3))
rprintf(FINFO,"file list sent\n");
- if (protocol_version >= 23)
- io_start_multiplex_in();
+ if (protocol_version < 31 && filesfrom_host && protocol_version >= 23)
+ io_start_multiplex_in(f_in);
io_flush(NORMAL_FLUSH);
send_files(f_in, f_out);
io_flush(FULL_FLUSH);
handle_stats(-1);
if (protocol_version >= 24)
- read_final_goodbye(f_in);
+ read_final_goodbye(f_in, f_out);
if (pid != -1) {
if (DEBUG_GTE(EXIT, 2))
rprintf(FINFO,"client_run waiting on %d\n", (int) pid);
if (!read_batch) {
if (protocol_version >= 23)
- io_start_multiplex_in();
+ io_start_multiplex_in(f_in);
if (need_messages_from_generator)
- io_start_multiplex_out();
+ io_start_multiplex_out(f_out);
+ else
+ io_start_buffering_out(f_out);
}
send_filter_list(read_batch ? -1 : f_out);
if (filesfrom_fd >= 0) {
- io_set_filesfrom_fds(filesfrom_fd, f_out);
+ start_filesfrom_forwarding(filesfrom_fd);
filesfrom_fd = -1;
}
}
-/**
- * Start a client for either type of remote connection. Work out
+/* Start a client for either type of remote connection. Work out
* whether the arguments request a remote shell or rsyncd connection,
* and call the appropriate connection function, then run_client.
*
* Calls either start_socket_client (for sockets) or do_cmd and
- * client_run (for ssh).
- **/
+ * client_run (for ssh). */
static int start_client(int argc, char *argv[])
{
char *p, *shell_machine = NULL, *shell_user = NULL;
if (DEBUG_GTE(CMD, 2)) {
rprintf(FINFO,"cmd=%s machine=%s user=%s path=%s\n",
NS(shell_cmd), NS(shell_machine), NS(shell_user),
- remote_argv ? NS(remote_argv[0]) : "");
+ NS(remote_argv[0]));
}
pid = do_cmd(shell_cmd, shell_machine, shell_user, remote_argv, remote_argc,
starttime = time(NULL);
our_uid = MY_UID();
+ our_gid = MY_GID();
am_root = our_uid == 0;
memset(&stats, 0, sizeof(stats));
exit_cleanup(RERR_SYNTAX);
}
- /* we set a 0 umask so that correct file permissions can be
- * carried across */
- orig_umask = umask(0);
+ /* Get the umask for use in permission calculations. We no longer set
+ * it to zero; that is ugly and pointless now that all the callers that
+ * relied on it have been reeducated to work with default ACLs. */
+ umask(orig_umask = umask(0));
#if defined CONFIG_LOCALE && defined HAVE_SETLOCALE
setlocale(LC_CTYPE, "");
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff