Handle the new MSG_SUCCESS message for both the generator and the
authorWayne Davison <wayned@samba.org>
Sun, 20 Feb 2005 01:04:46 +0000 (01:04 +0000)
committerWayne Davison <wayned@samba.org>
Sun, 20 Feb 2005 01:04:46 +0000 (01:04 +0000)
sender.

io.c

diff --git a/io.c b/io.c
index f01353f..7e02d34 100644 (file)
--- a/io.c
+++ b/io.c
@@ -256,6 +256,14 @@ static void read_msg_fd(void)
                read_loop(fd, buf, len);
                io_multiplex_write(MSG_DELETED, buf, len);
                break;
+       case MSG_SUCCESS:
+               if (len != 4 || !am_generator) {
+                       rprintf(FERROR, "invalid message %d:%d\n", tag, len);
+                       exit_cleanup(RERR_STREAMIO);
+               }
+               read_loop(fd, buf, len);
+               io_multiplex_write(MSG_SUCCESS, buf, len);
+               break;
        case MSG_INFO:
        case MSG_ERROR:
        case MSG_LOG:
@@ -704,6 +712,16 @@ static int readfd_unbuffered(int fd, char *buf, size_t len)
                                log_delete(line, S_IFREG);
                        remaining = 0;
                        break;
+               case MSG_SUCCESS:
+                       if (remaining != 4) {
+                               rprintf(FERROR, "invalid multi-message %d:%ld\n",
+                                       tag, (long)remaining);
+                               exit_cleanup(RERR_STREAMIO);
+                       }
+                       read_loop(fd, line, remaining);
+                       successful_send(IVAL(line, 0));
+                       remaining = 0;
+                       break;
                case MSG_INFO:
                case MSG_ERROR:
                        if (remaining >= sizeof line) {