Accept the new keep-alive (no-op) packet.

diff --git a/receiver.c b/receiver.c
index 1779d17..fd75e8e 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -426,6 +426,10 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
                }
 
                if (i < 0 || i >= flist->count) {
+                       /* Handle the new keep-alive (no-op) packet. */
+                       if (i == flist->count && protocol_version >= 29
+                           && read_shortint(f_in) == ITEM_IS_NEW)
+                               continue;
                        rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n",
                                i, flist->count);
                        exit_cleanup(RERR_PROTOCOL);

diff --git a/sender.c b/sender.c
index ca6ae1e..b745f6f 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -167,6 +167,13 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                }
 
                if (i < 0 || i >= flist->count) {
+                       /* Handle the new keep-alive (no-op) packet. */
+                       if (i == flist->count && protocol_version >= 29
+                           && read_shortint(f_in) == ITEM_IS_NEW) {
+                               write_int(f_out, i);
+                               write_shortint(f_out, ITEM_IS_NEW);
+                               continue;
+                       }
                        rprintf(FERROR, "Invalid file index %d (count=%d)\n",
                                i, flist->count);
                        exit_cleanup(RERR_PROTOCOL);