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 18d9494..39e5b90 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -32,7 +32,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        int sargc=0;
        char line[1024];
        char *p;
-       int version;
+       extern int remote_version;
 
        fd = open_socket_out(host, rsync_port);
        if (fd == -1) {
@@ -48,16 +48,16 @@ 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;
        }
 
-       if (sscanf(line,"@RSYNCD: %d", &version) != 1) {
+       if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
                return -1;
        }
 
-       io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
-
        p = strchr(path,'/');
        if (p) *p = 0;
        io_printf(fd,"%s\n",path);
@@ -214,9 +214,9 @@ static int start_daemon(int fd)
 {
        char line[200];
        char *motd;
-       int version;
        int i = -1;
        extern char *config_file;
+       extern int remote_version;
 
        if (!lp_load(config_file)) {
                exit_cleanup(1);
@@ -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", &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;