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
save another couple of round trip latencies. This set of changes is
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
78e2104
..
39e5b90
100644
(file)
--- 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;
sargs[sargc] = NULL;
+ io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
+
if (!read_line(fd, line, sizeof(line)-1)) {
return -1;
}
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;
}
return -1;
}
- io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
-
p = strchr(path,'/');
if (p) *p = 0;
io_printf(fd,"%s\n",path);
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);
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");
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");
}
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;
while (i == -1) {
line[0] = 0;