X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b8771f9615ecfa8989e8982aac33bb31eeaaec22..a8e2a43a099cfe25e8fb47a561574aa5ad908306:/socket.c diff --git a/socket.c b/socket.c index e642082e..bf69c0be 100644 --- a/socket.c +++ b/socket.c @@ -26,12 +26,6 @@ #include "rsync.h" -#ifndef HAVE_GETADDRINFO -#include "lib/addrinfo.h" -#endif - -// extern int af; /* NO MORE BLOODY GLOBALS! */ - /* Establish a proxy connection on an open socket to a web roxy by * using the CONNECT method. */ static int establish_proxy_connection(int fd, char *host, int port) @@ -96,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 . @@ -164,32 +191,22 @@ int open_socket_out(char *host, int port, const char *bind_address, } s = -1; + /* Try to connect to all addresses for this machine until we get + * through. It might e.g. be multi-homed, or have both IPv4 and IPv6 + * addresses. We need to create a socket for each record, since the + * address record tells us what protocol to use to try to connect. */ for (res = res0; res; res = res->ai_next) { s = socket(res->ai_family, res->ai_socktype, res->ai_protocol); 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 : %s\n", - bind_address, gai_strerror(error)); - continue; - } - if (bres->ai_next) { - 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); @@ -265,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; @@ -274,53 +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: - /* 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; + return s; } - setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&one,sizeof(one)); + rprintf(FERROR, RSYNC_NAME ": open inbound socket on port %d failed: " + "%s\n", + port, + strerror(errno)); - /* 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; - -fail: - freeaddrinfo(res); + freeaddrinfo(all_ai); return -1; } @@ -355,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); @@ -374,8 +381,8 @@ void start_accept_loop(int port, int (*fn)(int )) while (1) { fd_set fds; int fd; - struct sockaddr addr; - int in_addrlen = sizeof(addr); + struct sockaddr_storage addr; + int addrlen = sizeof(addr); /* close log file before the potentially very long select so file can be trimmed by another process instead of growing @@ -391,7 +398,7 @@ void start_accept_loop(int port, int (*fn)(int )) if(!FD_ISSET(s, &fds)) continue; - fd = accept(s,(struct sockaddr *)&addr,&in_addrlen); + fd = accept(s,(struct sockaddr *)&addr,&addrlen); if (fd == -1) continue; @@ -557,7 +564,7 @@ void become_daemon(void) **/ char *client_addr(int fd) { - struct sockaddr ss; + struct sockaddr_storage ss; int length = sizeof(ss); static char addr_buf[100]; static int initialised; @@ -566,22 +573,28 @@ char *client_addr(int fd) initialised = 1; - if (getpeername(fd, &ss, &length)) { + if (getpeername(fd, (struct sockaddr *)&ss, &length)) { exit_cleanup(RERR_SOCKETIO); } - getnameinfo(&ss, length, + getnameinfo((struct sockaddr *)&ss, length, addr_buf, sizeof(addr_buf), NULL, 0, NI_NUMERICHOST); return addr_buf; } +static int get_sockaddr_family(const struct sockaddr_storage *ss) +{ + return ((struct sockaddr *) ss)->sa_family; +} + + /** * Return the DNS name of the client **/ char *client_name(int fd) { - struct sockaddr ss; + struct sockaddr_storage ss; int length = sizeof(ss); static char name_buf[100]; static char port_buf[100]; @@ -599,12 +612,12 @@ char *client_name(int fd) if (getpeername(fd, (struct sockaddr *)&ss, &length)) { /* FIXME: Can we really not continue? */ rprintf(FERROR, RSYNC_NAME ": getpeername on fd%d failed: %s\n", - strerror(errno)); + fd, strerror(errno)); exit_cleanup(RERR_SOCKETIO); } #ifdef INET6 - if (ss.ss_family == AF_INET6 && + if (get_sockaddr_family(&ss) == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)&ss)->sin6_addr)) { struct sockaddr_in6 sin6; struct sockaddr_in *sin; @@ -648,7 +661,7 @@ char *client_name(int fd) /* XXX sin6_flowinfo and other fields */ for (res = res0; res; res = res->ai_next) { - if (res->ai_family != ss.sa_family) + if (res->ai_family != get_sockaddr_family(&ss)) continue; if (res->ai_addrlen != length) continue; @@ -656,7 +669,7 @@ char *client_name(int fd) break; } - /* TODO: Do a forward lookup as well to prevent spoofing */ + /* TODO: Do a forward lookup as well to prevent spoofing */ if (res == NULL) { strcpy(name_buf, def); @@ -669,69 +682,6 @@ char *client_name(int fd) return name_buf; } -/** - * 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; - struct hostent *hp; - - if (!str) { - rprintf (FERROR, "ip_address received NULL name\n"); - return NULL; - } - - /* try as an IP address */ - if (inet_aton(str, &ret) != 0) { - return &ret; - } - - /* otherwise assume it's a network name of some sort and use - gethostbyname */ - if ((hp = gethostbyname (str)) == 0) { - rprintf(FERROR, "gethostbyname failed for \"%s\": unknown host?\n",str); - return NULL; - } - - if (hp->h_addr == NULL) { - rprintf(FERROR, "gethostbyname: host address is invalid for host \"%s\"\n",str); - return NULL; - } - - if (hp->h_length > sizeof ret) { - rprintf(FERROR, "gethostbyname: host address for \"%s\" is too large\n", - str); - return NULL; - } - - if (hp->h_addrtype != AF_INET) { - rprintf (FERROR, "gethostname: host address for \"%s\" is not IPv4\n", - str); - return NULL; - } - - /* This is kind of difficult. The only field in ret is - s_addr, which is the IP address as a 32-bit int. On - UNICOS, s_addr is in fact a *bitfield* for reasons best - know to Cray. This means we can't memcpy in to it. On the - other hand, h_addr is a char*, so we can't just assign. - - Since there's meant to be only one field inside the in_addr - structure we will try just copying over the top and see how - that goes. */ - memcpy (&ret, hp->h_addr, hp->h_length); - - return &ret; -} - - /******************************************************************* this is like socketpair but uses tcp. It is used by the Samba