X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d1d15050454d0d8a43726f05048fda0380a54c01..0cd2f40764dd156de309f7536f3867968b6c0fdd:/socket.c

diff --git a/socket.c b/socket.c
index 8a54911f..9ac182d9 100644
--- a/socket.c
+++ b/socket.c
@@ -33,6 +33,7 @@
 
 #include "rsync.h"
 
+
 /* 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)
@@ -41,7 +42,7 @@ static int establish_proxy_connection(int fd, char *host, int port)
 	char *cp;
 
 	snprintf(buffer, sizeof(buffer), "CONNECT %s:%d HTTP/1.0\r\n\r\n", host, port);
-	if (write(fd, buffer, strlen(buffer)) != strlen(buffer)) {
+	if (write(fd, buffer, strlen(buffer)) != (int) strlen(buffer)) {
 		rprintf(FERROR, "failed to write to proxy: %s\n",
 			strerror(errno));
 		return -1;
@@ -565,139 +566,6 @@ void become_daemon(void)
 	}
 }
 
-/**
- * Return the IP addr of the client as a string 
- **/
-char *client_addr(int fd)
-{
-	struct sockaddr_storage ss;
-	socklen_t length = sizeof ss;
-	static char addr_buf[100];
-	static int initialised;
-
-	if (initialised) return addr_buf;
-
-	initialised = 1;
-
-	if (getpeername(fd, (struct sockaddr *)&ss, &length)) {
-		exit_cleanup(RERR_SOCKETIO);
-	}
-
-	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.
- *
- * The name is statically cached so that repeated lookups are quick,
- * so there is a limit of one lookup per customer.
- **/
-char *client_name(int fd)
-{
-	struct sockaddr_storage ss;
-	socklen_t length = sizeof ss;
-	static char name_buf[100];
-	static char port_buf[100];
-	char *def = "UNKNOWN";
-	static int initialised;
-	struct addrinfo hints, *res, *res0;
-	int error;
-
-	if (initialised) return name_buf;
-
-	initialised = 1;
-
-	strcpy(name_buf,def);
-
-	if (getpeername(fd, (struct sockaddr *)&ss, &length)) {
-		/* FIXME: Can we really not continue? */
-		rprintf(FERROR, RSYNC_NAME ": getpeername on fd%d failed: %s\n",
-			fd, strerror(errno));
-		exit_cleanup(RERR_SOCKETIO);
-	}
-
-#ifdef INET6
-        if (get_sockaddr_family(&ss) == AF_INET6 && 
-	    IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)&ss)->sin6_addr)) {
-		/* OK, so ss is in the IPv6 family, but it is really
-		 * an IPv4 address: something like
-		 * "::ffff:10.130.1.2".  If we use it as-is, then the
-		 * reverse lookup might fail or perhaps something else
-		 * bad might happen.  So instead we convert it to an
-		 * equivalent address in the IPv4 address family.  */
-		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;
-		/* FIXME: Isn't there a macro we can use here rather
-		 * than grovelling through the struct?  It might be
-		 * wrong on some systems. */
-		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;
-	}
-
-	/* XXX sin6_flowinfo and other fields */
-	for (res = res0; res; res = res->ai_next) {
-		if (res->ai_family != get_sockaddr_family(&ss))
-			continue;
-		if (res->ai_addrlen != length)
-			continue;
-		if (memcmp(res->ai_addr, &ss, res->ai_addrlen) == 0)
-			break;
-	}
-
-	if (res == NULL) {
-		strcpy(name_buf, def);
-		rprintf(FERROR, RSYNC_NAME ": "
-			"reverse name lookup for \"%s\" failed on fd%d - spoofed address? \n",
-			name_buf, fd);
-	}
-
-	freeaddrinfo(res0);
-	return name_buf;
-}
-
 
 /*******************************************************************
 this is like socketpair but uses tcp. It is used by the Samba
@@ -766,16 +634,20 @@ static int socketpair_tcp(int fd[2])
 }
 
 
-/*******************************************************************
-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
- ******************************************************************/
+
+/**
+ * Run a program on a local tcp socket, so that we can talk to it's
+ * stdin and stdout.  This is used to fake a connection to a daemon
+ * for testing -- not for the normal case of running SSH.
+ *
+ * @return 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",
@@ -788,10 +660,12 @@ int sock_exec(const char *prog)
 		close(1);
 		dup(fd[1]);
 		dup(fd[1]);
-		if (verbose > 3)
+		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]);