X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=40671db0183e061dc01b309b1b36832fd94e5a4e;hb=2c6b2d70e6640f39563ad7bb0aa0ba87f883848c;hp=05ee3b17397839460f2031510ac9a885540ac209;hpb=f41e5faeaae94973ef1040356532afa277ae130f;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index 05ee3b17..40671db0 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -25,10 +25,8 @@
 #include "address_cache.h"
 #include "conf.h"
 #include "connection.h"
-#include "control_common.h"
 #include "list.h"
 #include "logger.h"
-#include "meta.h"
 #include "names.h"
 #include "net.h"
 #include "netutl.h"
@@ -706,8 +704,8 @@ void handle_new_meta_connection(void *data, int flags) {
 	static sockaddr_t prev_sa;
 
 	if(!sockaddrcmp_noport(&sa, &prev_sa)) {
-		static int samehost_burst;
-		static int samehost_burst_time;
+		static time_t samehost_burst;
+		static time_t samehost_burst_time;
 
 		if(now.tv_sec - samehost_burst_time > samehost_burst) {
 			samehost_burst = 0;
@@ -728,8 +726,8 @@ void handle_new_meta_connection(void *data, int flags) {
 
 	// Check if we get many connections from different hosts
 
-	static int connection_burst;
-	static int connection_burst_time;
+	static time_t connection_burst;
+	static time_t connection_burst_time;
 
 	if(now.tv_sec - connection_burst_time > connection_burst) {
 		connection_burst = 0;
@@ -866,6 +864,8 @@ void try_outgoing_connections(void) {
 				node_add(n);
 			}
 
+			free(name);
+
 			outgoing->node = n;
 			list_insert_tail(outgoing_list, outgoing);
 			setup_outgoing_connection(outgoing, true);