Simplify logging, update copyrights and some minor cleanups.

[tinc] / src / edge.c

diff --git a/src/edge.c b/src/edge.c
index 8c10009..3bceb00 100644 (file)
--- a/src/edge.c
+++ b/src/edge.c
@@ -1,7 +1,7 @@
 /*
     edge.c -- edge tree management
-    Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.eu.org>,
-                  2000-2002 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2000-2003 Guus Sliepen <guus@sliepen.eu.org>,
+                  2000-2003 Ivo Timmermans <ivo@o2w.nl>
 
     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,13 +17,12 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: edge.c,v 1.1.2.16 2002/09/09 21:24:31 guus Exp $
+    $Id: edge.c,v 1.1.2.21 2003/07/12 17:41:45 guus Exp $
 */
 
 #include "config.h"
 
 #include <stdio.h>
-#include <syslog.h>
 #include <string.h>
 
 #include <avl_tree.h>
@@ -31,24 +30,24 @@
 
 #include "net.h"                               /* Don't ask. */
 #include "netutl.h"
-#include "config.h"
 #include "conf.h"
 #include <utils.h>
 #include "subnet.h"
 #include "edge.h"
 #include "node.h"
+#include "logger.h"
 
 #include "xalloc.h"
 #include "system.h"
 
 avl_tree_t *edge_weight_tree;  /* Tree with all edges, sorted on weight */
 
-int edge_compare(edge_t * a, edge_t * b)
+static int edge_compare(edge_t *a, edge_t *b)
 {
        return strcmp(a->to->name, b->to->name);
 }
 
-int edge_weight_compare(edge_t * a, edge_t * b)
+static int edge_weight_compare(edge_t *a, edge_t *b)
 {
        int result;
 
@@ -80,7 +79,7 @@ avl_tree_t *new_edge_tree(void)
        return avl_alloc_tree((avl_compare_t) edge_compare, NULL);
 }
 
-void free_edge_tree(avl_tree_t * edge_tree)
+void free_edge_tree(avl_tree_t *edge_tree)
 {
        cp();
 
@@ -103,14 +102,14 @@ edge_t *new_edge(void)
        return (edge_t *) xmalloc_and_zero(sizeof(edge_t));
 }
 
-void free_edge(edge_t * e)
+void free_edge(edge_t *e)
 {
        cp();
 
        free(e);
 }
 
-void edge_add(edge_t * e)
+void edge_add(edge_t *e)
 {
        cp();
 
@@ -123,7 +122,7 @@ void edge_add(edge_t * e)
                e->reverse->reverse = e;
 }
 
-void edge_del(edge_t * e)
+void edge_del(edge_t *e)
 {
        cp();
 
@@ -134,7 +133,7 @@ void edge_del(edge_t * e)
        avl_delete(edge_weight_tree, e);
 }
 
-edge_t *lookup_edge(node_t * from, node_t * to)
+edge_t *lookup_edge(node_t *from, node_t *to)
 {
        edge_t v;
 
@@ -155,18 +154,18 @@ void dump_edges(void)
 
        cp();
 
-       syslog(LOG_DEBUG, _("Edges:"));
+       logger(LOG_DEBUG, _("Edges:"));
 
        for(node = node_tree->head; node; node = node->next) {
                n = (node_t *) node->data;
                for(node2 = n->edge_tree->head; node2; node2 = node2->next) {
                        e = (edge_t *) node2->data;
                        address = sockaddr2hostname(&e->address);
-                       syslog(LOG_DEBUG, _(" %s to %s at %s options %lx weight %d"),
+                       logger(LOG_DEBUG, _(" %s to %s at %s options %lx weight %d"),
                                   e->from->name, e->to->name, address, e->options, e->weight);
                        free(address);
                }
        }
 
-       syslog(LOG_DEBUG, _("End of edges."));
+       logger(LOG_DEBUG, _("End of edges."));
 }