Avoid allocating packet buffers unnecessarily.

[meshlink] / src / edge.c

diff --git a/src/edge.c b/src/edge.c
index f5aa0994412e2b0416467cf03ada7ce423cc3f6b..afe9cfe325ad19bc82d33fe7f9e796fb794285a7 100644 (file)
--- a/src/edge.c
+++ b/src/edge.c
@@ -1,7 +1,6 @@
 /*
     edge.c -- edge tree management
-    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -21,16 +20,14 @@
 #include "system.h"
 
 #include "splay_tree.h"
-#include "control_common.h"
 #include "edge.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "netutl.h"
 #include "node.h"
 #include "utils.h"
 #include "xalloc.h"
 
-splay_tree_t *edge_weight_tree;        /* Tree with all edges, sorted on weight */
-
 static int edge_compare(const edge_t *a, const edge_t *b) {
        return strcmp(a->to->name, b->to->name);
 }
@@ -40,19 +37,21 @@ static int edge_weight_compare(const edge_t *a, const edge_t *b) {
 
        result = a->weight - b->weight;
 
-       if(result)
+       if(result) {
                return result;
+       }
 
        result = strcmp(a->from->name, b->from->name);
 
-       if(result)
+       if(result) {
                return result;
+       }
 
        return strcmp(a->to->name, b->to->name);
 }
 
-void init_edges(void) {
-       edge_weight_tree = splay_alloc_tree((splay_compare_t) edge_weight_compare, NULL);
+void init_edges(meshlink_handle_t *mesh) {
+       mesh->edges = splay_alloc_tree((splay_compare_t) edge_weight_compare, NULL);
 }
 
 splay_tree_t *new_edge_tree(void) {
@@ -63,14 +62,18 @@ void free_edge_tree(splay_tree_t *edge_tree) {
        splay_delete_tree(edge_tree);
 }
 
-void exit_edges(void) {
-       splay_delete_tree(edge_weight_tree);
+void exit_edges(meshlink_handle_t *mesh) {
+       if(mesh->edges) {
+               splay_delete_tree(mesh->edges);
+       }
+
+       mesh->edges = NULL;
 }
 
 /* Creation and deletion of connection elements */
 
 edge_t *new_edge(void) {
-       return xmalloc_and_zero(sizeof(edge_t));
+       return xzalloc(sizeof(edge_t));
 }
 
 void free_edge(edge_t *e) {
@@ -79,51 +82,34 @@ void free_edge(edge_t *e) {
        free(e);
 }
 
-void edge_add(edge_t *e) {
-       splay_insert(edge_weight_tree, e);
+void edge_add(meshlink_handle_t *mesh, edge_t *e) {
+       splay_insert(mesh->edges, e);
        splay_insert(e->from->edge_tree, e);
 
        e->reverse = lookup_edge(e->to, e->from);
 
-       if(e->reverse)
+       if(e->reverse) {
                e->reverse->reverse = e;
+       }
 }
 
-void edge_del(edge_t *e) {
-       if(e->reverse)
+void edge_del(meshlink_handle_t *mesh, edge_t *e) {
+       if(e->reverse) {
                e->reverse->reverse = NULL;
+       }
 
-       splay_delete(edge_weight_tree, e);
+       splay_delete(mesh->edges, e);
        splay_delete(e->from->edge_tree, e);
 }
 
 edge_t *lookup_edge(node_t *from, node_t *to) {
+       assert(from);
+       assert(to);
+
        edge_t v;
-       
+
        v.from = from;
        v.to = to;
 
        return splay_search(from->edge_tree, &v);
 }
-
-bool dump_edges(connection_t *c) {
-       splay_node_t *node, *node2;
-       node_t *n;
-       edge_t *e;
-       char *address;
-
-       for(node = node_tree->head; node; node = node->next) {
-               n = node->data;
-               for(node2 = n->edge_tree->head; node2; node2 = node2->next) {
-                       e = node2->data;
-                       address = sockaddr2hostname(&e->address);
-                       send_request(c, "%d %d %s to %s at %s options %x weight %d",
-                                       CONTROL, REQ_DUMP_EDGES,
-                                       e->from->name, e->to->name, address,
-                                       e->options, e->weight);
-                       free(address);
-               }
-       }
-
-       return send_request(c, "%d %d", CONTROL, REQ_DUMP_EDGES);
-}