Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[meshlink] / src / node.h

diff --git a/src/node.h b/src/node.h
index 417373728a22b540f40a8f6a95c3a700ec6f59d1..4464011fc1f60e3ad94a355510432cb6039b1b69 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -25,7 +25,7 @@
 #include "cipher.h"
 #include "connection.h"
 #include "digest.h"
-#include "list.h"
+#include "ecdh.h"
 #include "subnet.h"
 
 typedef struct node_status_t {
@@ -35,19 +35,24 @@ 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 unused:26;
+       unsigned int ecdh:1;                    /* 1 if this node supports ECDH key exchange */
+       unsigned int unused:25;
 } node_status_t;
 
 typedef struct node_t {
        char *name;                             /* name of this node */
        uint32_t options;                       /* options turned on for this node */
 
+       int sock;                               /* Socket to use for outgoing UDP packets */
        sockaddr_t address;                     /* his real (internet) ip to send UDP packets to */
        char *hostname;                         /* the hostname of its real ip */
 
        node_status_t status;
        time_t last_req_key;
 
+       ecdsa_t ecdsa;                          /* His public ECDSA key */
+       ecdh_t ecdh;                            /* State for ECDH key exchange */
+
        cipher_t incipher;                        /* Cipher for UDP packets */
        digest_t indigest;                        /* Digest for UDP packets */