X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/accc091fe9ebbb602bcf692c577486e62011d5c1..3b8f8192227b14e708bf535072485e50f4362270:/compat.c

diff --git a/compat.c b/compat.c
index 6655acd4..d7e90bec 100644
--- 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) {