X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/660c6fbdaa31605abedddeea5fa5109d2734f2dc..7ef6aa6405c90db2d64cc1ec230cef258af43791:/socket.c

diff --git a/socket.c b/socket.c
index dd6613ae..108150a0 100644
--- a/socket.c
+++ b/socket.c
@@ -1,6 +1,7 @@
 /* -*- c-file-style: "linux" -*-
    
-   Copyright (C) 1998-2001 by Andrew Tridgell 
+   Copyright (C) 1992-2001 by Andrew Tridgell <tridge@samba.org>
+   Copyright (C) 2001 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
@@ -24,6 +25,11 @@
 
 #include "rsync.h"
 
+#ifndef HAVE_GETADDRINFO
+#include "lib/addrinfo.h"
+#endif
+
+extern int af;
 
 /* Establish a proxy connection on an open socket to a web roxy by
  * using the CONNECT method. */
@@ -32,7 +38,7 @@ static int establish_proxy_connection(int fd, char *host, int port)
 	char buffer[1024];
 	char *cp;
 
-	slprintf(buffer, sizeof(buffer), "CONNECT %s:%d HTTP/1.0\r\n\r\n", host, port);
+	snprintf(buffer, sizeof(buffer), "CONNECT %s:%d HTTP/1.0\r\n\r\n", host, port);
 	if (write(fd, buffer, strlen(buffer)) != strlen(buffer)) {
 		rprintf(FERROR, "failed to write to proxy: %s\n",
 			strerror(errno));
@@ -89,18 +95,23 @@ static int establish_proxy_connection(int fd, char *host, int port)
 }
 
 
-/* open a socket to a tcp remote host with the specified port 
-   based on code from Warren
-   proxy support by Stephen Rothwell */
-int open_socket_out(char *host, int port, struct in_addr *address)
+
+/** Open a socket to a tcp remote host with the specified port .
+ *
+ * Based on code from Warren.   Proxy support by Stephen Rothwell
+ *
+ *
+ * @param bind_address Local address to use.  Normally NULL to get the stack default.
+ **/
+int open_socket_out(char *host, int port, const char *bind_address)
 {
 	int type = SOCK_STREAM;
-	struct sockaddr_in sock_out;
-	struct sockaddr_in sock;
-	int res;
-	struct hostent *hp;
+	int error;
+	int s;
+	int result;
+	struct addrinfo hints, *res0, *res;
+	char portbuf[10];
 	char *h;
-	unsigned p;
 	int proxied = 0;
 	char buffer[1024];
 	char *cp;
@@ -120,101 +131,151 @@ int open_socket_out(char *host, int port, struct in_addr *address)
 			return -1;
 		}
 		*cp++ = '\0';
-		p = atoi(cp);
+		strcpy(portbuf, cp);
 		h = buffer;
 	} else {
+		snprintf(portbuf, sizeof(portbuf), "%d", port);
 		h = host;
-		p = port;
 	}
 
-	res = socket(PF_INET, type, 0);
-	if (res == -1) {
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = af;
+	hints.ai_socktype = type;
+	error = getaddrinfo(h, portbuf, &hints, &res0);
+	if (error) {
+		rprintf(FERROR, RSYNC_NAME ": getaddrinfo: %s: %s\n", portbuf, gai_strerror(error));
 		return -1;
 	}
 
-	hp = gethostbyname(h);
-	if (!hp) {
-		rprintf(FERROR,"unknown host: %s\n", h);
-		close(res);
-		return -1;
-	}
+	s = -1;
+	for (res = res0; res; res = res->ai_next) {
+		s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+		if (s < 0)
+			continue;
 
-	memcpy(&sock_out.sin_addr, hp->h_addr, hp->h_length);
-	sock_out.sin_port = htons(p);
-	sock_out.sin_family = PF_INET;
+		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);
+				continue;
+			}
+			bind(s, bres->ai_addr, bres->ai_addrlen);
+		}
 
