Merge branch 'master' into 1.1

[tinc] / src / node.h

diff --git a/src/node.h b/src/node.h
index e86aa6a..b338815 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -1,6 +1,6 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2010 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -35,8 +35,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 {