* Don't call getnameinfo() if we've already populated the addr_buf.

[rsync/rsync.git] / clientname.c

diff --git a/clientname.c b/clientname.c
index 8d22fc8..95dadd5 100644 (file)
--- a/clientname.c
+++ b/clientname.c
@@ -34,6 +34,8 @@
 #include "rsync.h"
 
 static const char default_name[] = "UNKNOWN";
+extern int am_daemon;
+extern int am_server;
 
 
 /**
@@ -44,6 +46,7 @@ char *client_addr(int fd)
        struct sockaddr_storage ss;
        socklen_t length = sizeof ss;
        char *ssh_client, *p;
+       int len;
        static char addr_buf[100];
        static int initialised;
 
@@ -51,20 +54,24 @@ char *client_addr(int fd)
 
        initialised = 1;
 
-       ssh_client = getenv("SSH_CLIENT");
-       if (ssh_client != NULL) {
-               strlcpy(addr_buf, ssh_client, sizeof(addr_buf));
-               /* truncate SSH_CLIENT to just IP address */
-               p = strchr(addr_buf, ' ');
-               if (p)
-                       *p = '\0';
-               else
-                       strlcpy(addr_buf, "0.0.0.0", sizeof("0.0.0.0"));
-       } else
+       if (am_server) {
+               /* daemon over --rsh mode */
+               strcpy(addr_buf, "0.0.0.0");
+               if ((ssh_client = getenv("SSH_CLIENT")) != NULL) {
+                       /* truncate SSH_CLIENT to just IP address */
+                       p = strchr(ssh_client, ' ');
+                       if (p) {
+                               len = MIN((unsigned int) (p - ssh_client), 
+                                               sizeof(addr_buf) - 1);
+                               strncpy(addr_buf, ssh_client, len);
+                               *(addr_buf + len) = '\0';
+                       }
+               }
+       } else {
                client_sockaddr(fd, &ss, &length);
-
-       getnameinfo((struct sockaddr *)&ss, length,
-               addr_buf, sizeof(addr_buf), NULL, 0, NI_NUMERICHOST);
+               getnameinfo((struct sockaddr *)&ss, length,
+                           addr_buf, sizeof addr_buf, NULL, 0, NI_NUMERICHOST);
+       }
 
        return addr_buf;
 }
@@ -94,41 +101,59 @@ char *client_name(int fd)
        static char name_buf[100];
        static char port_buf[100];
        static int initialised;
+       struct sockaddr_storage ss, *ssp;
+       struct sockaddr_in sin;
+#ifdef INET6
+       struct sockaddr_in6 sin6;
+#endif
+       socklen_t ss_len;
 
        if (initialised) return name_buf;
 
        strcpy(name_buf, default_name);
        initialised = 1;
 
-       if (getenv("SSH_CLIENT") != NULL) {
-               /* Look up name of IP address given in $SSH_CLIENT */
+       if (am_server) {
+               /* daemon over --rsh mode */
+
+               char *addr = client_addr(fd);
 #ifdef INET6
-               int af = AF_INET6;
-               struct sockaddr_in6 sin;
-#else
-               int af = AF_INET;
-               struct sockaddr_in sin;
+               int dots = 0;
+               char *p;
+
+               for (p = addr; *p && (dots <= 3); p++) {
+                   if (*p == '.')
+                       dots++;
+               }
+               if (dots > 3) {
+                       /* more than 4 parts to IP address, must be ipv6 */
+                       ssp = (struct sockaddr_storage *) &sin6;
+                       ss_len = sizeof sin6;
+                       memset(ssp, 0, ss_len);
+                       inet_pton(AF_INET6, addr, &sin6.sin6_addr.s6_addr);
+                       sin6.sin6_family = AF_INET6;
+               } else
 #endif
-               socklen_t sin_len = sizeof sin;
+               {
+                       ssp = (struct sockaddr_storage *) &sin;
+                       ss_len = sizeof sin;
+                       memset(ssp, 0, ss_len);
+                       inet_pton(AF_INET, addr, &sin.sin_addr.s_addr);
+                       sin.sin_family = AF_INET;
+               }
 
-               memset(&sin, 0, sin_len);
-               sin.sin_family = af;
-               inet_pton(af, client_addr(fd), &sin.sin_addr.s_addr);
-
-               if (!lookup_name(fd, (struct sockaddr_storage *)&sin, sin_len, 
-                               name_buf, sizeof name_buf, port_buf, sizeof port_buf))
-                       check_name(fd, (struct sockaddr_storage *)&sin, name_buf);
        } else {
-               struct sockaddr_storage ss;
-               socklen_t ss_len = sizeof ss;
+               ss_len = sizeof ss;
+               ssp = &ss;
 
                client_sockaddr(fd, &ss, &ss_len);
 
-               if (!lookup_name(fd, &ss, ss_len, name_buf, sizeof name_buf, 
-                               port_buf, sizeof port_buf))
-                       check_name(fd, &ss, name_buf);
        }
 
+       if (!lookup_name(fd, ssp, ss_len, name_buf, sizeof name_buf, 
+                       port_buf, sizeof port_buf))
+               check_name(fd, ssp, name_buf);
+
        return name_buf;
 }