Another size_t warning

[rsync/rsync.git] / socket.c

diff --git a/socket.c b/socket.c
index 8f8d96d..2194c2d 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -35,15 +35,6 @@
 
 static const char default_name[] = "UNKNOWN";
 
-static int lookup_name(const struct sockaddr_storage *ss,
-                      socklen_t ss_len,
-                      char *name_buf, size_t name_buf_len,
-                      char *port_buf, size_t port_buf_len);
-
-static int check_name(const struct sockaddr_storage *ss,
-                     socklen_t ss_len,
-                     char *name_buf,
-                     const char *port_buf);
 
 /* Establish a proxy connection on an open socket to a web roxy by
  * using the CONNECT method. */
@@ -53,7 +44,7 @@ static int establish_proxy_connection(int fd, char *host, int port)
        char *cp;
 
        snprintf(buffer, sizeof(buffer), "CONNECT %s:%d HTTP/1.0\r\n\r\n", host, port);
-       if (write(fd, buffer, strlen(buffer)) != strlen(buffer)) {
+       if (write(fd, buffer, strlen(buffer)) != (int) strlen(buffer)) {
                rprintf(FERROR, "failed to write to proxy: %s\n",
                        strerror(errno));
                return -1;
@@ -637,8 +628,8 @@ char *client_name(int fd)
                exit_cleanup(RERR_SOCKETIO);
        }
 
-       if (!lookup_name(&ss, ss_len, name_buf, sizeof name_buf, port_buf, sizeof port_buf))
-               check_name(&ss, ss_len, name_buf, port_buf);
+       if (!lookup_name(fd, &ss, ss_len, name_buf, sizeof name_buf, port_buf, sizeof port_buf))
+               check_name(fd, &ss, ss_len, name_buf, port_buf);
 
        return name_buf;
 }
@@ -647,10 +638,10 @@ char *client_name(int fd)
 /**
  * Look up a name from @p ss into @p name_buf.
  **/
-static int lookup_name(const struct sockaddr_storage *ss,
-                      socklen_t ss_len,
-                      char *name_buf, size_t name_buf_len,
-                      char *port_buf, size_t port_buf_len)
+int lookup_name(int fd, const struct sockaddr_storage *ss,
+               socklen_t ss_len,
+               char *name_buf, size_t name_buf_len,
+               char *port_buf, size_t port_buf_len)
 {
        int name_err;
        
@@ -690,7 +681,8 @@ static int lookup_name(const struct sockaddr_storage *ss,
                               NI_NAMEREQD | NI_NUMERICSERV);
        if (name_err != 0) {
                strcpy(name_buf, default_name);
-               rprintf(FERROR, RSYNC_NAME ": name lookup failed: %s\n",
+               rprintf(FERROR, RSYNC_NAME ": name lookup failed for %s: %s\n",
+                       client_addr(fd),
                        gai_strerror(name_err));
                return name_err;
        }
@@ -703,10 +695,11 @@ static int lookup_name(const struct sockaddr_storage *ss,
 /* Do a forward lookup on name_buf and make sure it corresponds to ss
  * -- otherwise we may be being spoofed.  If we suspect we are, then
  * we don't abort the connection but just emit a warning. */
-static int check_name(const struct sockaddr_storage *ss,
-                     socklen_t ss_len,
-                     char *name_buf,
-                     const char *port_buf)
+int check_name(int fd,
+              const struct sockaddr_storage *ss,
+              socklen_t ss_len,
+              char *name_buf,
+              const char *port_buf)
 {
        struct addrinfo hints, *res, *res0;
        int error;
@@ -717,11 +710,11 @@ static int check_name(const struct sockaddr_storage *ss,
        hints.ai_socktype = SOCK_STREAM;
        error = getaddrinfo(name_buf, port_buf, &hints, &res0);
        if (error) {
-               strcpy(name_buf, default_name);
                rprintf(FERROR,
                        RSYNC_NAME ": forward name lookup for %s:%s failed: %s\n",
                        name_buf, port_buf,
                        gai_strerror(error));
+               strcpy(name_buf, default_name);
                return error;
        }
 
@@ -737,12 +730,14 @@ static int check_name(const struct sockaddr_storage *ss,
        }
 
        if (res == NULL) {
-               strcpy(name_buf, default_name);
                /* We hit the end of the list without finding an
                 * address that was the same as ss. */
                rprintf(FERROR, RSYNC_NAME
-                       ": no address record for \"%s\" corresponds to peer name: spoofed address?\n",
+                       ": %s is not a known address for \"%s\": "
+                       "spoofed address?\n",
+                       client_addr(fd),
                        name_buf);
+               strcpy(name_buf, default_name);
        }
 
        freeaddrinfo(res0);
@@ -820,8 +815,8 @@ static int socketpair_tcp(int fd[2])
 
 /**
  * Run a program on a local tcp socket, so that we can talk to it's
- * stdin and stdout.  This is used to launch ssh and similar
- * connection helper programs for rsync.
+ * stdin and stdout.  This is used to fake a connection to a daemon
+ * for testing -- not for the normal case of running SSH.
  *
  * @return a socket which is attached to a subprocess running
  * "prog". stdin and stdout are attached. stderr is left attached to
@@ -830,6 +825,7 @@ static int socketpair_tcp(int fd[2])
 int sock_exec(const char *prog)
 {
        int fd[2];
+       
        if (socketpair_tcp(fd) != 0) {
                rprintf (FERROR, RSYNC_NAME
                         ": socketpair_tcp failed (%s)\n",
@@ -842,10 +838,12 @@ int sock_exec(const char *prog)
                close(1);
                dup(fd[1]);
                dup(fd[1]);
-               if (verbose > 3)
+               if (verbose > 3) {
+                       /* Can't use rprintf because we've forked. */
                        fprintf (stderr,
                                 RSYNC_NAME ": execute socket program \"%s\"\n",
                                 prog);
+               }
                exit (system (prog));
        }
        close (fd[1]);