X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=23be3624d68b75da8d534502b82043d1a4526bbc;hb=153abaa4d940bf2bc9bd7275d5efe5c01c354190;hp=e86aa6a012e58523c4b9c74b7f71c5024d9d602d;hpb=f5dc136cfd7a3a195b75f7174722734e25f30fd9;p=tinc diff --git a/src/node.h b/src/node.h index e86aa6a0..23be3624 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,8 +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 unused:25; + unsigned int unused:26; } node_status_t; typedef struct node_t { @@ -51,7 +49,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 */