#include "rsync.h"
-#ifndef HAVE_GETADDRINFO
-#include "lib/addrinfo.h"
-#endif
-
/* 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)
}
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)
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",
+ rprintf(FERROR, RSYNC_NAME ": getaddrinfo: "
+ "bind address %s <noport>: %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",
+ /* 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);
continue;
{
int one=1;
int s;
- struct addrinfo hints, *res, *resp;
+ struct addrinfo hints, *all_ai, *resp;
char portbuf[10];
int error;
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;
- }
-
- 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;
}
{
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);
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
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;
**/
char *client_addr(int fd)
{
- struct sockaddr ss;
+ struct sockaddr_storage ss;
int length = sizeof(ss);
static char addr_buf[100];
static int initialised;
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];
}
#ifdef INET6
- if (ss.sa_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;
/* 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;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff