X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1b42f628f495ff0cdaa8a7c219d8ce33192281fe..4ecf3e067151e45dc7dead9862416722dcb4a20f:/socket.c

diff --git a/socket.c b/socket.c
index ca8c5612..8d4a89db 100644
--- a/socket.c
+++ b/socket.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1992-2001 Andrew Tridgell <tridge@samba.org>
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2007 Wayne Davison
+ * Copyright (C) 2003-2008 Wayne Davison
  *
  * 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
@@ -31,7 +31,9 @@
 #include <netinet/tcp.h>
 
 extern char *bind_address;
+extern char *sockopts;
 extern int default_af_hint;
+extern int connect_timeout;
 
 #ifdef HAVE_SIGACTION
 static struct sigaction sigact;
@@ -157,6 +159,11 @@ int try_bind_local(int s, int ai_family, int ai_socktype,
 	return -1;
 }
 
+/* connect() timeout handler based on alarm() */
+static RETSIGTYPE contimeout_handler(UNUSED(int val))
+{
+	connect_timeout = -1;
+}
 
 /**
  * Open a socket to a tcp remote host with the specified port .
@@ -261,11 +268,28 @@ int open_socket_out(char *host, int port, const char *bind_addr,
 			s = -1;
 			continue;
 		}
-		if (connect(s, res->ai_addr, res->ai_addrlen) < 0) {
+		if (connect_timeout > 0) {
+			SIGACTION(SIGALRM, contimeout_handler);
+			alarm(connect_timeout);
+		}
+
+		set_socket_options(s, sockopts);
+		while (connect(s, res->ai_addr, res->ai_addrlen) < 0) {
+			if (connect_timeout < 0)
+				exit_cleanup(RERR_CONTIMEOUT);
+			if (errno == EINTR)
+				continue;
 			close(s);
 			s = -1;
-			continue;
+			break;
 		}
+
+		if (connect_timeout > 0)
+			alarm(0);
+
+		if (s < 0)
+			continue;
+
 		if (proxied
 		 && establish_proxy_connection(s, host, port,
 					       proxy_user, proxy_pass) != 0) {
@@ -411,6 +435,10 @@ static int *open_socket_in(int type, int port, const char *bind_addr,
 
 		setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
 			   (char *)&one, sizeof one);
+		if (sockopts)
+			set_socket_options(s, sockopts);
+		else
+			set_socket_options(s, lp_socket_options());
 
 #ifdef IPV6_V6ONLY
 		if (resp->ai_family == AF_INET6) {
@@ -703,35 +731,6 @@ void set_socket_options(int fd, char *options)
 	free(options);
 }
 
-/**
- * Become a daemon, discarding the controlling terminal
- **/
-void become_daemon(void)
-{
-	int i;
-
-	if (fork()) {
-		_exit(0);
-	}
-
-	/* detach from the terminal */
-#ifdef HAVE_SETSID
-	setsid();
-#elif defined TIOCNOTTY
-	i = open("/dev/tty", O_RDWR);
-	if (i >= 0) {
-		ioctl(i, (int)TIOCNOTTY, (char *)0);
-		close(i);
-	}
-#endif
-	/* make sure that stdin, stdout an stderr don't stuff things
-	 * up (library functions, for example) */
-	for (i = 0; i < 3; i++) {
-		close(i);
-		open("/dev/null", O_RDWR);
-	}
-}
-
 
 /**
  * This is like socketpair but uses tcp. It is used by the Samba