X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/173f5bf8cfa28bbefe718a02839d8ff58f98ac47..2c7d63c76592751427f805020cfe8878bbc72f1f:/socket.c

diff --git a/socket.c b/socket.c
index 5843325a..0f473914 100644
--- a/socket.c
+++ b/socket.c
@@ -33,6 +33,8 @@
 
 #include "rsync.h"
 
+extern char *bind_address;
+extern int default_af_hint;
 
 /**
  * Establish a proxy connection on an open socket to a web proxy by
@@ -48,8 +50,8 @@ static int establish_proxy_connection(int fd, char *host, int port,
 	int len;
 
 	if (proxy_user && proxy_pass) {
-		snprintf(buffer, sizeof buffer, "%s:%s",
-			 proxy_user, proxy_pass);
+		stringjoin(buffer, sizeof buffer,
+			 proxy_user, ":", proxy_pass, NULL);
 		len = strlen(buffer);
 
 		if ((len*8 + 5) / 6 >= (int)sizeof authbuf) {
@@ -299,9 +301,14 @@ int open_socket_out(char *host, int port, const char *bind_address,
 int open_socket_out_wrapped(char *host, int port, const char *bind_address,
 			    int af_hint)
 {
-	char *prog;
+	char *prog = getenv("RSYNC_CONNECT_PROG");
 
-	if ((prog = getenv("RSYNC_CONNECT_PROG")) != NULL)
+	if (verbose >= 2) {
+		rprintf(FINFO, "%sopening tcp connection to %s port %d\n",
+			prog ? "Using RSYNC_CONNECT_PROG instead of " : "",
+			host, port);
+	}
+	if (prog)
 		return sock_exec(prog);
 	return open_socket_out(host, port, bind_address, af_hint);
 }
@@ -309,19 +316,14 @@ int open_socket_out_wrapped(char *host, int port, const char *bind_address,
 
 
 /**
- * Open a socket of the specified type, port and address for incoming data
- *
- * Try to be better about handling the results of getaddrinfo(): when
- * opening an inbound socket, we might get several address results,
- * e.g. for the machine's ipv4 and ipv6 name.
+ * Open one or more sockets for incoming data using the specified type,
+ * port, and address.
  *
- * If binding a wildcard, then any one of them should do.  If an address
- * was specified but it's insufficiently specific then that's not our
- * fault.
+ * The getaddrinfo() call may return several address results, e.g. for
+ * the machine's IPv4 and IPv6 name.
  *
- * However, some of the advertized addresses may not work because e.g. we
- * don't have IPv6 support in the kernel.  In that case go on and try all
- * addresses until one succeeds.
+ * We return an array of file-descriptors to the sockets, with a trailing
+ * -1 value to indicate the end of the list.
  *
  * @param bind_address Local address to bind, or NULL to allow it to
  * default.
@@ -329,8 +331,8 @@ int open_socket_out_wrapped(char *host, int port, const char *bind_address,
 static int *open_socket_in(int type, int port, const char *bind_address,
 			   int af_hint)
 {
-	int one=1;
-	int s, *sp, *socks, maxs;
+	int one = 1;
+	int s, *socks, maxs, i;
 	struct addrinfo hints, *all_ai, *resp;
 	char portbuf[10];
 	int error;
@@ -349,18 +351,14 @@ static int *open_socket_in(int type, int port, const char *bind_address,
 
 	/* Count max number of sockets we might open. */
 	for (maxs = 0, resp = all_ai; resp; resp = resp->ai_next, maxs++) {}
-	socks = new_array(int, maxs + 1);
-	if (!socks) {
-		rprintf(FERROR,
-			RSYNC_NAME "couldn't allocate memory for sockets");
-		return NULL;
-	}
+
+	if (!(socks = new_array(int, maxs + 1)))
+		out_of_memory("open_socket_in");
 
 	/* 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. */
-	sp = socks + 1; /* Leave room for count at start of array. */
-	for (resp = all_ai; resp; resp = resp->ai_next) {
+	for (resp = all_ai, i = 0; resp; resp = resp->ai_next) {
 		s = socket(resp->ai_family, resp->ai_socktype,
 			   resp->ai_protocol);
 
@@ -375,7 +373,7 @@ static int *open_socket_in(int type, int port, const char *bind_address,
 #ifdef IPV6_V6ONLY
 		if (resp->ai_family == AF_INET6) {
 			setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
-				   (char *)&one, sizeof one);
+				   (char *)&one, sizeof one) < 0;
 		}
 #endif
 
@@ -386,17 +384,17 @@ static int *open_socket_in(int type, int port, const char *bind_address,
 			continue;
 		}
 
-		*sp++ = s;
+		socks[i++] = s;
 	}
