X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=c8aa78824d51b8536c975291d9b99b4e9daf311b;hb=c8402791b82947c49ba1d04f855dab04191607ca;hp=8783b01a2b7749149cd087e8ae0d9d875def75ef;hpb=391985158c16f4a3894a798f6788cfb23dfcfea9;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index 8783b01a..c8aa7882 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -456,9 +456,12 @@ static void do_outgoing_pipe(connection_t *c, const char *command) {
 	sockaddr2str(&c->address, &host, &port);
 	setenv("REMOTEADDRESS", host, true);
 	setenv("REMOTEPORT", port, true);
-	setenv("NODE", c->name, true);
 	setenv("NAME", myself->name, true);
 
+	if(c->name) {
+		setenv("NODE", c->name, true);
+	}
+
 	if(netname) {
 		setenv("NETNAME", netname, true);
 	}
@@ -670,48 +673,17 @@ void setup_outgoing_connection(outgoing_t *outgoing, bool verbose) {
 
 	if(n->connection) {
 		logger(DEBUG_CONNECTIONS, LOG_INFO, "Already connected to %s", n->name);
-
-		if(!n->connection->outgoing) {
-			n->connection->outgoing = outgoing;
-			return;
-		} else {
-			goto remove;
-		}
+	} else {
+		do_outgoing_connection(outgoing);
 	}
-
-	do_outgoing_connection(outgoing);
-	return;
-
-remove:
-	list_delete(&outgoing_list, outgoing);
 }
 
-/*
-  accept a new tcp connect and create a
-  new connection
-*/
-void handle_new_meta_connection(void *data, int flags) {
-	(void)flags;
-	listen_socket_t *l = data;
-	connection_t *c;
-	sockaddr_t sa;
-	int fd;
-	socklen_t len = sizeof(sa);
-
-	fd = accept(l->tcp.fd, &sa.sa, &len);
-
-	if(fd < 0) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno));
-		return;
-	}
-
-	sockaddrunmap(&sa);
-
+static bool check_tarpit(const sockaddr_t *sa, int fd) {
 	// Check if we get many connections from the same host
 
 	static sockaddr_t prev_sa;
 
-	if(!sockaddrcmp_noport(&sa, &prev_sa)) {
+	if(!sockaddrcmp_noport(sa, &prev_sa)) {
 		static time_t samehost_burst;
 		static time_t samehost_burst_time;
 
@@ -726,7 +698,7 @@ void handle_new_meta_connection(void *data, int flags) {
 
 		if(samehost_burst > max_connection_burst) {
 			tarpit(fd);
-			return;
+			return true;
 		}
 	}
 
@@ -749,6 +721,34 @@ void handle_new_meta_connection(void *data, int flags) {
 	if(connection_burst >= max_connection_burst) {
 		connection_burst = max_connection_burst;
 		tarpit(fd);
+		return true;
+	}
+
+	return false;
+}
+
+/*
+  accept a new tcp connect and create a
+  new connection
+*/
+void handle_new_meta_connection(void *data, int flags) {
+	(void)flags;
+	listen_socket_t *l = data;
+	connection_t *c;
+	sockaddr_t sa;
+	int fd;
+	socklen_t len = sizeof(sa);
+
+	fd = accept(l->tcp.fd, &sa.sa, &len);
+
+	if(fd < 0) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno));
+		return;
+	}
+
+	sockaddrunmap(&sa);
+
+	if(!is_local_connection(&sa) && check_tarpit(&sa, fd)) {
 		return;
 	}
 
@@ -853,17 +853,16 @@ void try_outgoing_connections(void) {
 			node_t *n = lookup_node(name);
 
 			if(!n) {
-				n = new_node();
-				n->name = xstrdup(name);
+				n = new_node(name);
 				node_add(n);
 			}
 
-			free(name);
-
 			outgoing->node = n;
 			list_insert_tail(&outgoing_list, outgoing);
 			setup_outgoing_connection(outgoing, true);
 		}
+
+		free(name);
 	}
 
 	/* Terminate any connections whose outgoing_t is to be deleted. */