j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

When purging nodes, only delete them if nobody references them anymore.

Browse source
This commit is contained in:
Guus Sliepen 2003-08-22 15:04:26 +00:00
parent 22dd23b650
commit 89c9f3ed8f
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/net.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.c,v 1.35.4.197 2003/08/17 12:05:08 guus Exp $ $Id: net.c,v 1.35.4.198 2003/08/22 15:04:26 guus Exp $
*/ */
#include "system.h" #include "system.h"
@ -59,6 +59,8 @@ static void purge(void)
ifdebug(PROTOCOL) logger(LOG_DEBUG, _("Purging unreachable nodes")); ifdebug(PROTOCOL) logger(LOG_DEBUG, _("Purging unreachable nodes"));
/* Remove all edges and subnets owned by unreachable nodes. */
for(nnode = node_tree->head; nnode; nnode = nnext) { for(nnode = node_tree->head; nnode; nnode = nnext) {
nnext = nnode->next; nnext = nnode->next;
n = (node_t *) nnode->data; n = (node_t *) nnode->data;
@ -80,8 +82,26 @@ static void purge(void)
send_del_edge(broadcast, e); send_del_edge(broadcast, e);
edge_del(e); edge_del(e);
} }
}
}
node_del(n); /* Check if anyone else claims to have an edge to an unreachable node. If not, delete node. */
for(nnode = node_tree->head; nnode; nnode = nnext) {
nnext = nnode->next;
n = (node_t *) nnode->data;
if(!n->status.reachable) {
for(enode = edge_weight_tree->head; enode; enode = enext) {
enext = enode->next;
e = (edge_t *) enode->data;
if(e->to == n)
break;
}
if(!enode)
node_del(n);
} }
} }
} }