/* This is only called by the sender. */
-static void read_final_goodbye(int f_in, int f_out, int flist_count)
+static void read_final_goodbye(int f_in, int f_out)
{
int i;
if (protocol_version < 29)
i = read_int(f_in);
else {
- while ((i = read_int(f_in)) == flist_count
+ while ((i = read_int(f_in)) == the_file_list->count
&& read_shortint(f_in) == ITEM_IS_NEW) {
/* Forward the keep-alive (no-op) to the receiver. */
- write_int(f_out, flist_count);
+ write_int(f_out, the_file_list->count);
write_shortint(f_out, ITEM_IS_NEW);
}
}
if (i != -1) {
- rprintf(FERROR, "Invalid packet from generator at end of run.\n");
+ rprintf(FERROR, "Invalid packet at end of run [%s]\n",
+ who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
}
io_flush(FULL_FLUSH);
report(f_out);
if (protocol_version >= 24)
- read_final_goodbye(f_in, f_out, flist->count);
+ read_final_goodbye(f_in, f_out);
io_flush(FULL_FLUSH);
exit_cleanup(0);
}
copy_links = 0;
if (preserve_hard_links)
- init_hard_links(flist);
+ init_hard_links();
if (fd_pair(error_pipe) < 0
|| (need_name_pipe && fd_pair(name_pipe) < 0)) {
while (read_int(f_in) == flist->count
&& read_shortint(f_in) == ITEM_IS_NEW) {}
- rprintf(FERROR, "Invalid packet from server at end of run.\n");
+ rprintf(FERROR, "Invalid packet at end of run [%s]\n",
+ who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
if (protocol_version >= 24)
- read_final_goodbye(f_in, f_out, flist->count);
+ read_final_goodbye(f_in, f_out);
if (pid != -1) {
if (verbose > 3)
rprintf(FINFO,"client_run waiting on %d\n", (int) pid);