X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fgraph.c;h=c8430d8251552b2a4bafb5d68144a211c651d182;hp=87bb220402dbd864e029782df1594eb55cdb9356;hb=a227843b739d279b63adcf3736ebb03d856080c4;hpb=3308d13e7e3bf20cfeaf6f2ab17228a9820cea66

diff --git a/src/graph.c b/src/graph.c
index 87bb2204..c8430d82 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -13,11 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 /* We need to generate two trees from the graph:
@@ -57,6 +55,7 @@
 #include "process.h"
 #include "subnet.h"
 #include "utils.h"
+#include "xalloc.h"
 
 static bool graph_changed = true;
 
@@ -65,8 +64,7 @@ static bool graph_changed = true;
    Please note that sorting on weight is already done by add_edge().
 */
 
-void mst_kruskal(void)
-{
+void mst_kruskal(void) {
 	avl_node_t *node, *next;
 	edge_t *e;
 	node_t *n;
@@ -75,8 +73,6 @@ void mst_kruskal(void)
 	int safe_edges = 0;
 	bool skipped;
 
-	cp();
-	
 	/* Clear MST status on connections */
 
 	for(node = connection_tree->head; node; node = node->next) {
@@ -149,8 +145,7 @@ void mst_kruskal(void)
    Running time: O(E)
 */
 
-void sssp_bfs(void)
-{
+void sssp_bfs(void) {
 	avl_node_t *node, *next, *to;
 	edge_t *e;
 	node_t *n;
@@ -162,8 +157,6 @@ void sssp_bfs(void)
 	char *envp[7];
 	int i;
 
-	cp();
-
 	todo_list = list_alloc(NULL);
 
 	/* Clear visited status on nodes */
@@ -264,18 +257,23 @@ void sssp_bfs(void)
 			n->minmtu = 0;
 			n->mtuprobes = 0;
 
-			asprintf(&envp[0], "NETNAME=%s", netname ? : "");
-			asprintf(&envp[1], "DEVICE=%s", device ? : "");
-			asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-			asprintf(&envp[3], "NODE=%s", n->name);
+			if(n->mtuevent) {
+				event_del(n->mtuevent);
+				n->mtuevent = NULL;
+			}
+
+			xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
+			xasprintf(&envp[1], "DEVICE=%s", device ? : "");
+			xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
+			xasprintf(&envp[3], "NODE=%s", n->name);
 			sockaddr2str(&n->address, &address, &port);
-			asprintf(&envp[4], "REMOTEADDRESS=%s", address);
-			asprintf(&envp[5], "REMOTEPORT=%s", port);
+			xasprintf(&envp[4], "REMOTEADDRESS=%s", address);
+			xasprintf(&envp[5], "REMOTEPORT=%s", port);
 			envp[6] = NULL;
 
 			execute_script(n->status.reachable ? "host-up" : "host-down", envp);
 
-			asprintf(&name,
+			xasprintf(&name,
 					 n->status.reachable ? "hosts/%s-up" : "hosts/%s-down",
 					 n->name);
 			execute_script(name, envp);
@@ -292,8 +290,7 @@ void sssp_bfs(void)
 	}
 }
 
-void graph(void)
-{
+void graph(void) {
 	subnet_cache_flush();
 	sssp_bfs();
 	mst_kruskal();
@@ -308,8 +305,7 @@ void graph(void)
    dot -Tpng graph_filename -o image_filename.png -Gconcentrate=true
 */
 
-void dump_graph(void)
-{
+void dump_graph(void) {
 	avl_node_t *node;
 	node_t *n;
 	edge_t *e;
@@ -326,7 +322,7 @@ void dump_graph(void)
 	if(filename[0] == '|') {
 		file = popen(filename + 1, "w");
 	} else {
-		asprintf(&tmpname, "%s.new", filename);
+		xasprintf(&tmpname, "%s.new", filename);
 		file = fopen(tmpname, "w");
 	}