X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=05d751ccda77d73d46cb92d6c26af7a5ed9aa523;hb=8dfa072733feab737cabf69f000c70657719826a;hp=9164085c2796b2fb92a583febbcd3aca014aaaba;hpb=8de8f1d9e2c2c02d4a14a5506e7d0d914dc328da;p=tinc diff --git a/src/node.h b/src/node.h index 9164085c..05d751cc 100644 --- a/src/node.h +++ b/src/node.h @@ -25,17 +25,18 @@ #include "cipher.h" #include "connection.h" #include "digest.h" -#include "list.h" +#include "ecdh.h" #include "subnet.h" typedef struct node_status_t { - int unused_active:1; /* 1 if active (not used for nodes) */ - int validkey:1; /* 1 if we currently have a valid key for him */ - int unused_waitingforkey:1; /* 1 if we already sent out a request */ - int visited:1; /* 1 if this node has been visited by one of the graph algorithms */ - int reachable:1; /* 1 if this node is reachable in the graph */ - int indirect:1; /* 1 if this node is not directly reachable by us */ - int unused:26; + 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 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 unused:25; } node_status_t; typedef struct node_t { @@ -48,6 +49,8 @@ typedef struct node_t { node_status_t status; time_t last_req_key; + ecdh_t ecdh; /* State for ECDH key exchange */ + cipher_t incipher; /* Cipher for UDP packets */ digest_t indigest; /* Digest for UDP packets */