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

Remove old edges from unreachable nodes to us. This prevents the hosts/NAME-up

Browse source 
script from being called twice in some situations.
This commit is contained in:
Guus Sliepen 2003-08-28 15:27:12 +00:00
parent ffb55e6904
commit 762cc2d279
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
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.198 2003/08/22 15:04:26 guus Exp $ $Id: net.c,v 1.35.4.199 2003/08/28 15:27:11 guus Exp $
*/ */
#include "system.h" #include "system.h"
@ -186,6 +186,17 @@ void terminate_connection(connection_t *c, bool report)
/* Run MST and SSSP algorithms */ /* Run MST and SSSP algorithms */
graph(); graph();
/* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
if(report && !c->node->status.reachable) {
edge_t *e;
e = lookup_edge(c->node, myself);
if(e) {
send_del_edge(broadcast, e);
edge_del(e);
}
}
} }
/* Check if this was our outgoing connection */ /* Check if this was our outgoing connection */

12
src/protocol_edge.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: protocol_edge.c,v 1.1.4.20 2003/07/24 12:08:16 guus Exp $ $Id: protocol_edge.c,v 1.1.4.21 2003/08/28 15:27:12 guus Exp $
*/ */
#include "system.h" #include "system.h"
@ -250,5 +250,15 @@ bool del_edge_h(connection_t *c)
graph(); graph();
/* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
if(!to->status.reachable) {
e = lookup_edge(to, myself);
if(e) {
send_del_edge(broadcast, e);
edge_del(e);
}
}
return true; return true;
} }