A protocol 31 daemon will inform the client about its timeout setting

so that the client will be able to cooperate with keep-alive.

diff --git a/compat.c b/compat.c
index 6655acd472fbaeb60479c46b8c2b43c6c651759b..d7e90becc87a9a2711782cfec99e5dd553bec2be 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -27,6 +27,8 @@ int inc_recurse = 0;
 
 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;
@@ -72,6 +74,7 @@ int filesfrom_convert = 0;
 #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;
 
@@ -254,9 +257,22 @@ void setup_protocol(int f_out,int f_in)
 #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) {

diff --git a/options.c b/options.c
index 66820b548ef99f9dddac74635013b899f126dfe7..0377ef6f2f6bf025cec5cfcd45f18a714d0f9457 100644 (file)
--- a/options.c
+++ b/options.c
@@ -215,7 +215,7 @@ static const char *debug_verbosity[] = {
 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. */
@@ -248,7 +248,7 @@ static struct output_struct info_words[COUNT_INFO+1] = {
        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"),

diff --git a/rsync.h b/rsync.h
index 843885b52dba3804f2d65a5ba02a7f80912718e1..c5e769137a9e244778e7f03d663d597d920aeda0 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -98,7 +98,7 @@
 /* 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