-	if (address) {
-		sock.sin_addr = *address;
-		sock.sin_port = 0;
-		sock.sin_family = hp->h_addrtype;
-		bind(res, (struct sockaddr * ) &sock,sizeof(sock));
+		if (connect(s, res->ai_addr, res->ai_addrlen) < 0) {
+			close(s);
+			s = -1;
+			continue;
+		}
+		if (proxied &&
+		    establish_proxy_connection(s, host, port) != 0) {
+			close(s);
+			s = -1;
+			continue;
+		} else
+			break;
 	}
-
-	if (connect(res,(struct sockaddr *)&sock_out,sizeof(sock_out))) {
-		rprintf(FERROR,"failed to connect to %s - %s\n", h, strerror(errno));
-		close(res);
+	freeaddrinfo(res0);
+	if (s < 0) {
+		rprintf(FERROR, RSYNC_NAME ": failed to connect to %s: %s\n",
+			h, strerror(errno));
 		return -1;
 	}
+	return s;
+}
 
-	if (proxied && establish_proxy_connection(res, host, port) != 0) {
-		close(res);
-		return -1;
-	}
 
-	return res;
+/**
+ * Open an outgoing socket, but allow for it to be intercepted by
+ * $RSYNC_CONNECT_PROG, which will execute a program across a TCP
+ * socketpair rather than really opening a socket.
+ *
+ * We use this primarily in testing to detect TCP flow bugs, but not
+ * cause security problems by really opening remote connections.
+ *
+ * This is based on the Samba LIBSMB_PROG feature.
+ *
+ * @param bind_address Local address to use.  Normally NULL to get the stack default.
+ **/
+int open_socket_out_wrapped (char *host,
+			     int port,
+			     const char *bind_address)
+{
+	char *prog;
+
+	if ((prog = getenv ("RSYNC_CONNECT_PROG")) != NULL) 
+		return sock_exec (prog);
+	else 
+		return open_socket_out (host, port, bind_address);
 }
 
 
-/****************************************************************************
-open a socket of the specified type, port and address for incoming data
-****************************************************************************/
-static int open_socket_in(int type, int port, struct in_addr *address)
+
+/**
+ * Open a socket of the specified type, port and address for incoming data
+ *
+ * @param bind_address Local address to bind, or NULL to allow it to
+ * default.
+ **/
+static int open_socket_in(int type, int port, const char *bind_address)
 {
-	struct hostent *hp;
-	struct sockaddr_in sock;
-	char host_name[MAXHOSTNAMELEN];
-	int res;
 	int one=1;
-
-	/* get my host name */
-	if (gethostname(host_name, sizeof(host_name)) == -1) { 
-		rprintf(FERROR,"gethostname failed\n"); 
-		return -1; 
-	} 
-
-	/* get host info */
-	if ((hp = gethostbyname(host_name)) == 0) {
-		rprintf(FERROR,"gethostbyname: Unknown host %s\n",host_name);
+	int s;
+	struct addrinfo hints, *res;
+	char portbuf[10];
+	int error;
+
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = af;
+	hints.ai_socktype = type;
+	hints.ai_flags = AI_PASSIVE;
+	snprintf(portbuf, sizeof(portbuf), "%d", port);
+	error = getaddrinfo(bind_address, portbuf, &hints, &res);
+	if (error) {
+		rprintf(FERROR, RSYNC_NAME ": getaddrinfo: bind address %s: %s\n",
+			bind_address, gai_strerror(error));
 		return -1;
 	}
-  
-	memset((char *)&sock,0,sizeof(sock));
-	memcpy((char *)&sock.sin_addr,(char *)hp->h_addr, hp->h_length);
-	sock.sin_port = htons(port);
-	sock.sin_family = hp->h_addrtype;
-	if (address) {
-		sock.sin_addr = *address;
-	} else {
-		sock.sin_addr.s_addr = INADDR_ANY;
+	if (res->ai_next) {
+		rprintf(FERROR, RSYNC_NAME ": getaddrinfo: bind address %s: "
+			"resolved to multiple hosts\n",
+			bind_address);
+		freeaddrinfo(res);
+		return -1;
 	}
-	res = socket(hp->h_addrtype, type, 0);
-	if (res == -1) { 
-		rprintf(FERROR,"socket failed: %s\n",
+
+	s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+	if (s < 0) {
+		rprintf(FERROR, RSYNC_NAME ": open socket in failed: %s\n",
 			strerror(errno)); 
+		freeaddrinfo(res);
 		return -1; 
 	}
 
-	setsockopt(res,SOL_SOCKET,SO_REUSEADDR,(char *)&one,sizeof(one));
+	setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&one,sizeof(one));
 
 	/* now we've got a socket - we need to bind it */
-	if (bind(res, (struct sockaddr * ) &sock,sizeof(sock)) == -1) { 
-		rprintf(FERROR,"bind failed on port %d: %s\n", port,
-			strerror(errno));
-		close(res); 
+	if (bind(s, res->ai_addr, res->ai_addrlen) < 0) { 
+		rprintf(FERROR, RSYNC_NAME ": bind failed on port %d\n", port);
+		freeaddrinfo(res);
+		close(s); 
 		return -1;
 	}
 
-	return res;
+	return s;
 }
 
 
@@ -223,13 +284,14 @@ static int open_socket_in(int type, int port, struct in_addr *address)
  */
 int is_a_socket(int fd)
 {
-	int v, l;
+	int v;
+	socklen_t l;
 	l = sizeof(int);
 
         /* Parameters to getsockopt, setsockopt etc are very
          * unstandardized across platforms, so don't be surprised if
-         * there are compiler warnings on e.g. SCO OpenSwerver.  It
-         * seems they all eventually get the right idea.
+         * there are compiler warnings on e.g. SCO OpenSwerver or AIX.
+         * It seems they all eventually get the right idea.
          *
          * Debian says: ``The fifth argument of getsockopt and
          * setsockopt is in reality an int [*] (and this is what BSD
@@ -246,10 +308,10 @@ int is_a_socket(int fd)
 void start_accept_loop(int port, int (*fn)(int ))
 {
 	int s;
-	extern struct in_addr socket_address;
+	extern char *bind_address;
 
 	/* open an incoming socket */
-	s = open_socket_in(SOCK_STREAM, port, &socket_address);
+	s = open_socket_in(SOCK_STREAM, port, bind_address);
 	if (s == -1)
 		exit_cleanup(RERR_SOCKETIO);
 
@@ -265,7 +327,7 @@ void start_accept_loop(int port, int (*fn)(int ))
 	while (1) {
 		fd_set fds;
 		int fd;
-		struct sockaddr addr;
+		struct sockaddr_storage addr;
 		int in_addrlen = sizeof(addr);
 
 		/* close log file before the potentially very long select so
@@ -282,8 +344,7 @@ void start_accept_loop(int port, int (*fn)(int ))
 
 		if(!FD_ISSET(s, &fds)) continue;
 
-                /* See note above prototypes. */
-		fd = accept(s,&addr,&in_addrlen);
+		fd = accept(s,(struct sockaddr *)&addr,&in_addrlen);
 
 		if (fd == -1) continue;
 
@@ -298,11 +359,9 @@ void start_accept_loop(int port, int (*fn)(int ))
 
 		if (fork()==0) {
 			close(s);
-
 			/* open log file in child before possibly giving
 			   up privileges  */
 			log_open();
-
 			_exit(fn(fd));
 		}
 
@@ -451,9 +510,8 @@ void become_daemon(void)
  ******************************************************************/
 char *client_addr(int fd)
 {
-	struct sockaddr sa;
-	struct sockaddr_in *sockin = (struct sockaddr_in *) (&sa);
-	int     length = sizeof(sa);
+	struct sockaddr_storage ss;
+	int     length = sizeof(ss);
 	static char addr_buf[100];
 	static int initialised;
 
@@ -461,11 +519,12 @@ char *client_addr(int fd)
 
 	initialised = 1;
 
-	if (getpeername(fd, &sa, &length)) {
+	if (getpeername(fd, (struct sockaddr *)&ss, &length)) {
 		exit_cleanup(RERR_SOCKETIO);
 	}
-	
-	strlcpy(addr_buf,(char *)inet_ntoa(sockin->sin_addr), sizeof(addr_buf));
+
+	getnameinfo((struct sockaddr *)&ss, length,
+		addr_buf, sizeof(addr_buf), NULL, 0, NI_NUMERICHOST);
 	return addr_buf;
 }
 
@@ -475,14 +534,14 @@ char *client_addr(int fd)
  ******************************************************************/
 char *client_name(int fd)
 {
-	struct sockaddr sa;
-	struct sockaddr_in *sockin = (struct sockaddr_in *) (&sa);
-	int     length = sizeof(sa);
+	struct sockaddr_storage ss;
+	int     length = sizeof(ss);
 	static char name_buf[100];
-	struct hostent *hp;
-	char **p;
+	static char port_buf[100];
 	char *def = "UNKNOWN";
 	static int initialised;
+	struct addrinfo hints, *res, *res0;
+	int error;
 
 	if (initialised) return name_buf;
 
@@ -490,47 +549,92 @@ char *client_name(int fd)
 
 	strcpy(name_buf,def);
 
-	if (getpeername(fd, &sa, &length)) {
+	if (getpeername(fd, (struct sockaddr *)&ss, &length)) {
 		exit_cleanup(RERR_SOCKETIO);
 	}
 
-	/* Look up the remote host name. */
-	if ((hp = gethostbyaddr((char *) &sockin->sin_addr,
-				sizeof(sockin->sin_addr),
-				AF_INET))) {
-		strlcpy(name_buf,(char *)hp->h_name,sizeof(name_buf));
+#ifdef INET6
+        if (ss.ss_family == AF_INET6 && 
+	    IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)&ss)->sin6_addr)) {
+		struct sockaddr_in6 sin6;
+		struct sockaddr_in *sin;
+
+		memcpy(&sin6, &ss, sizeof(sin6));
+		sin = (struct sockaddr_in *)&ss;
+		memset(sin, 0, sizeof(*sin));
+		sin->sin_family = AF_INET;
+		length = sizeof(struct sockaddr_in);
+#ifdef HAVE_SOCKADDR_LEN
+		sin->sin_len = length;
+#endif
+		sin->sin_port = sin6.sin6_port;
+		memcpy(&sin->sin_addr, &sin6.sin6_addr.s6_addr[12],
+			sizeof(sin->sin_addr));
+        }
+#endif
+
+	/* reverse lookup */
+	if (getnameinfo((struct sockaddr *)&ss, length,
+			name_buf, sizeof(name_buf), port_buf, sizeof(port_buf),
+			NI_NAMEREQD | NI_NUMERICSERV) != 0) {
+		strcpy(name_buf, def);
+		rprintf(FERROR, "reverse name lookup failed\n");
 	}
 
+	/* forward lookup */
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = PF_UNSPEC;
+	hints.ai_flags = AI_CANONNAME;
+	hints.ai_socktype = SOCK_STREAM;
+	error = getaddrinfo(name_buf, port_buf, &hints, &res0);
+	if (error) {
+		strcpy(name_buf, def);
+		rprintf(FERROR,
+			RSYNC_NAME ": forward name lookup for %s failed: %s\n",
+			port_buf,
+			gai_strerror(error));
+		return name_buf;
+	}
 
-	/* do a forward lookup as well to prevent spoofing */
-	hp = gethostbyname(name_buf);
-	if (!hp) {
-		strcpy(name_buf,def);
-		rprintf(FERROR,"reverse name lookup failed\n");
-	} else {
-		for (p=hp->h_addr_list;*p;p++) {
-			if (memcmp(*p, &sockin->sin_addr, hp->h_length) == 0) {
-				break;
-			}
-		}
-		if (!*p) {
-			strcpy(name_buf,def);
-			rprintf(FERROR,"reverse name lookup mismatch - spoofed address?\n");
-		} 
+	/* XXX sin6_flowinfo and other fields */
+	for (res = res0; res; res = res->ai_next) {
+		if (res->ai_family != ss.ss_family)
+			continue;
+		if (res->ai_addrlen != length)
+			continue;
+		if (memcmp(res->ai_addr, &ss, res->ai_addrlen) == 0)
+			break;
 	}
 
+	/* TODO: Do a forward lookup as well to prevent spoofing */
+
+	if (res == NULL) {
+		strcpy(name_buf, def);
+		rprintf(FERROR,
+			"reverse name lookup mismatch - spoofed address?\n");
+	}
+
+	freeaddrinfo(res0);
 	return name_buf;
 }
 
-/*******************************************************************
-convert a string to an IP address. The string can be a name or
-dotted decimal number
-  ******************************************************************/
+/**
+   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.
+*/
 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;
@@ -538,22 +642,142 @@ struct in_addr *ip_address(const char *str)
 
 	/* otherwise assume it's a network name of some sort and use 
 	   gethostbyname */
-	if ((hp = gethostbyname(str)) == 0) {
-		rprintf(FERROR, "gethostbyname: Unknown host. %s\n",str);
+	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);
+		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_length > sizeof(ret)) {
-		rprintf(FERROR, "gethostbyname: host address is too large\n");
+	if (hp->h_addrtype != AF_INET) {
+		rprintf (FERROR, "gethostname: host address for \"%s\" is not IPv4\n",
+			 str);
 		return NULL;
 	}
 
-	memcpy(&ret.s_addr, hp->h_addr, hp->h_length);
+	/* 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.
 
-	return(&ret);
+	   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
+regression test code
+The function guarantees that nobody else can attach to the socket,
+or if they do that this function fails and the socket gets closed
+returns 0 on success, -1 on failure
+the resulting file descriptors are symmetrical
+ ******************************************************************/
+static int socketpair_tcp(int fd[2])
+{
+	int listener;
+	struct sockaddr_in sock;
+	struct sockaddr_in sock2;
+	socklen_t socklen = sizeof(sock);
+	int connect_done = 0;
+	
+	fd[0] = fd[1] = listener = -1;
+
+	memset(&sock, 0, sizeof(sock));
+	
+	if ((listener = socket(PF_INET, SOCK_STREAM, 0)) == -1) goto failed;
+
+        memset(&sock2, 0, sizeof(sock2));
+#ifdef HAVE_SOCK_SIN_LEN
+        sock2.sin_len = sizeof(sock2);
+#endif
+        sock2.sin_family = PF_INET;
+
+        bind(listener, (struct sockaddr *)&sock2, sizeof(sock2));
+
+	if (listen(listener, 1) != 0) goto failed;
+
+	if (getsockname(listener, (struct sockaddr *)&sock, &socklen) != 0) goto failed;
+
+	if ((fd[1] = socket(PF_INET, SOCK_STREAM, 0)) == -1) goto failed;
+
+	set_nonblocking(fd[1]);
+
+	sock.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+
+	if (connect(fd[1],(struct sockaddr *)&sock,sizeof(sock)) == -1) {
+		if (errno != EINPROGRESS) goto failed;
+	} else {
+		connect_done = 1;
+	}
+
+	if ((fd[0] = accept(listener, (struct sockaddr *)&sock, &socklen)) == -1) goto failed;
+
+	close(listener);
+	if (connect_done == 0) {
+		if (connect(fd[1],(struct sockaddr *)&sock,sizeof(sock)) != 0
+		    && errno != EISCONN) goto failed;
+	}
+
+	set_blocking (fd[1]);
+
+	/* all OK! */
+	return 0;
+
+ failed:
+	if (fd[0] != -1) close(fd[0]);
+	if (fd[1] != -1) close(fd[1]);
+	if (listener != -1) close(listener);
+	return -1;
+}
+
+
+/*******************************************************************
+run a program on a local tcp socket, this is used to launch smbd
+when regression testing
+the return value is a socket which is attached to a subprocess
+running "prog". stdin and stdout are attached. stderr is left
+attached to the original stderr
+ ******************************************************************/
+int sock_exec(const char *prog)
+{
+	int fd[2];
+	if (socketpair_tcp(fd) != 0) {
+		rprintf (FERROR, RSYNC_NAME
+			 ": socketpair_tcp failed (%s)\n",
+			 strerror(errno));
+		return -1;
+	}
+	if (fork() == 0) {
+		close(fd[0]);
+		close(0);
+		close(1);
+		dup(fd[1]);
+		dup(fd[1]);
+		if (verbose > 3)
+			fprintf (stderr,
+				 RSYNC_NAME ": execute socket program \"%s\"\n",
+				 prog);
+		exit (system (prog));
+	}
+	close (fd[1]);
+	return fd[0];
+}
+
+
+