X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=f5817fcd6bdd8edd215a68a93cf3d3a1d90e716e;hb=90f1cba1fd9e748ec4b8274511d5a36ec1a24d9d;hp=e86aa6a012e58523c4b9c74b7f71c5024d9d602d;hpb=36623e15a1c8685e5d8730345c1a7f9c93710fef;p=tinc diff --git a/src/node.h b/src/node.h index e86aa6a0..f5817fcd 100644 --- a/src/node.h +++ b/src/node.h @@ -1,6 +1,6 @@ /* node.h -- header for node.c - Copyright (C) 2001-2010 Guus Sliepen , + Copyright (C) 2001-2012 Guus Sliepen , 2001-2005 Ivo Timmermans This program is free software; you can redistribute it and/or modify @@ -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);