A couple more minor twiddles.

[rsync/rsync.git] / clientname.c

diff --git a/clientname.c b/clientname.c
index 95dadd5..22c7750 100644 (file)
--- a/clientname.c
+++ b/clientname.c
@@ -1,20 +1,20 @@
 /* -*- c-file-style: "linux" -*-
-   
+
    rsync -- fast file replication program
-   
+
    Copyright (C) 1992-2001 by Andrew Tridgell <tridge@samba.org>
    Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -22,7 +22,7 @@
 
 /**
  * @file clientname.c
- * 
+ *
  * Functions for looking up the remote name or addr of a socket.
  *
  * This file is now converted to use the new-style getaddrinfo()
@@ -39,7 +39,7 @@ extern int am_server;
 
 
 /**
- * Return the IP addr of the client as a string 
+ * Return the IP addr of the client as a string
  **/
 char *client_addr(int fd)
 {
@@ -50,7 +50,8 @@ char *client_addr(int fd)
        static char addr_buf[100];
        static int initialised;
 
-       if (initialised) return addr_buf;
+       if (initialised)
+               return addr_buf;
 
        initialised = 1;
 
@@ -61,8 +62,8 @@ char *client_addr(int fd)
                        /* truncate SSH_CLIENT to just IP address */
                        p = strchr(ssh_client, ' ');
                        if (p) {
-                               len = MIN((unsigned int) (p - ssh_client), 
-                                               sizeof(addr_buf) - 1);
+                               len = MIN((unsigned int) (p - ssh_client),
+                                   sizeof addr_buf - 1);
                                strncpy(addr_buf, ssh_client, len);
                                *(addr_buf + len) = '\0';
                        }
@@ -108,7 +109,8 @@ char *client_name(int fd)
 #endif
        socklen_t ss_len;
 
-       if (initialised) return name_buf;
+       if (initialised)
+               return name_buf;
 
        strcpy(name_buf, default_name);
        initialised = 1;
@@ -130,7 +132,7 @@ char *client_name(int fd)
                        ssp = (struct sockaddr_storage *) &sin6;
                        ss_len = sizeof sin6;
                        memset(ssp, 0, ss_len);
-                       inet_pton(AF_INET6, addr, &sin6.sin6_addr.s6_addr);
+                       inet_pton(AF_INET6, addr, &sin6.sin6_addr);
                        sin6.sin6_family = AF_INET6;
                } else
 #endif
@@ -138,7 +140,7 @@ char *client_name(int fd)
                        ssp = (struct sockaddr_storage *) &sin;
                        ss_len = sizeof sin;
                        memset(ssp, 0, ss_len);
-                       inet_pton(AF_INET, addr, &sin.sin_addr.s_addr);
+                       inet_pton(AF_INET, addr, &sin.sin_addr);
                        sin.sin_family = AF_INET;
                }
 
@@ -150,7 +152,7 @@ char *client_name(int fd)
 
        }
 
-       if (!lookup_name(fd, ssp, ss_len, name_buf, sizeof 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);
 
@@ -169,6 +171,8 @@ void client_sockaddr(int fd,
                     struct sockaddr_storage *ss,
                     socklen_t *ss_len)
 {
+       memset(ss, 0, sizeof *ss);
+
        if (getpeername(fd, (struct sockaddr *) ss, ss_len)) {
                /* FIXME: Can we really not continue? */
                rprintf(FERROR, RSYNC_NAME ": getpeername on fd%d failed: %s\n",
@@ -188,12 +192,12 @@ void client_sockaddr(int fd,
                struct sockaddr_in6 sin6;
                struct sockaddr_in *sin;
 
-               memcpy(&sin6, ss, sizeof(sin6));
+               memcpy(&sin6, ss, sizeof sin6);
                sin = (struct sockaddr_in *)ss;
-               memset(sin, 0, sizeof(*sin));
+               memset(sin, 0, sizeof *sin);
                sin->sin_family = AF_INET;
-               *ss_len = sizeof(struct sockaddr_in);
-#ifdef HAVE_SOCKADDR_LEN
+               *ss_len = sizeof (struct sockaddr_in);
+#if HAVE_SOCKADDR_IN_LEN
                sin->sin_len = *ss_len;
 #endif
                sin->sin_port = sin6.sin6_port;
@@ -202,7 +206,7 @@ void client_sockaddr(int fd,
                 * (IN6_V4MAPPED_TO_SINADDR ?), but it does not seem
                 * to be present in the Linux headers. */
                memcpy(&sin->sin_addr, &sin6.sin6_addr.s6_addr[12],
-                       sizeof(sin->sin_addr));
+                   sizeof sin->sin_addr);
         }
 #endif
 }
@@ -219,7 +223,7 @@ int lookup_name(int fd, const struct sockaddr_storage *ss,
                char *port_buf, size_t port_buf_len)
 {
        int name_err;
-       
+
        /* reverse lookup */
        name_err = getnameinfo((struct sockaddr *) ss, ss_len,
                               name_buf, name_buf_len,
@@ -248,7 +252,7 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai,
 {
        int ss_family = get_sockaddr_family(ss);
        const char fn[] = "compare_addrinfo_sockaddr";
-                     
+
        if (ai->ai_family != ss_family) {
                rprintf(FERROR,
                        "%s: response family %d != %d\n",
@@ -262,7 +266,7 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai,
 
                sin1 = (const struct sockaddr_in *) ss;
                sin2 = (const struct sockaddr_in *) ai->ai_addr;
-               
+
                return memcmp(&sin1->sin_addr, &sin2->sin_addr,
                              sizeof sin1->sin_addr);
        }
@@ -272,9 +276,23 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai,
 
                sin1 = (const struct sockaddr_in6 *) ss;
                sin2 = (const struct sockaddr_in6 *) ai->ai_addr;
-               
-               return memcmp(&sin1->sin6_addr, &sin2->sin6_addr,
-                             sizeof sin1->sin6_addr);
+
+               if (ai->ai_addrlen < sizeof (struct sockaddr_in6)) {
+                       rprintf(FERROR,
+                               "%s: too short sockaddr_in6; length=%d\n",
+                               fn, ai->ai_addrlen);
+                       return 1;
+               }
+
+               if (memcmp(&sin1->sin6_addr, &sin2->sin6_addr,
+                          sizeof sin1->sin6_addr))
+                       return 1;
+
+#ifdef HAVE_SOCKADDR_IN6_SCOPE_ID
+               if (sin1->sin6_scope_id != sin2->sin6_scope_id)
+                       return 1;
+#endif
+               return 0;
        }
 #endif /* INET6 */
        else {
@@ -302,7 +320,7 @@ int check_name(int fd,
        int error;
        int ss_family = get_sockaddr_family(ss);
 
-       memset(&hints, 0, sizeof(hints));
+       memset(&hints, 0, sizeof hints);
        hints.ai_family = ss_family;
        hints.ai_flags = AI_CANONNAME;
        hints.ai_socktype = SOCK_STREAM;