X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6957ae33a931950d03cbba0d0cb78be1920f26f3..6d7b6081ac4c224f571fb7e90d437e3c118fae6c:/main.c

diff --git a/main.c b/main.c
index a5467782..914ab243 100644
--- a/main.c
+++ b/main.c
@@ -294,12 +294,12 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 		}
 	}
 
-	if (pipe(recv_pipe) < 0) {
+	if (fd_pair(recv_pipe) < 0) {
 		rprintf(FERROR,"pipe failed in do_recv\n");
 		exit_cleanup(RERR_SOCKETIO);
 	}
 
-	if (pipe(error_pipe) < 0) {
+	if (fd_pair(error_pipe) < 0) {
 		rprintf(FERROR,"error pipe failed in do_recv\n");
 		exit_cleanup(RERR_SOCKETIO);
 	}
@@ -391,9 +391,13 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
 {
 	extern int cvs_exclude;
 	extern int am_sender;
+	extern int remote_version;
 
 	setup_protocol(f_out, f_in);
 
+	if (remote_version >= 23)
+		io_start_multiplex_out(f_out);
+
 	if (am_sender) {
 		recv_exclude_list(f_in);
 		if (cvs_exclude)
@@ -412,8 +416,12 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
 	char *local_name = NULL;
 	extern int am_sender;
 	extern int list_only;
+	extern int remote_version;
 
 	setup_protocol(f_out,f_in);
+
+	if (remote_version >= 23)
+		io_start_multiplex_in(f_in);
 	
 	if (am_sender) {
 		extern int cvs_exclude;