Make datagram SPTPS key exchange more robust.

[tinc] / src / node.h

diff --git a/src/node.h b/src/node.h
index 62ed3ac..d6d07d4 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -25,17 +25,16 @@
 #include "cipher.h"
 #include "connection.h"
 #include "digest.h"
-#include "ecdh.h"
 #include "subnet.h"
 
 typedef struct node_status_t {
        unsigned int unused_active:1;           /* 1 if active (not used for nodes) */
        unsigned int validkey:1;                /* 1 if we currently have a valid key for him */
-       unsigned int unused_waitingforkey:1;    /* 1 if we already sent out a request */
+       unsigned int waitingforkey:1;           /* 1 if we already sent out a request */
        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;
 
@@ -48,10 +47,11 @@ typedef struct node_t {
        char *hostname;                         /* the hostname of its real ip */
 
        node_status_t status;
+       time_t last_state_change;
        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 +92,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);