projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
22dd23b
)
When purging nodes, only delete them if nobody references them anymore.
author
Guus Sliepen
<guus@tinc-vpn.org>
Fri, 22 Aug 2003 15:04:26 +0000
(15:04 +0000)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Fri, 22 Aug 2003 15:04:26 +0000
(15:04 +0000)
src/net.c
patch
|
blob
|
history
diff --git
a/src/net.c
b/src/net.c
index
7d8c58c
..
1f0655b
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: net.c,v 1.35.4.19
7 2003/08/17 12:05:08
guus Exp $
+ $Id: net.c,v 1.35.4.19
8 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) {
nnext = nnode->next;
n = (node_t *) nnode->data;
for(nnode = node_tree->head; nnode; nnode = nnext) {
nnext = nnode->next;
n = (node_t *) nnode->data;
@@
-80,8
+82,26
@@
static void purge(void)
send_del_edge(broadcast, e);
edge_del(e);
}
send_del_edge(broadcast, e);
edge_del(e);
}
+ }
+ }
+
+ /* 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;
+ }
- node_del(n);
+ if(!enode)
+ node_del(n);
}
}
}
}
}
}