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

diff --git a/src/net_socket.c b/src/net_socket.c
index d0beb19f..30b36a74 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)
@@ -594,7 +594,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 +601,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