X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5c9730a46c44e5913a4d4767bd99ec23f2f81073..af642a61b369ae6e488d674e17aa5242ae9d34d1:/socket.c

diff --git a/socket.c b/socket.c
index 1e7a9edb..2aa8481a 100644
--- a/socket.c
+++ b/socket.c
@@ -1,5 +1,6 @@
-/* 
-   Copyright (C) Andrew Tridgell 1998
+/* -*- c-file-style: "linux" -*-
+   
+   Copyright (C) 1998-2000 by Andrew Tridgell 
    
    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
@@ -89,10 +90,11 @@ 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)
+int open_socket_out(char *host, int port, struct in_addr *address)
 {
 	int type = SOCK_STREAM;
 	struct sockaddr_in sock_out;
+	struct sockaddr_in sock;
 	int res;
 	struct hostent *hp;
 	char *h;
@@ -137,6 +139,13 @@ int open_socket_out(char *host, int port)
 	sock_out.sin_port = htons(p);
 	sock_out.sin_family = PF_INET;
 
+	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(res,(struct sockaddr *)&sock_out,sizeof(sock_out))) {
 		rprintf(FERROR,"failed to connect to %s - %s\n", h, strerror(errno));
 		close(res);
@@ -148,8 +157,6 @@ int open_socket_out(char *host, int port)
 		return -1;
 	}
 
-	set_nonblocking(res);
-
 	return res;
 }
 
@@ -205,13 +212,27 @@ static int open_socket_in(int type, int port, struct in_addr *address)
 }
 
 
-/****************************************************************************
-determine if a file descriptor is in fact a socket
-****************************************************************************/
+/*
+ * Determine if a file descriptor is in fact a socket
+ */
 int is_a_socket(int fd)
 {
-	int v,l;
+	int v, 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.
+         *
+         * Debian says: ``The fifth argument of getsockopt and
+         * setsockopt is in reality an int [*] (and this is what BSD
+         * 4.* and libc4 and libc5 have).  Some POSIX confusion
+         * resulted in the present socklen_t.  The draft standard has
+         * not been adopted yet, but glibc2 already follows it and
+         * also has socklen_t [*]. See also accept(2).''
+         *
+         * We now return to your regularly scheduled programming.  */
 	return(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&v, &l) == 0);
 }
 
@@ -241,6 +262,11 @@ void start_accept_loop(int port, int (*fn)(int ))
 		struct sockaddr addr;
 		int in_addrlen = sizeof(addr);
 
+		/* close log file before the potentially very long select so
+		   file can be trimmed by another process instead of growing
+		   forever */
+		log_close();
+
 		FD_ZERO(&fds);
 		FD_SET(s, &fds);
 
@@ -250,6 +276,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);
 
 		if (fd == -1) continue;
@@ -266,7 +293,9 @@ void start_accept_loop(int port, int (*fn)(int ))
 		if (fork()==0) {
 			close(s);
 
-			set_nonblocking(fd);
+			/* open log file in child before possibly giving
+			   up privileges  */
+			log_open();
 
 			_exit(fn(fd));
 		}