Doc.

[rsync/rsync.git] / socket.c

diff --git a/socket.c b/socket.c
index 48991d3..8a54911 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -1,7 +1,9 @@
 /* -*- c-file-style: "linux" -*-
    
+   rsync -- fast file replication program
+   
    Copyright (C) 1992-2001 by Andrew Tridgell <tridge@samba.org>
-   Copyright (C) 2001 by Martin Pool <mbp@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
@@ -22,6 +24,11 @@
  * @file socket.c
  * 
  * Socket functions used in rsync.
+ *
+ * This file is now converted to use the new-style getaddrinfo()
+ * interface, which supports IPv6 but is also supported on recent
+ * IPv4-only machines.  On systems that don't have that interface, we
+ * emulate it using the KAME implementation.
  **/
 
 #include "rsync.h"
@@ -105,7 +112,7 @@ int try_bind_local(int s,
        bhints.ai_family = ai_family;
        bhints.ai_socktype = ai_socktype;
        bhints.ai_flags = AI_PASSIVE;
-       if (getaddrinfo(bind_address, NULL, &bhints, &bres_all) == -1) {
+       if ((error = getaddrinfo(bind_address, NULL, &bhints, &bres_all))) {
                rprintf(FERROR, RSYNC_NAME ": getaddrinfo %s: %s\n",
                        bind_address, gai_strerror(error));
                return -1;
@@ -150,7 +157,6 @@ int open_socket_out(char *host, int port, const char *bind_address,
        int type = SOCK_STREAM;
        int error;
        int s;
-       int result;
        struct addrinfo hints, *res0, *res;
        char portbuf[10];
        char *h;
@@ -382,7 +388,7 @@ void start_accept_loop(int port, int (*fn)(int ))
                fd_set fds;
                int fd;
                struct sockaddr_storage addr;
-               int addrlen = sizeof(addr);
+               socklen_t addrlen = sizeof addr;
 
                /* close log file before the potentially very long select so
                   file can be trimmed by another process instead of growing
@@ -565,7 +571,7 @@ void become_daemon(void)
 char *client_addr(int fd)
 {
        struct sockaddr_storage ss;
-       int     length = sizeof(ss);
+       socklen_t length = sizeof ss;
        static char addr_buf[100];
        static int initialised;
 
@@ -590,12 +596,15 @@ static int get_sockaddr_family(const struct sockaddr_storage *ss)
 
 
 /**
- * Return the DNS name of the client 
+ * Return the DNS name of the client.
+ *
+ * The name is statically cached so that repeated lookups are quick,
+ * so there is a limit of one lookup per customer.
  **/
 char *client_name(int fd)
 {
        struct sockaddr_storage ss;
-       int     length = sizeof(ss);
+       socklen_t length = sizeof ss;
        static char name_buf[100];
        static char port_buf[100];
        char *def = "UNKNOWN";
@@ -619,6 +628,12 @@ char *client_name(int fd)
 #ifdef INET6
         if (get_sockaddr_family(&ss) == AF_INET6 && 
            IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)&ss)->sin6_addr)) {
+               /* OK, so ss is in the IPv6 family, but it is really
+                * an IPv4 address: something like
+                * "::ffff:10.130.1.2".  If we use it as-is, then the
+                * reverse lookup might fail or perhaps something else
+                * bad might happen.  So instead we convert it to an
+                * equivalent address in the IPv4 address family.  */
                struct sockaddr_in6 sin6;
                struct sockaddr_in *sin;
 
@@ -631,6 +646,9 @@ char *client_name(int fd)
                sin->sin_len = length;
 #endif
                sin->sin_port = sin6.sin6_port;
+               /* FIXME: Isn't there a macro we can use here rather
+                * than grovelling through the struct?  It might be
+                * wrong on some systems. */
                memcpy(&sin->sin_addr, &sin6.sin6_addr.s6_addr[12],
                        sizeof(sin->sin_addr));
         }
@@ -669,13 +687,11 @@ char *client_name(int fd)
                        break;
        }
 
-       /* TODO: Do a  forward lookup as well to prevent spoofing */
-
        if (res == NULL) {
                strcpy(name_buf, def);
                rprintf(FERROR, RSYNC_NAME ": "
-                       "reverse name lookup mismatch on fd%d - spoofed address?\n",
-                       fd);
+                       "reverse name lookup for \"%s\" failed on fd%d - spoofed address? \n",
+                       name_buf, fd);
        }
 
        freeaddrinfo(res0);