if (protocol_version < 23) {
if (protocol_version == 22 || !am_sender)
- io_start_multiplex_in(f_in);
+ io_start_multiplex_in();
}
return 0;
if (protocol_version < 23
&& (protocol_version == 22 || am_sender))
- io_start_multiplex_out(f_out);
+ io_start_multiplex_out();
else if (!ret) {
/* We have to get I/O multiplexing started so that we can
* get the error back to the client. This means getting
* the protocol setup finished first in later versions. */
setup_protocol(f_out, f_in);
- io_start_multiplex_out(f_out);
+ io_start_multiplex_out();
}
if (!ret) {
char *motd;
int i = -1;
+ io_set_sock_fds(f_in, f_out);
+
if (!lp_load(config_file, 0))
exit_cleanup(RERR_SYNTAX);
exit_cleanup(0);
}
- io_start_buffering_in(f_in);
- io_start_buffering_out(f_out);
+ io_start_buffering_in();
+ io_start_buffering_out();
+
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
report(f_out);
if (f_in != f_out)
close(f_in);
- io_start_buffering_out(f_out);
+ io_start_buffering_out();
set_msg_fd_in(error_pipe[0]);
}
}
- io_start_buffering_in(f_in);
+ io_start_buffering_in();
if (delete_mode && !delete_excluded)
recv_exclude_list(f_in);
void start_server(int f_in, int f_out, int argc, char *argv[])
{
- setup_protocol(f_out, f_in);
-
set_nonblocking(f_in);
set_nonblocking(f_out);
+ io_set_sock_fds(f_in, f_out);
+ setup_protocol(f_out, f_in);
+
if (protocol_version >= 23)
- io_start_multiplex_out(f_out);
+ io_start_multiplex_out();
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
set_nonblocking(f_out);
}
+ io_set_sock_fds(f_in, f_out);
setup_protocol(f_out,f_in);
if (protocol_version >= 23 && !read_batch)
- io_start_multiplex_in(f_in);
+ io_start_multiplex_in();
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
- io_start_buffering_out(f_out);
+ io_start_buffering_out();
if (cvs_exclude)
add_cvs_excludes();
if (delete_mode && !delete_excluded)