projects
/
oweals
/
tinc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Never delete Subnets when StrictSubnets is set
[oweals/tinc.git]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index 309ebe4e8fb699ebc23bfaaf2561770adebd84c6..6ffd9989d5d4356e6e83c1e3cc08edfa20e16b08 100644
(file)
--- 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;
for(snode = n->subnet_tree->head; snode; snode = snext) {
snext = snode->next;
s = snode->data;
+ send_del_subnet(broadcast, s);
if(!strictsubnets)
if(!strictsubnets)
- send_del_subnet(broadcast, s);
- subnet_del(n, s);
+ subnet_del(n, s);
}
for(enode = n->edge_tree->head; enode; enode = enext) {
}
for(enode = n->edge_tree->head; enode; enode = enext) {
@@
-98,7
+98,8
@@
static void purge(void) {
break;
}
break;
}
- if(!enode)
+ if(!enode && (!strictsubnets || !n->subnet_tree->head))
+ /* in strictsubnets mode do not delete nodes with subnets */
node_del(n);
}
}
node_del(n);
}
}