Simplify logging, update copyrights and some minor cleanups.

[tinc] / src / protocol_edge.c

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index bd473f1..d81fc87 100644 (file)
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -1,7 +1,7 @@
 /*
     protocol_edge.c -- handle the meta-protocol, edges
-    Copyright (C) 1999-2002 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2003 Ivo Timmermans <ivo@o2w.nl>,
+                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
 
     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,14 +17,13 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol_edge.c,v 1.1.4.12 2002/09/09 21:24:48 guus Exp $
+    $Id: protocol_edge.c,v 1.1.4.17 2003/07/12 17:41:47 guus Exp $
 */
 
 #include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
-#include <syslog.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <errno.h>
@@ -42,10 +41,11 @@
 #include "node.h"
 #include "edge.h"
 #include "graph.h"
+#include "logger.h"
 
 #include "system.h"
 
-int send_add_edge(connection_t * c, edge_t * e)
+int send_add_edge(connection_t *c, edge_t *e)
 {
        int x;
        char *address, *port;
@@ -63,7 +63,7 @@ int send_add_edge(connection_t * c, edge_t * e)
        return x;
 }
 
-int add_edge_h(connection_t * c)
+int add_edge_h(connection_t *c)
 {
        edge_t *e;
        node_t *from, *to;
@@ -79,7 +79,7 @@ int add_edge_h(connection_t * c)
 
        if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %lx %d",
                          from_name, to_name, to_address, to_port, &options, &weight) != 6) {
-               syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name,
+               logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name,
                           c->hostname);
                return -1;
        }
@@ -87,13 +87,13 @@ int add_edge_h(connection_t * c)
        /* Check if names are valid */
 
        if(check_id(from_name)) {
-               syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
+               logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
                           c->hostname, _("invalid name"));
                return -1;
        }
 
        if(check_id(to_name)) {
-               syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
+               logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
                           c->hostname, _("invalid name"));
                return -1;
        }
@@ -130,22 +130,20 @@ int add_edge_h(connection_t * c)
        if(e) {
                if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address)) {
                        if(from == myself) {
-                               if(debug_lvl >= DEBUG_PROTOCOL)
-                                       syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not match existing entry"),
+                               ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not match existing entry"),
                                                   "ADD_EDGE", c->name, c->hostname);
                                send_add_edge(c, e);
                                return 0;
                        } else {
-                               if(debug_lvl >= DEBUG_PROTOCOL)
-                                       syslog(LOG_WARNING, _("Got %s from %s (%s) which does not match existing entry"),
+                               ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) which does not match existing entry"),
                                                   "ADD_EDGE", c->name, c->hostname);
                                edge_del(e);
+                               graph();
                        }
                } else
                        return 0;
        } else if(from == myself) {
-               if(debug_lvl >= DEBUG_PROTOCOL)
-                       syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not exist"),
+               ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not exist"),
                                   "ADD_EDGE", c->name, c->hostname);
                e = new_edge();
                e->from = from;
@@ -174,7 +172,7 @@ int add_edge_h(connection_t * c)
        return 0;
 }
 
-int send_del_edge(connection_t * c, edge_t * e)
+int send_del_edge(connection_t *c, edge_t *e)
 {
        cp();
 
@@ -182,7 +180,7 @@ int send_del_edge(connection_t * c, edge_t * e)
                                                e->from->name, e->to->name);
 }
 
-int del_edge_h(connection_t * c)
+int del_edge_h(connection_t *c)
 {
        edge_t *e;
        char from_name[MAX_STRING_SIZE];
@@ -192,7 +190,7 @@ int del_edge_h(connection_t * c)
        cp();
 
        if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) {
-               syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_EDGE", c->name,
+               logger(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_EDGE", c->name,
                           c->hostname);
                return -1;
        }
@@ -200,13 +198,13 @@ int del_edge_h(connection_t * c)
        /* Check if names are valid */
 
        if(check_id(from_name)) {
-               syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
+               logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
                           c->hostname, _("invalid name"));
                return -1;
        }
 
        if(check_id(to_name)) {
-               syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
+               logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
                           c->hostname, _("invalid name"));
                return -1;
        }
@@ -219,10 +217,7 @@ int del_edge_h(connection_t * c)
        from = lookup_node(from_name);
 
        if(!from) {
-               if(debug_lvl >= DEBUG_PROTOCOL)
-                       syslog(LOG_ERR,
-                                  _
-                                  ("Got %s from %s (%s) which does not appear in the edge tree"),
+               ifdebug(PROTOCOL) logger(LOG_ERR, _("Got %s from %s (%s) which does not appear in the edge tree"),
                                   "DEL_EDGE", c->name, c->hostname);
                return 0;
        }
@@ -230,10 +225,7 @@ int del_edge_h(connection_t * c)
        to = lookup_node(to_name);
 
        if(!to) {
-               if(debug_lvl >= DEBUG_PROTOCOL)
-                       syslog(LOG_ERR,
-                                  _
-                                  ("Got %s from %s (%s) which does not appear in the edge tree"),
+               ifdebug(PROTOCOL) logger(LOG_ERR, _("Got %s from %s (%s) which does not appear in the edge tree"),
                                   "DEL_EDGE", c->name, c->hostname);
                return 0;
        }
@@ -243,17 +235,13 @@ int del_edge_h(connection_t * c)
        e = lookup_edge(from, to);
 
        if(!e) {
-               if(debug_lvl >= DEBUG_PROTOCOL)
-                       syslog(LOG_WARNING,
-                                  _
-                                  ("Got %s from %s (%s) which does not appear in the edge tree"),
+               ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) which does not appear in the edge tree"),
                                   "DEL_EDGE", c->name, c->hostname);
                return 0;
        }
 
        if(e->from == myself) {
-               if(debug_lvl >= DEBUG_PROTOCOL)
-                       syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself"),
+               ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself"),
                                   "DEL_EDGE", c->name, c->hostname);
                send_add_edge(c, e);    /* Send back a correction */
                return 0;