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

This commit is contained in:
Wayne Davison committed 2005-02-25 21:56:00 +00:00
1 parent d17190df44
commit 8e6cf5d189
2 files changed
+11

No files matched your search

+4
View File
@@ -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);
+7
View File
@@ -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);