Remove newlines from log messages.

[tinc] / src / node.c

diff --git a/src/node.c b/src/node.c
index a4ef78f..cf70f83 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -1,6 +1,6 @@
 /*
     node.c -- node tree management
-    Copyright (C) 2001-2009 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2011 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -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.
 */
 
 #include "system.h"
@@ -35,38 +33,28 @@ avl_tree_t *node_udp_tree;          /* Known nodes, sorted by address and port */
 
 node_t *myself;
 
-static int node_compare(const node_t *a, const node_t *b)
-{
+static int node_compare(const node_t *a, const node_t *b) {
        return strcmp(a->name, b->name);
 }
 
-static int node_udp_compare(const node_t *a, const node_t *b)
-{
+static int node_udp_compare(const node_t *a, const node_t *b) {
        return sockaddrcmp(&a->address, &b->address);
 }
 
-void init_nodes(void)
-{
-       cp();
-
+void init_nodes(void) {
        node_tree = avl_alloc_tree((avl_compare_t) node_compare, (avl_action_t) free_node);
        node_udp_tree = avl_alloc_tree((avl_compare_t) node_udp_compare, NULL);
 }
 
-void exit_nodes(void)
-{
-       cp();
-
+void exit_nodes(void) {
        avl_delete_tree(node_udp_tree);
        avl_delete_tree(node_tree);
 }
 
-node_t *new_node(void)
-{
+node_t *new_node(void) {
        node_t *n = xmalloc_and_zero(sizeof(*n));
 
-       cp();
-
+       if(replaywin) n->late = xmalloc_and_zero(replaywin);
        n->subnet_tree = new_subnet_tree();
        n->edge_tree = new_edge_tree();
        EVP_CIPHER_CTX_init(&n->inctx);
@@ -77,10 +65,7 @@ node_t *new_node(void)
        return n;
 }
 
-void free_node(node_t *n)
-{
-       cp();
-
+void free_node(node_t *n) {
        if(n->inkey)
                free(n->inkey);
 
@@ -107,24 +92,21 @@ void free_node(node_t *n)
        if(n->name)
                free(n->name);
 
+       if(n->late)
+               free(n->late);
+
        free(n);
 }
 
-void node_add(node_t *n)
-{
-       cp();
-
+void node_add(node_t *n) {
        avl_insert(node_tree, n);
 }
 
-void node_del(node_t *n)
-{
+void node_del(node_t *n) {
        avl_node_t *node, *next;
        edge_t *e;
        subnet_t *s;
 
-       cp();
-
        for(node = n->subnet_tree->head; node; node = next) {
                next = node->next;
                s = node->data;
@@ -137,26 +119,20 @@ void node_del(node_t *n)
                edge_del(e);
        }
 
-       avl_delete(node_tree, n);
        avl_delete(node_udp_tree, n);
+       avl_delete(node_tree, n);
 }
 
-node_t *lookup_node(char *name)
-{
-       node_t n = {0};
+node_t *lookup_node(char *name) {
+       node_t n = {NULL};
 
-       cp();
-       
        n.name = name;
 
        return avl_search(node_tree, &n);
 }
 
-node_t *lookup_node_udp(const sockaddr_t *sa)
-{
-       node_t n = {0};
-
-       cp();
+node_t *lookup_node_udp(const sockaddr_t *sa) {
+       node_t n = {NULL};
 
        n.address = *sa;
        n.name = NULL;
@@ -164,8 +140,12 @@ node_t *lookup_node_udp(const sockaddr_t *sa)
        return avl_search(node_udp_tree, &n);
 }
 
-void update_node_udp(node_t *n, const sockaddr_t *sa)
-{
+void update_node_udp(node_t *n, const sockaddr_t *sa) {
+       if(n == myself) {
+               logger(LOG_WARNING, "Trying to update UDP address of myself!");
+               return;
+       }
+
        avl_delete(node_udp_tree, n);
 
        if(n->hostname)
@@ -174,33 +154,29 @@ void update_node_udp(node_t *n, const sockaddr_t *sa)
        if(sa) {
                n->address = *sa;
                n->hostname = sockaddr2hostname(&n->address);
-               avl_delete(node_udp_tree, n);
                avl_insert(node_udp_tree, n);
                ifdebug(PROTOCOL) logger(LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
        } else {
                memset(&n->address, 0, sizeof n->address);
-               n->hostname = 0;
+               n->hostname = NULL;
                ifdebug(PROTOCOL) logger(LOG_DEBUG, "UDP address of %s cleared", n->name);
        }
 }
 
-void dump_nodes(void)
-{
+void dump_nodes(void) {
        avl_node_t *node;
        node_t *n;
 
-       cp();
-
-       logger(LOG_DEBUG, _("Nodes:"));
+       logger(LOG_DEBUG, "Nodes:");
 
        for(node = node_tree->head; node; node = node->next) {
                n = node->data;
-               logger(LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s pmtu %d (min %d max %d)"),
+               logger(LOG_DEBUG, " %s at %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s pmtu %d (min %d max %d)",
                           n->name, n->hostname, n->outcipher ? n->outcipher->nid : 0,
                           n->outdigest ? n->outdigest->type : 0, n->outmaclength, n->outcompression,
-                          n->options, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-",
+                          n->options, bitfield_to_int(&n->status, sizeof n->status), n->nexthop ? n->nexthop->name : "-",
                           n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu);
        }
 
-       logger(LOG_DEBUG, _("End of nodes."));
+       logger(LOG_DEBUG, "End of nodes.");
 }