-	*socks = sp - socks - 1;   /* Save count. */
+	socks[i] = -1;
 
 	if (all_ai)
 		freeaddrinfo(all_ai);
 
-	if (*socks == 0) {
+	if (!i) {
 		rprintf(FERROR,
-			RSYNC_NAME ": open inbound socket on port %d failed: "
-			"%s\n", port, strerror(errno));
+			"unable to bind any inbound sockets on port %d\n",
+			port);
 		free(socks);
 		return NULL;
 	}
@@ -431,19 +429,17 @@ int is_a_socket(int fd)
 
 static RETSIGTYPE sigchld_handler(UNUSED(int val))
 {
-	signal(SIGCHLD, sigchld_handler);
 #ifdef WNOHANG
 	while (waitpid(-1, NULL, WNOHANG) > 0) {}
 #endif
+	signal(SIGCHLD, sigchld_handler);
 }
 
 
 void start_accept_loop(int port, int (*fn)(int, int))
 {
 	fd_set deffds;
-	int *sp, maxfd, i, j;
-	extern char *bind_address;
-	extern int default_af_hint;
+	int *sp, maxfd, i;
 
 	/* open an incoming socket */
 	sp = open_socket_in(SOCK_STREAM, port, bind_address, default_af_hint);
@@ -452,12 +448,16 @@ void start_accept_loop(int port, int (*fn)(int, int))
 
 	/* ready to listen */
 	FD_ZERO(&deffds);
-	maxfd = -1;
-	for (i = 1; i <= *sp; i++) {
-		if (listen(sp[i], 5) == -1) {
-			for (j = 1; j <= i; j++)
-				close(sp[j]);
-			free(sp);
+	for (i = 0, maxfd = -1; sp[i] >= 0; i++) {
+		if (listen(sp[i], 5) < 0) {
+			rprintf(FERROR, "listen() on socket failed: %s\n",
+				strerror(errno));
+#ifdef INET6
+			if (errno == EADDRINUSE && i > 0) {
+				rprintf(FINFO,
+				    "Try using --ipv4 or --ipv6 to avoid this listen() error.");
+			}
+#endif
 			exit_cleanup(RERR_SOCKETIO);
 		}
 		FD_SET(sp[i], &deffds);
@@ -489,8 +489,7 @@ void start_accept_loop(int port, int (*fn)(int, int))
 		if (select(maxfd + 1, &fds, NULL, NULL, NULL) != 1)
 			continue;
 
-		fd = -1;
-		for (i = 1; i <= *sp; i++) {
+		for (i = 0, fd = -1; sp[i] >= 0; i++) {
 			if (FD_ISSET(sp[i], &fds)) {
 				fd = accept(sp[i], (struct sockaddr *)&addr,
 					    &addrlen);
@@ -505,7 +504,8 @@ void start_accept_loop(int port, int (*fn)(int, int))
 
 		if ((pid = fork()) == 0) {
 			int ret;
-			close(sp[i]);
+			for (i = 0; sp[i] >= 0; i++)
+				close(sp[i]);
 			/* open log file in child before possibly giving
 			 * up privileges  */
 			log_open();
@@ -698,7 +698,7 @@ static int socketpair_tcp(int fd[2])
 		goto failed;
 
 	memset(&sock2, 0, sizeof sock2);
-#ifdef HAVE_SOCKADDR_LEN
+#if HAVE_SOCKADDR_IN_LEN
 	sock2.sin_len = sizeof sock2;
 #endif
 	sock2.sin_family = PF_INET;
@@ -769,18 +769,14 @@ int sock_exec(const char *prog)
 			strerror(errno));
 		return -1;
 	}
+	if (verbose >= 2)
+		rprintf(FINFO, "Running socket program: \"%s\"\n", prog);
 	if (fork() == 0) {
 		close(fd[0]);
 		close(0);
 		close(1);
 		dup(fd[1]);
 		dup(fd[1]);
-		if (verbose > 3) {
-			/* Can't use rprintf because we've forked. */
-			fprintf(stderr,
-				RSYNC_NAME ": execute socket program \"%s\"\n",
-				prog);
-		}
 		exit(system(prog));
 	}
 	close(fd[1]);