extern int am_server;
extern int am_sender;
+extern int am_daemon;
+extern int io_timeout;
extern int local_server;
extern int inplace;
extern int recurse;
#define CF_INC_RECURSE (1<<0)
#define CF_SYMLINK_TIMES (1<<1)
#define CF_SYMLINK_ICONV (1<<2)
+#define CF_TIMEOUT_ACTIVE (1<<3)
static const char *client_info;
#ifdef ICONV_OPTION
compat_flags |= CF_SYMLINK_ICONV;
#endif
+ if (am_daemon && io_timeout && protocol_version >= 31)
+ compat_flags |= CF_TIMEOUT_ACTIVE;
write_byte(f_out, compat_flags);
- } else
+ if (compat_flags & CF_TIMEOUT_ACTIVE)
+ write_varint(f_out, io_timeout);
+ } else {
compat_flags = read_byte(f_in);
+ if (compat_flags & CF_TIMEOUT_ACTIVE) {
+ int timeout = read_varint(f_in);
+ if (!io_timeout || io_timeout > timeout) {
+ if (INFO_GTE(MISC, 2))
+ rprintf(FINFO, "Setting --timeout=%d to match server\n", timeout);
+ io_timeout = timeout;
+ }
+ }
+ }
/* The inc_recurse var MUST be set to 0 or 1. */
inc_recurse = compat_flags & CF_INC_RECURSE ? 1 : 0;
if (am_sender) {
static const char *info_verbosity[1+MAX_VERBOSITY] = {
/*0*/ NULL,
/*1*/ "COPY,DEL,FLIST,MISC,NAME,STATS,SYMSAFE",
- /*2*/ "BACKUP,MOUNT,NAME2,REMOVE,SKIP",
+ /*2*/ "BACKUP,MISC2,MOUNT,NAME2,REMOVE,SKIP",
};
#define MAX_OUT_LEVEL 4 /* The largest N allowed for any flagN word. */
INFO_WORD(COPY, W_REC, "Mention files copied locally on the receiving side"),
INFO_WORD(DEL, W_REC, "Mention deletions on the receiving side"),
INFO_WORD(FLIST, W_CLI, "Mention file-list receiving/sending (levels 1-2)"),
- INFO_WORD(MISC, W_SND|W_REC, "Mention miscellaneous information"),
+ INFO_WORD(MISC, W_SND|W_REC, "Mention miscellaneous information (levels 1-2)"),
INFO_WORD(MOUNT, W_SND|W_REC, "Mention mounts that were found or skipped"),
INFO_WORD(NAME, W_SND|W_REC, "Mention 1) updated file/dir names, 2) unchanged names"),
INFO_WORD(PROGRESS, W_CLI, "Mention 1) per-file progress or 2) total transfer progress"),
/* This is used when working on a new protocol version in CVS, and should
* be a new non-zero value for each CVS change that affects the protocol.
* It must ALWAYS be 0 when the protocol goes final (and NEVER before)! */
-#define SUBPROTOCOL_VERSION 8
+#define SUBPROTOCOL_VERSION 9
/* We refuse to interoperate with versions that are not in this range.
* Note that we assume we'll work with later versions: the onus is on