Silly autoconf

[rsync/rsync.git] / socket.c

diff --git a/socket.c b/socket.c
index 4d1d421..0595dc2 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -143,7 +143,7 @@ int open_socket_out(char *host, int port, const char *bind_address)
        hints.ai_socktype = type;
        error = getaddrinfo(h, portbuf, &hints, &res0);
        if (error) {
-               rprintf(FERROR, "getaddrinfo: %s\n", gai_strerror(error));
+               rprintf(FERROR, RSYNC_NAME ": getaddrinfo: %s: %s\n", portbuf, gai_strerror(error));
                return -1;
        }
 
@@ -162,11 +162,13 @@ int open_socket_out(char *host, int port, const char *bind_address)
                        bhints.ai_flags = AI_PASSIVE;
                        error = getaddrinfo(bind_address, NULL, &bhints, &bres);
                        if (error) {
-                               rprintf(FERROR, "getaddrinfo: %s\n", gai_strerror(error));
+                               rprintf(FERROR, RSYNC_NAME ": getaddrinfo: bind address %s: %s\n",
+                                       bind_address, gai_strerror(error));
                                continue;
                        }
                        if (bres->ai_next) {
-                               rprintf(FERROR, "getaddrinfo: resolved to multiple hosts\n");
+                               rprintf(FERROR, RSYNC_NAME ": getaddrinfo: bind address %s resolved to multiple hosts\n",
+                                       bind_address);
                                freeaddrinfo(bres);
                                continue;
                        }
@@ -188,7 +190,8 @@ int open_socket_out(char *host, int port, const char *bind_address)
        }
        freeaddrinfo(res0);
        if (s < 0) {
-               rprintf(FERROR, "failed to connect to %s - %s\n", h, strerror(errno));
+               rprintf(FERROR, RSYNC_NAME ": failed to connect to %s: %s\n",
+                       h, strerror(errno));
                return -1;
        }
        return s;
@@ -242,18 +245,22 @@ static int open_socket_in(int type, int port, const char *bind_address)
        snprintf(portbuf, sizeof(portbuf), "%d", port);
        error = getaddrinfo(bind_address, portbuf, &hints, &res);
        if (error) {
-               rprintf(FERROR, "getaddrinfo: %s\n", gai_strerror(error));
+               rprintf(FERROR, RSYNC_NAME ": getaddrinfo: bind address %s: %s\n",
+                       bind_address, gai_strerror(error));
                return -1;
        }
        if (res->ai_next) {
-               rprintf(FERROR, "getaddrinfo: resolved to multiple hosts\n");
+               rprintf(FERROR, RSYNC_NAME ": getaddrinfo: bind address %s: "
+                       "resolved to multiple hosts\n",
+                       bind_address);
                freeaddrinfo(res);
                return -1;
        }
 
        s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
        if (s < 0) {
-               rprintf(FERROR, RSYNC_NAME ": socket failed\n"); 
+               rprintf(FERROR, RSYNC_NAME ": open socket in failed: %s\n",
+                       strerror(errno)); 
                freeaddrinfo(res);
                return -1; 
        }
@@ -320,7 +327,7 @@ void start_accept_loop(int port, int (*fn)(int ))
        while (1) {
                fd_set fds;
                int fd;
-               struct sockaddr_storage addr;
+               struct sockaddr addr;
                int in_addrlen = sizeof(addr);
 
                /* close log file before the potentially very long select so
@@ -498,12 +505,12 @@ void become_daemon(void)
        }
 }
 
-/*******************************************************************
- 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)
 {
-       struct sockaddr_storage ss;
+       struct sockaddr ss;
        int     length = sizeof(ss);
        static char addr_buf[100];
        static int initialised;
@@ -512,22 +519,22 @@ char *client_addr(int fd)
 
        initialised = 1;
 
-       if (getpeername(fd, (struct sockaddr *)&ss, &length)) {
+       if (getpeername(fd, &ss, &length)) {
                exit_cleanup(RERR_SOCKETIO);
        }
 
-       getnameinfo((struct sockaddr *)&ss, length,
+       getnameinfo(&ss, length,
                addr_buf, sizeof(addr_buf), NULL, 0, NI_NUMERICHOST);
        return addr_buf;
 }
 
 
-/*******************************************************************
- return the DNS name of the client 
- ******************************************************************/
+/**
+ * Return the DNS name of the client 
+ **/
 char *client_name(int fd)
 {
-       struct sockaddr_storage ss;
+       struct sockaddr ss;
        int     length = sizeof(ss);
        static char name_buf[100];
        static char port_buf[100];
@@ -582,13 +589,16 @@ char *client_name(int fd)
        error = getaddrinfo(name_buf, port_buf, &hints, &res0);
        if (error) {
                strcpy(name_buf, def);
-               rprintf(FERROR, "forward name lookup failed\n");
+               rprintf(FERROR,
+                       RSYNC_NAME ": forward name lookup for %s failed: %s\n",
+                       port_buf,
+                       gai_strerror(error));
                return name_buf;
        }
 
        /* XXX sin6_flowinfo and other fields */
        for (res = res0; res; res = res->ai_next) {
-               if (res->ai_family != ss.ss_family)
+               if (res->ai_family != ss.sa_family)
                        continue;
                if (res->ai_addrlen != length)
                        continue;
@@ -609,12 +619,14 @@ char *client_name(int fd)
 }
 
 /**
-   Convert a string to an IP address. The string can be a name or
-   dotted decimal number.
-
-   Returns a pointer to a static in_addr struct -- if you call this
-   more than once then you should copy it.
-*/
+ * Convert a string to an IP address. The string can be a name or
+ * dotted decimal number.
+ *
+ * Returns a pointer to a static in_addr struct -- if you call this
+ * more than once then you should copy it.
+ *
+ * TODO: Use getaddrinfo() instead, or make this function call getnameinfo
+ **/
 struct in_addr *ip_address(const char *str)
 {
        static struct in_addr ret;