summaryrefslogtreecommitdiff
path: root/rsync.h
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2009-12-19 10:15:15 -0800
committerWayne Davison <wayned@samba.org>2009-12-19 11:00:36 -0800
commit92d021488ec06524f7ed6a527c39f2753f4a9fd2 (patch)
tree181e28b70b8d47620557f820801b60d4c95f5f6b /rsync.h
parent82b2a31a46d7c94f951b96f61c9935198f0f53f1 (diff)
downloadrsync-92d021488ec06524f7ed6a527c39f2753f4a9fd2.tar.gz
Improve --timeout method to take into account all I/O that is going on.
The receiving side also switches timeout handling from the receiver to the generator, which obviates the need for the sender to send any keep-alive messages at all (for protocol 31 and beyond). Given this setup, all keep-alive messages are now sent as empty MSG_DATA messages, with MSG_NOOP messages only being understood and (when necessary) acted upon to forward a keep-alive event to an older receiver. This is both safer and more compatible with older versions.
Diffstat (limited to 'rsync.h')
-rw-r--r--rsync.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/rsync.h b/rsync.h
index 68f236dc..1cf7c6e0 100644
--- a/rsync.h
+++ b/rsync.h
@@ -234,7 +234,7 @@ enum msgcode {
MSG_STATS=10, /* message has stats data for generator */
MSG_IO_ERROR=22,/* the sending side had an I/O error */
MSG_IO_TIMEOUT=33,/* tell client about a daemon's timeout value */
- MSG_NOOP=42, /* a do-nothing message */
+ MSG_NOOP=42, /* a do-nothing message (legacy protocol-30 only) */
MSG_ERROR_EXIT=86, /* used by siblings and by protocol-31 */
MSG_SUCCESS=100,/* successfully updated indicated flist index */
MSG_DELETED=101,/* successfully deleted a file on receiving side */