Add an "unsafe" symlink to the symlink test case so we can see what happens.

[rsync/rsync.git] / socket.c

diff --git a/socket.c b/socket.c
index 0ad8a16..bf69c0b 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -90,6 +90,39 @@ static int establish_proxy_connection(int fd, char *host, int port)
 }
 
 
+/**
+ * Try to set the local address for a newly-created socket.  Return -1
+ * if this fails.
+ **/
+int try_bind_local(int s,
+                  int ai_family, int ai_socktype,
+                  const char *bind_address)
+{
+       int error;
+       struct addrinfo bhints, *bres_all, *r;
+
+       memset(&bhints, 0, sizeof(bhints));
+       bhints.ai_family = ai_family;
+       bhints.ai_socktype = ai_socktype;
+       bhints.ai_flags = AI_PASSIVE;
+       if (getaddrinfo(bind_address, NULL, &bhints, &bres_all) == -1) {
+               rprintf(FERROR, RSYNC_NAME ": getaddrinfo %s: %s\n",
+                       bind_address, gai_strerror(error));
+               return -1;
+       }
+
+       for (r = bres_all; r; r = r->ai_next) {
+               if (bind(s, bres->ai_addr, bres->ai_addrlen) == -1)
+                       continue;
+               return s;
+       }
+
+       /* no error message; there might be some problem that allows
+        * creation of the socket but not binding, perhaps if the
+        * machine has no ipv6 address of this name. */
+       return -1;
+}
+
 
 /**
  * Open a socket to a tcp remote host with the specified port .
@@ -167,31 +200,13 @@ int open_socket_out(char *host, int port, const char *bind_address,
                if (s < 0)
                        continue;
 
-               if (bind_address) {
-                       struct addrinfo bhints, *bres;
-
-                       memset(&bhints, 0, sizeof(bhints));
-                       bhints.ai_family = res->ai_family;
-                       bhints.ai_socktype = type;
-                       bhints.ai_flags = AI_PASSIVE;
-                       error = getaddrinfo(bind_address, NULL, &bhints, &bres);
-                       if (error) {
-                               rprintf(FERROR, RSYNC_NAME ": getaddrinfo: "
-                                       "bind address %s <noport>: %s\n",
-                                       bind_address, gai_strerror(error));
-                               continue;
-                       }
-                       if (bres->ai_next) {
-                               /* I'm not at all sure that this is the right
-                                * response here... -- mbp */
-                               rprintf(FERROR, RSYNC_NAME ": getaddrinfo: "
-                                       "bind address %s resolved to multiple hosts\n",
-                                       bind_address);
-                               freeaddrinfo(bres);
+               if (bind_address)
+                       if (try_bind_local(s, res->ai_family, type,
+                                          bind_address) == -1) {
+                               close(s);
+                               s = -1;
                                continue;
                        }
-                       bind(s, bres->ai_addr, bres->ai_addrlen);
-               }
 
                if (connect(s, res->ai_addr, res->ai_addrlen) < 0) {
                        close(s);
@@ -267,7 +282,7 @@ static int open_socket_in(int type, int port, const char *bind_address,
 {
        int one=1;
        int s;
-       struct addrinfo hints, *res, *resp;
+       struct addrinfo hints, *all_ai, *resp;
        char portbuf[10];
        int error;
 
@@ -276,54 +291,43 @@ static int open_socket_in(int type, int port, const char *bind_address,
        hints.ai_socktype = type;
        hints.ai_flags = AI_PASSIVE;
        snprintf(portbuf, sizeof(portbuf), "%d", port);
-       error = getaddrinfo(bind_address, portbuf, &hints, &res);
+       error = getaddrinfo(bind_address, portbuf, &hints, &all_ai);
        if (error) {
                rprintf(FERROR, RSYNC_NAME ": getaddrinfo: bind address %s: %s\n",
                        bind_address, gai_strerror(error));
                return -1;
        }
-       /* XXX: Do we need to care about getting multiple results
-        * back?  I think probably not; if the user passed
-        * bind_address == NULL and we set AI_PASSIVE then we ought to
-        * get a wildcard result. */
 
-       resp = res;
-       while (1) {
-               s = socket(resp->ai_family, resp->ai_socktype, resp->ai_protocol);
-
-               if (s >= 0) {
-                       break;  /* got a socket */
-               } else if ((resp = resp->ai_next)) {
-                       switch (errno) {
-                       case EPROTONOSUPPORT:
-                       case EAFNOSUPPORT:
-                       case EPFNOSUPPORT:
-                       case EINVAL:
-                               /* See if there's another address that will work... */
-                               continue;
-                       }
+       /* We may not be able to create the socket, if for example the
+        * machine knows about IPv6 in the C library, but not in the
+        * kernel. */
+       for (resp = all_ai; resp; resp = resp->ai_next) {
+               s = socket(resp->ai_family, resp->ai_socktype,
+                          resp->ai_protocol);
+
+               if (s == -1) 
+                       /* See if there's another address that will work... */
+                       continue;
+               
+               setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+                          (char *)&one, sizeof one);
+               
+               /* now we've got a socket - we need to bind it */
+               if (bind(s, all_ai->ai_addr, all_ai->ai_addrlen) < 0) {
+                       /* Nope, try another */
+                       close(s);
+                       continue;
                }
                
-               rprintf(FERROR, RSYNC_NAME ": open inbound socket"
-                       "(dom=%d, type=%d, proto=%d) failed: %s\n",
-                       resp->ai_family, resp->ai_socktype, resp->ai_protocol,
-                       strerror(errno));
-                       goto fail;
-       }
-
-       setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&one,sizeof(one));
-
-       /* now we've got a socket - we need to bind it */
-       if (bind(s, res->ai_addr, res->ai_addrlen) < 0) { 
-               rprintf(FERROR, RSYNC_NAME ": bind failed on port %d\n", port);
-               close(s);
-               goto fail;
+               return s;
        }
 
-       return s;
+       rprintf(FERROR, RSYNC_NAME ": open inbound socket on port %d failed: "
+               "%s\n",
+               port, 
+               strerror(errno));
 
-fail:
-       freeaddrinfo(res);
+       freeaddrinfo(all_ai);
        return -1; 
 }
 
@@ -358,10 +362,10 @@ void start_accept_loop(int port, int (*fn)(int ))
 {
        int s;
        extern char *bind_address;
+       extern int default_af_hint;
 
        /* open an incoming socket */
-       s = open_socket_in(SOCK_STREAM, port, bind_address,
-                          global_opts.af_hint);
+       s = open_socket_in(SOCK_STREAM, port, bind_address, default_af_hint);
        if (s == -1)
                exit_cleanup(RERR_SOCKETIO);