X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fgraph.c;h=f0a93aee3a7800b36712839e11e1ed5ec13ee5b5;hp=d1bd2ac34c908a8f9c569f4e92189e5f798f5e38;hb=c3ad3731a8dfa34535a156a7cfdb4e18afaa8bce;hpb=f75dcef72a81a337e847adf0bae54198894f65b9 diff --git a/src/graph.c b/src/graph.c index d1bd2ac3..f0a93aee 100644 --- a/src/graph.c +++ b/src/graph.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. - $Id: graph.c,v 1.1.2.19 2002/09/09 21:24:34 guus Exp $ + $Id: graph.c,v 1.1.2.22 2003/01/17 00:37:17 guus Exp $ */ /* We need to generate two trees from the graph: @@ -48,7 +48,6 @@ #include #include -#include "config.h" #include #ifdef HAVE_SYS_PARAM_H #include @@ -202,26 +201,25 @@ void sssp_bfs(void) /* Situation: - / + / / ------(n)-----(e->to) \ - \ + \ n->address is set to the e->address of the edge left of n to n. We are currently examining the edge e right of n from n: - If e->reverse->address != n->address, then e->to is probably - not reachable for the nodes left of n. We do as if the indirectdata - flag is set on edge e. + not reachable for the nodes left of n. We do as if the indirectdata + flag is set on edge e. - If edge e provides for better reachability of e->to, update - e->to and (re)add it to the todo_tree to (re)examine the reachability - of nodes behind it. + e->to and (re)add it to the todo_tree to (re)examine the reachability + of nodes behind it. */ indirect = n->status.indirect || e->options & OPTION_INDIRECT - || ((n != myself) - && sockaddrcmp(&n->address, &e->reverse->address)); + || ((n != myself) && sockaddrcmp(&n->address, &e->reverse->address)); if(e->to->status.visited && (!e->to->status.indirect || indirect)) @@ -264,13 +262,14 @@ void sssp_bfs(void) if(n->status.visited != n->status.reachable) { n->status.reachable = !n->status.reachable; - if(debug_lvl >= DEBUG_TRAFFIC) + if(debug_lvl >= DEBUG_TRAFFIC) { if(n->status.reachable) syslog(LOG_DEBUG, _("Node %s (%s) became reachable"), n->name, n->hostname); else syslog(LOG_DEBUG, _("Node %s (%s) became unreachable"), n->name, n->hostname); + } n->status.validkey = 0; n->status.waitingforkey = 0;