X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=a41b887de35a29971c0fd6764a0dfed1e5666f97;hb=e717e424c22233aa728b75c4c8bb047e13b0107a;hp=d0beb19f2ed20a603e4fc3625b9f2c8f2e351a38;hpb=65f5e8fba45c6c51cfdfa2a41ab6db14663cdf73;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index d0beb19f..a41b887d 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -116,7 +116,7 @@ static bool bind_to_interface(int sd) {
 static bool bind_to_address(connection_t *c) {
 	int s = -1;
 
-	for(int i = 0; i < listen_sockets; i++) {
+	for(int i = 0; i < listen_sockets && listen_socket[i].bindto; i++) {
 		if(listen_socket[i].sa.sa.sa_family != c->address.sa.sa_family)
 			continue;
 		if(s >= 0)
@@ -547,6 +547,39 @@ begin:
 	return true;
 }
 
+// Find edges pointing to this node, and use them to build a list of unique, known addresses.
+static struct addrinfo *get_known_addresses(node_t *n) {
+	struct addrinfo *ai = NULL;
+
+	for splay_each(edge_t, e, n->edge_tree) {
+		if(!e->reverse)
+			continue;
+
+		bool found = false;
+		for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
+			if(!sockaddrcmp(&e->reverse->address, (sockaddr_t *)aip->ai_addr)) {
+				found = true;
+				break;
+			}
+		}
+		if(found)
+			continue;
+
+		struct addrinfo *nai = xzalloc(sizeof *nai);
+		if(ai)
+			ai->ai_next = nai;
+		ai = nai;
+		ai->ai_family = e->reverse->address.sa.sa_family;
+		ai->ai_socktype = SOCK_STREAM;
+		ai->ai_protocol = IPPROTO_TCP;
+		ai->ai_addrlen = SALEN(e->reverse->address.sa);
+		ai->ai_addr = xmalloc(ai->ai_addrlen);
+		memcpy(ai->ai_addr, &e->reverse->address, ai->ai_addrlen);
+	}
+
+	return ai;
+}
+
 void setup_outgoing_connection(outgoing_t *outgoing) {
 	timeout_del(&outgoing->ev);
 
@@ -564,8 +597,12 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
 	outgoing->cfg = lookup_config(outgoing->config_tree, "Address");
 
 	if(!outgoing->cfg) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "No address specified for %s", outgoing->name);
-		return;
+		if(n)
+			outgoing->aip = outgoing->ai = get_known_addresses(n);
+		if(!outgoing->ai) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "No address known for %s", outgoing->name);
+			return;
+		}
 	}
 
 	do_outgoing_connection(outgoing);
@@ -594,7 +631,6 @@ void handle_new_meta_connection(void *data, int flags) {
 	// Check if we get many connections from the same host
 
 	static sockaddr_t prev_sa;
-	static time_t prev_time;
 	static int tarpit = -1;
 
 	if(tarpit >= 0) {
@@ -602,14 +638,25 @@ void handle_new_meta_connection(void *data, int flags) {
 		tarpit = -1;
 	}
 
-	if(prev_time == now.tv_sec && !sockaddrcmp_noport(&sa, &prev_sa)) {
-		// if so, keep the connection open but ignore it completely.
-		tarpit = fd;
-		return;
+	if(!sockaddrcmp_noport(&sa, &prev_sa)) {
+		static int samehost_burst;
+		static int samehost_burst_time;
+
+		if(now.tv_sec - samehost_burst_time > samehost_burst)
+			samehost_burst = 0;
+		else
+			samehost_burst -= now.tv_sec - samehost_burst_time;
+
+		samehost_burst_time = now.tv_sec;
+		samehost_burst++;
+
+		if(samehost_burst > max_connection_burst) {
+			tarpit = fd;
+			return;
+		}
 	}
 
 	memcpy(&prev_sa, &sa, sizeof sa);
-	prev_time = now.tv_sec;
 
 	// Check if we get many connections from different hosts