Replace node_udp_tree with a hash table.

[tinc] / src / node.h

diff --git a/src/node.h b/src/node.h
index 62ed3ac..f5817fc 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -25,7 +25,6 @@
 #include "cipher.h"
 #include "connection.h"
 #include "digest.h"
-#include "ecdh.h"
 #include "subnet.h"
 
 typedef struct node_status_t {
@@ -35,7 +34,7 @@ typedef struct node_status_t {
        unsigned int visited:1;                 /* 1 if this node has been visited by one of the graph algorithms */
        unsigned int reachable:1;               /* 1 if this node is reachable in the graph */
        unsigned int indirect:1;                /* 1 if this node is not directly reachable by us */
-       unsigned int ecdh:1;                    /* 1 if this node supports ECDH key exchange */
+       unsigned int sptps:1;                   /* 1 if this node supports SPTPS */
        unsigned int unused:25;
 } node_status_t;
 
@@ -51,7 +50,7 @@ typedef struct node_t {
        time_t last_req_key;
 
        ecdsa_t ecdsa;                          /* His public ECDSA key */
-       ecdh_t ecdh;                            /* State for ECDH key exchange */
+       sptps_t sptps;
 
        cipher_t incipher;                        /* Cipher for UDP packets */
        digest_t indigest;                        /* Digest for UDP packets */  
@@ -92,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);