Drop libevent and use our own event handling again.

[tinc] / src / node.c

diff --git a/src/node.c b/src/node.c
index debc915..465a48a 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -1,6 +1,6 @@
 /*
     node.c -- node tree management
-    Copyright (C) 2001-2011 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-splay_tree_t *node_tree;                       /* Known nodes, sorted by name */
+splay_tree_t *node_tree;
 static hash_t *node_udp_cache;
 
 node_t *myself;
@@ -78,9 +78,8 @@ void free_node(node_t *n) {
        ecdsa_free(&n->ecdsa);
        sptps_stop(&n->sptps);
 
-       if(timeout_initialized(&n->mtuevent))
-               event_del(&n->mtuevent);
-       
+       timeout_del(&n->mtutimeout);
+
        if(n->hostname)
                free(n->hostname);
 
@@ -98,21 +97,11 @@ void node_add(node_t *n) {
 }
 
 void node_del(node_t *n) {
-       splay_node_t *node, *next;
-       edge_t *e;
-       subnet_t *s;
-
-       for(node = n->subnet_tree->head; node; node = next) {
-               next = node->next;
-               s = node->data;
+       for splay_each(subnet_t, s, n->subnet_tree)
                subnet_del(n, s);
-       }
 
-       for(node = n->edge_tree->head; node; node = next) {
-               next = node->next;
-               e = node->data;
+       for splay_each(edge_t, e, n->edge_tree)
                edge_del(e);
-       }
 
        splay_delete(node_tree, n);
 }
@@ -135,48 +124,39 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) {
                return;
        }
 
-       if(n->hostname)
-               free(n->hostname);
-
        hash_insert(node_udp_cache, &n->address, NULL);
 
        if(sa) {
                n->address = *sa;
+               n->sock = 0;
+               for(int i = 0; i < listen_sockets; i++) {
+                       if(listen_socket[i].sa.sa.sa_family == sa->sa.sa_family) {
+                               n->sock = i;
+                               break;
+                       }
+               }
                hash_insert(node_udp_cache, sa, n);
+               free(n->hostname);
                n->hostname = sockaddr2hostname(&n->address);
                logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
-       } else {
-               memset(&n->address, 0, sizeof n->address);
-               n->hostname = NULL;
-               logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s cleared", n->name);
        }
 }
 
 bool dump_nodes(connection_t *c) {
-       splay_node_t *node;
-       node_t *n;
-
-       for(node = node_tree->head; node; node = node->next) {
-               n = node->data;
-               send_request(c, "%d %d %s at %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %hd (min %hd max %hd)", CONTROL, REQ_DUMP_NODES,
-                          n->name, n->hostname, cipher_get_nid(&n->outcipher),
+       for splay_each(node_t, n, node_tree)
+               send_request(c, "%d %d %s %s %d %d %d %d %x %x %s %s %d %hd %hd %hd %ld", CONTROL, REQ_DUMP_NODES,
+                          n->name, n->hostname ?: "unknown port unknown", cipher_get_nid(&n->outcipher),
                           digest_get_nid(&n->outdigest), (int)digest_length(&n->outdigest), n->outcompression,
                           n->options, bitfield_to_int(&n->status, sizeof n->status), n->nexthop ? n->nexthop->name : "-",
-                          n->via ? n->via->name ?: "-" : "-", n->distance, n->mtu, n->minmtu, n->maxmtu);
-       }
+                          n->via ? n->via->name ?: "-" : "-", n->distance, n->mtu, n->minmtu, n->maxmtu, (long)n->last_state_change);
 
        return send_request(c, "%d %d", CONTROL, REQ_DUMP_NODES);
 }
 
 bool dump_traffic(connection_t *c) {
-       splay_node_t *node;
-       node_t *n;
-
-       for(node = node_tree->head; node; node = node->next) {
-               n = node->data;
+       for splay_each(node_t, n, node_tree)
                send_request(c, "%d %d %s %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, CONTROL, REQ_DUMP_TRAFFIC,
                           n->name, n->in_packets, n->in_bytes, n->out_packets, n->out_bytes);
-       }
 
        return send_request(c, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);
 }