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 95ca7b6..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);
@@ -99,6 +99,22 @@ static int rsync_module(int fd, int i)
        uid_t uid;
        gid_t gid;
        char *p;
+       char *addr = client_addr(fd);
+       char *host = client_name(fd);
+
+       if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
+               rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
+                       lp_name(i), client_name(fd), client_addr(fd));
+               return -1;
+       }
+
+       if (!claim_connection(lp_lock_file(), lp_max_connections())) {
+               rprintf(FERROR,"ERROR: max connections reached\n");
+               return -1;
+       }
+
+       rprintf(FINFO,"rsync on module %s from %s (%s)\n",
+               lp_name(i), host, addr);
 
        module_id = i;
 
@@ -123,8 +139,6 @@ static int rsync_module(int fd, int i)
                gid = atoi(p);
        }
 
-       rprintf(FERROR,"rsyncd starting\n");
-
        if (chroot(lp_path(i))) {
                io_printf(fd,"@ERROR: chroot failed\n");
                return -1;
@@ -200,21 +214,18 @@ 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);
+       }
 
        set_socket_options(fd,"SO_KEEPALIVE");
 
        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");
@@ -229,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;
@@ -260,12 +279,6 @@ static int start_daemon(int fd)
 
 int daemon_main(void)
 {
-       extern char *config_file;
-
-       if (!lp_load(config_file)) {
-               exit_cleanup(1);
-       }
-
        if (is_a_socket(STDIN_FILENO)) {
                /* we are running via inetd */
                return start_daemon(STDIN_FILENO);