Moved read_sum_head() here from sender.c (because the generator uses it

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index 50eca53..762cf81 100644 (file)
--- a/io.c
+++ b/io.c
@@ -46,7 +46,9 @@ extern int io_timeout;
 extern int am_server;
 extern int am_daemon;
 extern int am_sender;
+extern int am_generator;
 extern int eol_nulls;
+extern int csum_length;
 extern int checksum_seed;
 extern int protocol_version;
 extern char *remote_filesfrom_file;
@@ -162,17 +164,17 @@ void io_set_sock_fds(int f_in, int f_out)
        sock_f_out = f_out;
 }
 
-/** Setup the fd used to receive MSG_* messages.  Only needed when
- * we're the generator because the sender and receiver both use the
- * multiplexed I/O setup. */
+/* Setup the fd used to receive MSG_* messages.  Only needed during the
+ * early stages of being a local sender (up through the sending of the
+ * file list) or when we're the generator (to fetch the messages from
+ * the receiver). */
 void set_msg_fd_in(int fd)
 {
        msg_fd_in = fd;
 }
 
-/** Setup the fd used to send our MSG_* messages.  Only needed when
- * we're the receiver because the generator and the sender both use
- * the multiplexed I/O setup. */
+/* Setup the fd used to send our MSG_* messages.  Only needed when
+ * we're the receiver (to send our messages to the generator). */
 void set_msg_fd_out(int fd)
 {
        msg_fd_out = fd;
@@ -205,8 +207,10 @@ void send_msg(enum msgcode code, char *buf, int len)
        msg_list_push(NORMAL_FLUSH);
 }
 
-/** Read a message from the MSG_* fd and dispatch it.  This is only
- * called by the generator. */
+/* Read a message from the MSG_* fd and handle it.  This is called either
+ * during the early stages of being a local sender (up through the sending
+ * of the file list) or when we're the generator (to fetch the messages
+ * from the receiver). */
 static void read_msg_fd(void)
 {
        char buf[2048];
@@ -226,14 +230,14 @@ static void read_msg_fd(void)
 
        switch (tag) {
        case MSG_DONE:
-               if (len != 0) {
+               if (len != 0 || !am_generator) {
                        rprintf(FERROR, "invalid message %d:%d\n", tag, len);
                        exit_cleanup(RERR_STREAMIO);
                }
                redo_list_add(-1);
                break;
        case MSG_REDO:
-               if (len != 4) {
+               if (len != 4 || !am_generator) {
                        rprintf(FERROR, "invalid message %d:%d\n", tag, len);
                        exit_cleanup(RERR_STREAMIO);
                }
@@ -676,8 +680,9 @@ static int readfd_unbuffered(int fd, char *buf, size_t len)
                case MSG_INFO:
                case MSG_ERROR:
                        if (remaining >= sizeof line) {
-                               rprintf(FERROR, "multiplexing overflow %d:%ld\n\n",
-                                       tag, (long)remaining);
+                               rprintf(FERROR,
+                                       "[%s] multiplexing overflow %d:%ld\n\n",
+                                       who_am_i(), tag, (long)remaining);
                                exit_cleanup(RERR_STREAMIO);
                        }
                        read_loop(fd, line, remaining);
@@ -685,7 +690,8 @@ static int readfd_unbuffered(int fd, char *buf, size_t len)
                        remaining = 0;
                        break;
                default:
-                       rprintf(FERROR, "unexpected tag %d\n", tag);
+                       rprintf(FERROR, "[%s] unexpected tag %d\n",
+                               who_am_i(), tag);
                        exit_cleanup(RERR_STREAMIO);
                }
        }
@@ -774,6 +780,30 @@ unsigned char read_byte(int f)
        return c;
 }
 
+/* Populate a sum_struct with values from the socket.  This is
+ * called by both the sender and the receiver. */
+void read_sum_head(int f, struct sum_struct *sum)
+{
+       sum->count = read_int(f);
+       sum->blength = read_int(f);
+       if (sum->blength < 0 || sum->blength > MAX_BLOCK_SIZE) {
+               rprintf(FERROR, "Invalid block length %ld\n",
+                   (long)sum->blength);
+               exit_cleanup(RERR_PROTOCOL);
+       }
+       sum->s2length = protocol_version < 27 ? csum_length : (int)read_int(f);
+       if (sum->s2length < 0 || sum->s2length > MD4_SUM_LENGTH) {
+               rprintf(FERROR, "Invalid checksum length %d\n", sum->s2length);
+               exit_cleanup(RERR_PROTOCOL);
+       }
+       sum->remainder = read_int(f);
+       if (sum->remainder < 0 || sum->remainder > sum->blength) {
+               rprintf(FERROR, "Invalid remainder length %ld\n",
+                   (long)sum->remainder);
+               exit_cleanup(RERR_PROTOCOL);
+       }
+}
+
 
 /**
  * Sleep after writing to limit I/O bandwidth usage.
@@ -913,7 +943,7 @@ static void writefd_unbuffered(int fd,char *buf,size_t len)
                        /* If the other side is sending us error messages, try
                         * to grab any messages they sent before they died. */
                        while (fd == sock_f_out && io_multiplexing_in) {
-                               io_timeout = 30;
+                               io_timeout = select_timeout = 30;
                                readfd_unbuffered(sock_f_in, io_filesfrom_buf,
                                                  sizeof io_filesfrom_buf);
                        }