From 0569a1339d14fd67bce78ef59e584571c11346ca Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Thu, 15 Jan 2004 07:42:25 +0000 Subject: [PATCH] - Got rid of the f_gen pipe. - Use new send_msg() call with MSG_DONE or MSG_REDO. --- receiver.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/receiver.c b/receiver.c index e7fb2112..e38fe5a5 100644 --- a/receiver.c +++ b/receiver.c @@ -280,7 +280,7 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname, * main routine for receiver process. * * Receiver process runs on the same host as the generator process. */ -int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) +int recv_files(int f_in,struct file_list *flist,char *local_name) { int fd1,fd2; STRUCT_STAT st; @@ -314,7 +314,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) csum_length = SUM_LENGTH; if (verbose > 2) rprintf(FINFO,"recv_files phase=%d\n",phase); - write_int(f_gen,-1); + send_msg(MSG_DONE, "", 0); continue; } break; @@ -466,9 +466,11 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n", full_fname(fname)); } else { + char buf[4]; if (verbose > 1) rprintf(FINFO,"redoing %s(%d)\n",fname,i); - write_int(f_gen,i); + SIVAL(buf, 0, i); + send_msg(MSG_REDO, buf, 4); } } } -- 2.34.1