Handle timeouts during connecting the same way as other errors.

[oweals/tinc.git] / src / graph.c

diff --git a/src/graph.c b/src/graph.c
index c177347060786fdcc1f8ef574d7d3edc409c6c1b..adca74594d3d25e9e98f1e817886e6cc258ebfd9 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,7 +1,7 @@
 /*
     graph.c -- graph algorithms
-    Copyright (C) 2001-2003 Guus Sliepen <guus@sliepen.eu.org>,
-                  2001-2003 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2001-2004 Guus Sliepen <guus@tinc-vpn.org>,
+                  2001-2004 Ivo Timmermans <ivo@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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.32 2003/12/20 21:09:33 guus Exp $
+    $Id$
 */
 
 /* We need to generate two trees from the graph:
@@ -230,10 +230,10 @@ void sssp_bfs(void)
                                        e->to->hostname = sockaddr2hostname(&e->to->address);
                                        avl_insert_node(node_udp_tree, node);
 
-                                       if(e->to->options & OPTION_DONTFRAGMENT) {
-                                               e->to->mtu = MTU;
+                                       if(e->to->options & OPTION_PMTU_DISCOVERY) {
                                                e->to->mtuprobes = 0;
-                                               e->to->probedmtu = 0;
+                                               e->to->minmtu = 0;
+                                               e->to->maxmtu = MTU;
                                                if(e->to->status.validkey)
                                                        send_mtu_probe(e->to);
                                        }
@@ -270,6 +270,10 @@ void sssp_bfs(void)
                        n->status.validkey = false;
                        n->status.waitingforkey = false;
 
+                       n->maxmtu = MTU;
+                       n->minmtu = 0;
+                       n->mtuprobes = 0;
+
                        asprintf(&envp[0], "NETNAME=%s", netname ? : "");
                        asprintf(&envp[1], "DEVICE=%s", device ? : "");
                        asprintf(&envp[2], "INTERFACE=%s", iface ? : "");