X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=4d646a5d4ae09ce4518eecaacd32b6ec57fc827f;hp=ef4e59e9b7b8d4d1f2191b52b479af59d11cbc43;hb=92aefd25bf9e8e63f199cc252218f5c427f836b7;hpb=4c85542894f7fca823b119b05e07179deb24229a

diff --git a/src/subnet.c b/src/subnet.c
index ef4e59e9..4d646a5d 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -47,9 +47,15 @@ static subnet_t *cache_ipv6_subnet[2];
 static bool cache_ipv6_valid[2];
 static int cache_ipv6_slot;
 
+static mac_t cache_mac_address[2];
+static subnet_t *cache_mac_subnet[2];
+static bool cache_mac_valid[2];
+static int cache_mac_slot;
+
 void subnet_cache_flush() {
 	cache_ipv4_valid[0] = cache_ipv4_valid[1] = false;
 	cache_ipv6_valid[0] = cache_ipv6_valid[1] = false;
+	cache_mac_valid[0] = cache_mac_valid[1] = false;
 }
 
 /* Subnet comparison */
@@ -323,16 +329,49 @@ subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
 	return avl_search(owner->subnet_tree, subnet);
 }
 
-subnet_t *lookup_subnet_mac(const mac_t *address) {
-	subnet_t *p, subnet = {0};
+subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
+	subnet_t *p, *r = NULL, subnet = {0};
+	avl_node_t *n;
+	int i;
+
+	// Check if this address is cached
+
+	for(i = 0; i < 2; i++) {
+		if(!cache_mac_valid[i])
+			continue;
+		if(owner && cache_mac_subnet[i] && cache_mac_subnet[i]->owner != owner)
+			continue;
+		if(!memcmp(address, &cache_mac_address[i], sizeof *address))
+			return cache_mac_subnet[i];
+	}
+
+	// Search all subnets for a matching one
 
 	subnet.type = SUBNET_MAC;
 	subnet.net.mac.address = *address;
 	subnet.owner = NULL;
 
-	p = avl_search(subnet_tree, &subnet);
+	for(n = owner ? owner->subnet_tree->head : subnet_tree->head; n; n = n->next) {
+		p = n->data;
+		
+		if(!p || p->type != SUBNET_MAC)
+			continue;
 
-	return p;
+		if(!memcmp(address, &p->net.mac.address, sizeof *address)) {
+			r = p;
+			if(p->owner->status.reachable)
+				break;
+		}
+	}
+
+	// Cache the result
+
+	cache_mac_slot = !cache_mac_slot;
+	memcpy(&cache_mac_address[cache_mac_slot], address, sizeof *address);
+	cache_mac_subnet[cache_mac_slot] = r;
+	cache_mac_valid[cache_mac_slot] = true;
+
+	return r;
 }
 
 subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {