X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Froute.c;h=dbe38dfbf2f0206a6984199fa8976b7593d5c942;hb=fb0cfccf7dc2240b576011edcf74fd5b058916cb;hp=0123107e4acabc444efbc8767d07410a26939396;hpb=134dc8995b296b0bd8b346617c705204b0f3125c;p=tinc

diff --git a/src/route.c b/src/route.c
index 0123107e..dbe38dfb 100644
--- a/src/route.c
+++ b/src/route.c
@@ -22,7 +22,7 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "connection.h"
 #include "ethernet.h"
 #include "ipv4.h"
@@ -51,6 +51,8 @@ static const size_t icmp6_size = sizeof(struct icmp6_hdr);
 static const size_t ns_size = sizeof(struct nd_neighbor_solicit);
 static const size_t opt_size = sizeof(struct nd_opt_hdr);
 
+static struct event age_subnets_event;
+
 /* RFC 1071 */
 
 static uint16_t inet_checksum(void *data, int len, uint16_t prevsum)
@@ -75,6 +77,7 @@ static uint16_t inet_checksum(void *data, int len, uint16_t prevsum)
 static bool ratelimit(int frequency) {
 	static time_t lasttime = 0;
 	static int count = 0;
+	time_t now = time(NULL);
 	
 	if(lasttime == now) {
 		if(++count > frequency)
@@ -95,10 +98,47 @@ static bool checklength(node_t *source, vpn_packet_t *packet, length_t length) {
 		return true;
 }
 	
+static void age_subnets(int fd, short events, void *data)
+{
+	subnet_t *s;
+	connection_t *c;
+	splay_node_t *node, *next, *node2;
+	bool left = false;
+	time_t now = time(NULL);
+
+	cp();
+
+	for(node = myself->subnet_tree->head; node; node = next) {
+		next = node->next;
+		s = node->data;
+		if(s->expires && s->expires < now) {
+			ifdebug(TRAFFIC) {
+				char netstr[MAXNETSTR];
+				if(net2str(netstr, sizeof netstr, s))
+					logger(LOG_INFO, _("Subnet %s expired"), netstr);
+			}
+
+			for(node2 = connection_tree->head; node2; node2 = node2->next) {
+				c = node2->data;
+				if(c->status.active)
+					send_del_subnet(c, s);
+			}
+
+			subnet_del(myself, s);
+		} else {
+			if(s->expires)
+				left = true;
+		}
+	}
+
+	if(left)
+		event_add(&age_subnets_event, &(struct timeval){10, 0});
+}
+
 static void learn_mac(mac_t *address)
 {
 	subnet_t *subnet;
-	avl_node_t *node;
+	splay_node_t *node;
 	connection_t *c;
 
 	cp();
@@ -114,7 +154,7 @@ static void learn_mac(mac_t *address)
 
 		subnet = new_subnet();
 		subnet->type = SUBNET_MAC;
-		subnet->expires = now + macexpire;
+		subnet->expires = time(NULL) + macexpire;
 		subnet->net.mac.address = *address;
 		subnet_add(myself, subnet);
 
@@ -125,38 +165,13 @@ static void learn_mac(mac_t *address)
 			if(c->status.active)
 				send_add_subnet(c, subnet);
 		}
-	}
-
-	if(subnet->expires)
-		subnet->expires = now + macexpire;
-}
-
-void age_subnets(void)
-{
-	subnet_t *s;
-	connection_t *c;
-	avl_node_t *node, *next, *node2;
 
-	cp();
-
-	for(node = myself->subnet_tree->head; node; node = next) {
-		next = node->next;
-		s = node->data;
-		if(s->expires && s->expires < now) {
-			ifdebug(TRAFFIC) {
-				char netstr[MAXNETSTR];
-				if(net2str(netstr, sizeof netstr, s))
-					logger(LOG_INFO, _("Subnet %s expired"), netstr);
-			}
-
-			for(node2 = connection_tree->head; node2; node2 = node2->next) {
-				c = node2->data;
-				if(c->status.active)
-					send_del_subnet(c, s);
-			}
-
-			subnet_del(myself, s);
-		}
+		if(!timeout_initialized(&age_subnets_event))
+			timeout_set(&age_subnets_event, age_subnets, NULL);
+		event_add(&age_subnets_event, &(struct timeval){10, 0});
+	} else {
+		if(subnet->expires)
+			subnet->expires = time(NULL) + macexpire;
 	}
 }