Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
For the "unexpected tag" or "multiplexing overflow" messages, we
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
339c15d
..
ec74054
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-43,6
+43,7
@@
extern int filesfrom_fd;
extern int remote_protocol;
extern int protocol_version;
extern int io_timeout;
extern int remote_protocol;
extern int protocol_version;
extern int io_timeout;
+extern int select_timeout;
extern int orig_umask;
extern int no_detach;
extern int default_af_hint;
extern int orig_umask;
extern int no_detach;
extern int default_af_hint;
@@
-88,6
+89,9
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
*p = '\0';
}
*p = '\0';
}
+ if (rsync_port == 0)
+ rsync_port = RSYNC_PORT;
+
fd = open_socket_out_wrapped(host, rsync_port, bind_address,
default_af_hint);
if (fd == -1)
fd = open_socket_out_wrapped(host, rsync_port, bind_address,
default_af_hint);
if (fd == -1)
@@
-473,8
+477,11
@@
static int rsync_module(int f_in, int f_out, int i)
exit_cleanup(RERR_UNSUPPORTED);
}
exit_cleanup(RERR_UNSUPPORTED);
}
- if (lp_timeout(i))
+ if (lp_timeout(i))
{
io_timeout = lp_timeout(i);
io_timeout = lp_timeout(i);
+ if (io_timeout < select_timeout)
+ select_timeout = io_timeout;
+ }
start_server(f_in, f_out, argc, argp);
start_server(f_in, f_out, argc, argp);
@@
-598,6
+605,11
@@
int daemon_main(void)
if (!lp_load(config_file, 1))
exit_cleanup(RERR_SYNTAX);
if (!lp_load(config_file, 1))
exit_cleanup(RERR_SYNTAX);
+ if (rsync_port == 0 && (rsync_port = lp_rsync_port()) == 0)
+ rsync_port = RSYNC_PORT;
+ if (bind_address == NULL && *lp_bind_address())
+ bind_address = lp_bind_address();
+
log_init();
rprintf(FLOG, "rsyncd version %s starting, listening on port %d\n",
log_init();
rprintf(FLOG, "rsyncd version %s starting, listening on port %d\n",