Small fixes in proxy code.

[tinc] / src / node.c

diff --git a/src/node.c b/src/node.c
index 92af66a..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
@@ -42,15 +42,11 @@ static int node_udp_compare(const node_t *a, const node_t *b) {
 }
 
 void init_nodes(void) {
-       cp();
-
        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();
-
        avl_delete_tree(node_udp_tree);
        avl_delete_tree(node_tree);
 }
@@ -58,8 +54,7 @@ void exit_nodes(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);
@@ -71,8 +66,6 @@ node_t *new_node(void) {
 }
 
 void free_node(node_t *n) {
-       cp();
-
        if(n->inkey)
                free(n->inkey);
 
@@ -99,12 +92,13 @@ 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();
-
        avl_insert(node_tree, n);
 }
 
@@ -113,8 +107,6 @@ void node_del(node_t *n) {
        edge_t *e;
        subnet_t *s;
 
-       cp();
-
        for(node = n->subnet_tree->head; node; node = next) {
                next = node->next;
                s = node->data;
@@ -132,19 +124,15 @@ void node_del(node_t *n) {
 }
 
 node_t *lookup_node(char *name) {
-       node_t n = {0};
+       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 n = {NULL};
 
        n.address = *sa;
        n.name = NULL;
@@ -153,6 +141,11 @@ node_t *lookup_node_udp(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)
@@ -165,7 +158,7 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) {
                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);
        }
 }
@@ -174,18 +167,16 @@ 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, 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.");
 }