Tweak the noop_io_until_death() timeout and comment it.

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index 413557a..08afdd9 100644 (file)
--- a/io.c
+++ b/io.c
@@ -773,8 +773,7 @@ static char *perform_io(size_t needed, int flags)
                                if (iobuf.raw_flushing_ends_before)
                                        iobuf.raw_flushing_ends_before -= out->size;
                                out->pos = 0;
-                       }
-                       if (out->pos == iobuf.raw_flushing_ends_before)
+                       } else if (out->pos == iobuf.raw_flushing_ends_before)
                                iobuf.raw_flushing_ends_before = 0;
                        if ((out->len -= n) == empty_buf_len) {
                                out->pos = 0;
@@ -808,7 +807,12 @@ void noop_io_until_death(void)
        char buf[1024];
 
        kluge_around_eof = 1;
-       set_io_timeout(protocol_version >= 31 ? 10 : 1);
+       /* For protocol 31: setting an I/O timeout ensures that if something
+        * inexplicably weird happens, we won't hang around forever.  For older
+        * protocols: we can't tell the other side to die, so we linger a brief
+        * time (to try to give our error messages time to arrive) and then let
+        * the "unexpectedly" closed socket tell them to die. */
+       set_io_timeout(protocol_version >= 31 ? 30 : 1);
 
        while (1)
                read_buf(iobuf.in_fd, buf, sizeof buf);
@@ -831,7 +835,7 @@ int send_msg(enum msgcode code, const char *buf, size_t len, int convert)
        if (convert > 0 && ic_send == (iconv_t)-1)
                convert = 0;
        if (convert > 0) {
-               /* Ensuring double-size room leaves space for a potential conversion. */
+               /* Ensuring double-size room leaves space for maximal conversion expansion. */
                if (iobuf.msg.len + len*2 + 4 > iobuf.msg.size)
                        perform_io(len*2 + 4, PIO_NEED_MSGROOM);
        } else
@@ -844,7 +848,7 @@ int send_msg(enum msgcode code, const char *buf, size_t len, int convert)
                pos -= iobuf.msg.size;
        hdr = iobuf.msg.buf + pos;
 
-       iobuf.msg.len += 4; /* Leave room for the coming header bytes. */
+       iobuf.msg.len += 4; /* Allocate room for the coming header bytes. */
 
 #ifdef ICONV_OPTION
        if (convert > 0) {
@@ -1165,7 +1169,8 @@ BOOL io_start_buffering_out(int f_out)
        if (iobuf.out.buf) {
                if (iobuf.out_fd == -1)
                        iobuf.out_fd = f_out;
-               assert(f_out == iobuf.out_fd);
+               else
+                       assert(f_out == iobuf.out_fd);
                return False;
        }
 
@@ -1187,7 +1192,8 @@ BOOL io_start_buffering_in(int f_in)
        if (iobuf.in.buf) {
                if (iobuf.in_fd == -1)
                        iobuf.in_fd = f_in;
-               assert(f_in == iobuf.in_fd);
+               else
+                       assert(f_in == iobuf.in_fd);
                return False;
        }