Replace node_udp_tree with a hash table.

diff --git a/src/net_packet.c b/src/net_packet.c
index ac63f62803e53cf11a6b5568c54ba5cc9995c08a..d45f0d03463459faf9cec04563a2528b4e36feba 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -773,7 +773,7 @@ void broadcast_packet(const node_t *from, vpn_packet_t *packet) {
                        if(from != myself)
                                break;
 
-                       for(node = node_udp_tree->head; node; node = node->next) {
+                       for(node = node_tree->head; node; node = node->next) {
                                n = node->data;
 
                                if(n->status.reachable && ((n->via == myself && n->nexthop == n) || n->via == n))
@@ -823,7 +823,7 @@ static node_t *try_harder(const sockaddr_t *from, const vpn_packet_t *pkt) {
 void handle_incoming_vpn_data(int sock, short events, void *data) {
        vpn_packet_t pkt;
        char *hostname;
-       sockaddr_t from;
+       sockaddr_t from = {{0}};
        socklen_t fromlen = sizeof from;
        node_t *n;
        int len;

diff --git a/src/node.c b/src/node.c
index dfd11e2a337a74cf436ebc518858983f7e341768..debc91552ef8b31e8d546b72dc1abe91a657149a 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -21,16 +21,17 @@
 #include "system.h"
 
 #include "control_common.h"
-#include "splay_tree.h"
+#include "hash.h"
 #include "logger.h"
 #include "net.h"
 #include "netutl.h"
 #include "node.h"
+#include "splay_tree.h"
 #include "utils.h"
 #include "xalloc.h"
 
 splay_tree_t *node_tree;                       /* Known nodes, sorted by name */
-splay_tree_t *node_udp_tree;           /* Known nodes, sorted by address and port */
+static hash_t *node_udp_cache;
 
 node_t *myself;
 
@@ -38,24 +39,13 @@ 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) {
-       int result;
-
-       result = sockaddrcmp(&a->address, &b->address);
-
-       if(result)
-               return result;
-
-       return (a->name && b->name) ? strcmp(a->name, b->name) : 0;
-}
-
 void init_nodes(void) {
        node_tree = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node);
-       node_udp_tree = splay_alloc_tree((splay_compare_t) node_udp_compare, NULL);
+       node_udp_cache = hash_alloc(0x100, sizeof(sockaddr_t));
 }
 
 void exit_nodes(void) {
-       splay_delete_tree(node_udp_tree);
+       hash_free(node_udp_cache);
        splay_delete_tree(node_tree);
 }
 
@@ -124,7 +114,6 @@ void node_del(node_t *n) {
                edge_del(e);
        }
 
-       splay_delete(node_udp_tree, n);
        splay_delete(node_tree, n);
 }
 
@@ -137,12 +126,7 @@ node_t *lookup_node(char *name) {
 }
 
 node_t *lookup_node_udp(const sockaddr_t *sa) {
-       node_t n = {NULL};
-
-       n.address = *sa;
-       n.name = NULL;
-
-       return splay_search(node_udp_tree, &n);
+       return hash_search(node_udp_cache, sa);
 }
 
 void update_node_udp(node_t *n, const sockaddr_t *sa) {
@@ -151,15 +135,15 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) {
                return;
        }
 
-       splay_delete(node_udp_tree, n);
-
        if(n->hostname)
                free(n->hostname);
 
+       hash_insert(node_udp_cache, &n->address, NULL);
+
        if(sa) {
                n->address = *sa;
+               hash_insert(node_udp_cache, sa, n);
                n->hostname = sockaddr2hostname(&n->address);
-               splay_insert(node_udp_tree, n);
                logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
        } else {
                memset(&n->address, 0, sizeof n->address);

diff --git a/src/node.h b/src/node.h
index e7f1f62f929a0fb329587ff79e6f8279b02955cf..f5817fcd6bdd8edd215a68a93cf3d3a1d90e716e 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -91,7 +91,6 @@ typedef struct node_t {
 
 extern struct node_t *myself;
 extern splay_tree_t *node_tree;
-extern splay_tree_t *node_udp_tree;
 
 extern void init_nodes(void);
 extern void exit_nodes(void);