this is a large commit which adds io multiplexing, thus giving error

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 121252b..b8baa33 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -33,6 +33,8 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        char line[MAXPATHLEN];
        char *p, *user=NULL;
        extern int remote_version;
+       extern int am_client;
+       extern int am_sender;
 
        p = strchr(host, '@');
        if (p) {
@@ -44,6 +46,8 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        if (!user) user = getenv("USER");
        if (!user) user = getenv("LOGNAME");
 
+       am_client = 1;
+
        fd = open_socket_out(host, rsync_port);
        if (fd == -1) {
                exit_cleanup(1);
@@ -92,6 +96,9 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        }
        io_printf(fd,"\n");
 
+       if (remote_version > 17 && !am_sender)
+               io_start_multiplex_in(fd);
+
        return client_run(fd, fd, -1, argc, argv);
 }
 
@@ -109,7 +116,11 @@ static int rsync_module(int fd, int i)
        char *addr = client_addr(fd);
        char *host = client_name(fd);
        char *name = lp_name(i);
+       char *user;
        int start_glob=0;
+       char *request=NULL;
+       extern int am_sender;
+       extern int remote_version;
 
        if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
                rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
@@ -119,13 +130,6 @@ static int rsync_module(int fd, int i)
                return -1;
        }
 
-       if (!auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ")) {
-               rprintf(FERROR,"auth failed on module %s from %s (%s)\n",
-                       name, client_name(fd), client_addr(fd));
-               io_printf(fd,"@ERROR: auth failed on module %s\n",name);
-               return -1;              
-       }
-
        if (!claim_connection(lp_lock_file(), lp_max_connections())) {
                rprintf(FERROR,"max connections (%d) reached\n",
                        lp_max_connections());
@@ -134,6 +138,15 @@ static int rsync_module(int fd, int i)
        }
 
        
+       user = auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ");
+
+       if (!user) {
+               rprintf(FERROR,"auth failed on module %s from %s (%s)\n",
+                       name, client_name(fd), client_addr(fd));
+               io_printf(fd,"@ERROR: auth failed on module %s\n",name);
+               return -1;              
+       }
+
        module_id = i;
 
        if (lp_read_only(i))
@@ -211,8 +224,7 @@ static int rsync_module(int fd, int i)
 
                if (start_glob) {
                        if (start_glob == 1) {
-                               rprintf(FINFO,"rsync on %s from %s (%s)\n",
-                                       p, host, addr);
+                               request = strdup(p);
                                start_glob++;
                        }
                        glob_expand(name, argv, &argc, MAX_ARGS);
@@ -231,6 +243,19 @@ static int rsync_module(int fd, int i)
 
        parse_arguments(argc, argv);
 
+       if (request) {
+               if (*user) {
+                       rprintf(FINFO,"rsync %s %s from %s@%s (%s)\n",
+                               am_sender?"on":"to",
+                               request, user, host, addr);
+               } else {
+                       rprintf(FINFO,"rsync %s %s from %s (%s)\n",
+                               am_sender?"on":"to",
+                               request, host, addr);
+               }
+               free(request);
+       }
+
        /* don't allow the logs to be flooded too fast */
        if (verbose > 1) verbose = 1;
 
@@ -238,6 +263,9 @@ static int rsync_module(int fd, int i)
        argp = argv + optind;
        optind = 0;
 
+       if (remote_version > 17 && am_sender)
+               io_start_multiplex_out(fd);
+
        start_server(fd, fd, argc, argp);
 
        return 0;
@@ -271,6 +299,8 @@ static int start_daemon(int fd)
        }
 
        set_socket_options(fd,"SO_KEEPALIVE");
+       set_socket_options(fd,lp_socket_options());
+       
 
        io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);