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

diff --git a/src/subnet.c b/src/subnet.c
index 3d1168de..4d646a5d 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -329,7 +329,7 @@ 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 *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
 	subnet_t *p, *r = NULL, subnet = {0};
 	avl_node_t *n;
 	int i;
@@ -339,6 +339,8 @@ subnet_t *lookup_subnet_mac(const mac_t *address) {
 	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];
 	}
@@ -349,10 +351,10 @@ subnet_t *lookup_subnet_mac(const mac_t *address) {
 	subnet.net.mac.address = *address;
 	subnet.owner = NULL;
 
-	for(n = subnet_tree->head; n; n = n->next) {
+	for(n = owner ? owner->subnet_tree->head : subnet_tree->head; n; n = n->next) {
 		p = n->data;
 		
-		if(!p || p->type != subnet.type)
+		if(!p || p->type != SUBNET_MAC)
 			continue;
 
 		if(!memcmp(address, &p->net.mac.address, sizeof *address)) {