summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-05-13 09:08:05 +0000
committerAndrew Tridgell <tridge@samba.org>1998-05-13 09:08:05 +0000
commit91eee5946ad6d033303abfe184085c87a283da29 (patch)
tree30f6b0aa3d2921d97feb9dbc40b736f2a7c56c09
parent6c8f5373023d19f0bcc39e2fdb0aacf0652d40e5 (diff)
downloadrsync-91eee5946ad6d033303abfe184085c87a283da29.tar.gz
save another couple of round trip latencies. This set of changes is
backwards compatible.
-rw-r--r--clientserver.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/clientserver.c b/clientserver.c
index 78e2104d..39e5b90d 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -48,6 +48,8 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
sargs[sargc] = NULL;
+ io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
+
if (!read_line(fd, line, sizeof(line)-1)) {
return -1;
}
@@ -56,8 +58,6 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
return -1;
}
- io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
-
p = strchr(path,'/');
if (p) *p = 0;
io_printf(fd,"%s\n",path);
@@ -226,14 +226,6 @@ static int start_daemon(int fd)
io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
- if (!read_line(fd, line, sizeof(line)-1)) {
- return -1;
- }
-
- if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
- return -1;
- }
-
motd = lp_motd_file();
if (*motd) {
FILE *f = fopen(motd,"r");
@@ -248,6 +240,14 @@ static int start_daemon(int fd)
io_printf(fd,"\n");
}
+ if (!read_line(fd, line, sizeof(line)-1)) {
+ return -1;
+ }
+
+ if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
+ return -1;
+ }
+
while (i == -1) {
line[0] = 0;