X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=528e046b9464a9903a79bad73aceaccc8d123cbf;hp=309ebe4e8fb699ebc23bfaaf2561770adebd84c6;hb=9f53ab209d8a6a7622a49ed03cef735b6e3f3eeb;hpb=5038964032ef55913b2d4741c67bf191b2208abb

diff --git a/src/net.c b/src/net.c
index 309ebe4e..528e046b 100644
--- a/src/net.c
+++ b/src/net.c
@@ -68,9 +68,9 @@ static void purge(void) {
 			for(snode = n->subnet_tree->head; snode; snode = snext) {
 				snext = snode->next;
 				s = snode->data;
+				send_del_subnet(broadcast, s);
 				if(!strictsubnets)
-					send_del_subnet(broadcast, s);
-				subnet_del(n, s);
+					subnet_del(n, s);
 			}
 
 			for(enode = n->edge_tree->head; enode; enode = enext) {
@@ -98,7 +98,8 @@ static void purge(void) {
 					break;
 			}
 
-			if(!enode)
+			if(!enode && (!strictsubnets || !n->subnet_tree->head))
+				/* in strictsubnets mode do not delete nodes with subnets */
 				node_del(n);
 		}
 	}
@@ -488,6 +489,31 @@ int main_loop(void) {
 
 			last_config_check = now;
 
+			/* If StrictSubnet is set, expire deleted Subnets and read new ones in */
+
+			if(strictsubnets) {
+				subnet_t *subnet;
+
+				for(node = subnet_tree->head; node; node = node->next) {
+					subnet = node->data;
+					subnet->expires = 1;
+				}
+
+				load_all_subnets();
+
+				for(node = subnet_tree->head; node; node = next) {
+					next = node->next;
+					subnet = node->data;
+					if(subnet->expires == 1) {
+						send_del_subnet(broadcast, subnet);
+						subnet_del(subnet->owner, subnet);
+					} else if(subnet->expires == -1) {
+						send_add_subnet(broadcast, subnet);
+						subnet->expires = 0;
+					}
+				}
+			}
+
 			/* Try to make outgoing connections */
 			
 			try_outgoing_connections();