Applied Martin Kihlgren's IdentityGenerosity patch,

[tinc] / src / graph.c

diff --git a/src/graph.c b/src/graph.c
index b6e60e0..3870c70 100644 (file)
--- 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.29 2003/08/28 21:05:10 guus Exp $
+    $Id: graph.c,v 1.1.2.34 2003/12/22 11:04:16 guus Exp $
 */
 
 /* We need to generate two trees from the graph:
@@ -188,12 +188,13 @@ void sssp_bfs(void)
 
                                /* Situation:
 
-                                   /
-                                  /
-                                  ------(n)-----(e->to)
-                                  \
-                                   \
+                                          /
+                                         /
+                                  ----->(n)---e-->(e->to)
+                                         \
+                                          \
 
+                                  Where e is an edge, (n) and (e->to) are nodes.
                                   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:
 
@@ -218,17 +219,8 @@ void sssp_bfs(void)
                                e->to->via = indirect ? n->via : e->to;
                                e->to->options = e->options;
 
-                               if(sockaddrcmp(&e->to->address, &e->address)) {
-                                       node = avl_unlink(node_udp_tree, e->to);
-                                       sockaddrfree(&e->to->address);
-                                       sockaddrcpy(&e->to->address, &e->address);
-
-                                       if(e->to->hostname)
-                                               free(e->to->hostname);
-
-                                       e->to->hostname = sockaddr2hostname(&e->to->address);
-                                       avl_insert_node(node_udp_tree, node);
-                               }
+                               if(sockaddrcmp(&e->to->address, &e->address))
+                                       update_node_address(e->to, &e->address);
 
                                node = avl_alloc_node();
                                node->data = e->to;
@@ -261,6 +253,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 ? : "");