K&R style braces

[tinc] / src / graph.c

diff --git a/src/graph.c b/src/graph.c
index 2fc3b74..c04cef4 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -47,6 +47,7 @@
 #include "system.h"
 
 #include "avl_tree.h"
+#include "config.h"
 #include "connection.h"
 #include "device.h"
 #include "edge.h"
@@ -62,8 +63,7 @@
    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;
@@ -98,7 +98,13 @@ void mst_kruskal(void)
 
        /* Starting point */
 
-       ((edge_t *) edge_weight_tree->head->data)->from->status.visited = true;
+       for(node = edge_weight_tree->head; node; node = node->next) {
+               e = node->data;
+               if(e->from->status.reachable) {
+                       e->from->status.visited = true;
+                       break;
+               }
+       }
 
        /* Add safe edges */
 
@@ -140,8 +146,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;
@@ -302,8 +307,72 @@ void sssp_bfs(void)
        }
 }
 
-void graph(void)
-{
-       mst_kruskal();
+/* Dump nodes and edges to a graphviz file.
+          
+   The file can be converted to an image with
+   dot -Tpng graph_filename -o image_filename.png -Gconcentrate=true
+*/
+
+static void dump_graph(int fd, short events, void *data) {
+       avl_node_t *node;
+       node_t *n;
+       edge_t *e;
+       char *filename = NULL, *tmpname = NULL;
+       FILE *file;
+       
+       if(!get_config_string(lookup_config(config_tree, "GraphDumpFile"), &filename))
+               return;
+
+       ifdebug(PROTOCOL) logger(LOG_NOTICE, "Dumping graph");
+       
+       if(filename[0] == '|') {
+               file = popen(filename + 1, "w");
+       } else {
+               asprintf(&tmpname, "%s.new", filename);
+               file = fopen(tmpname, "w");
+       }
+
+       if(!file) {
+               logger(LOG_ERR, "Unable to open graph dump file %s: %s", filename, strerror(errno));
+               free(tmpname);
+               return;
+       }
+
+       fprintf(file, "digraph {\n");
+       
+       /* dump all nodes first */
+       for(node = node_tree->head; node; node = node->next) {
+               n = node->data;
+               fprintf(file, " %s [label = \"%s\"];\n", n->name, n->name);
+       }
+
+       /* now dump all edges */
+       for(node = edge_weight_tree->head; node; node = node->next) {
+               e = node->data;
+               fprintf(file, " %s -> %s;\n", e->from->name, e->to->name);
+       }
+
+       fprintf(file, "}\n");   
+       
+       if(filename[0] == '|') {
+               pclose(file);
+       } else {
+               fclose(file);
+#ifdef HAVE_MINGW
+               unlink(filename);
+#endif
+               rename(tmpname, filename);
+               free(tmpname);
+       }
+}
+
+void graph(void) {
+       static struct event ev;
+
        sssp_bfs();
+       mst_kruskal();
+
+       if(!timeout_initialized(&ev))
+               timeout_set(&ev, dump_graph, NULL);
+       event_add(&ev, &(struct timeval){5, 0});
 }