Use SPTPS when ExperimentalProtocol is enabled.

[tinc] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index 21edf11..2d84ace 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -26,6 +26,7 @@
 #include "digest.h"
 #include "rsa.h"
 #include "splay_tree.h"
+#include "sptps.h"
 
 #define OPTION_INDIRECT                0x0001
 #define OPTION_TCPONLY         0x0002
@@ -47,6 +48,8 @@ typedef struct connection_status_t {
                unsigned int unused:21;
 } connection_status_t;
 
+#include "ecdh.h"
+#include "ecdsa.h"
 #include "edge.h"
 #include "net.h"
 #include "node.h"
@@ -69,11 +72,13 @@ typedef struct connection_t {
        struct node_t *node;            /* node associated with the other end */
        struct edge_t *edge;            /* edge associated with this connection */
 
-       rsa_t rsa;                      /* his public/private key */
+       rsa_t rsa;                      /* his public RSA key */
+       ecdsa_t ecdsa;                  /* his public ECDSA key */
        cipher_t incipher;              /* Cipher he will use to send data to us */
        cipher_t outcipher;             /* Cipher we will use to send data to him */
        digest_t indigest;
        digest_t outdigest;
+       sptps_t sptps;
 
        int inmaclength;
        int outmaclength;
@@ -95,7 +100,7 @@ typedef struct connection_t {
 } connection_t;
 
 extern splay_tree_t *connection_tree;
-extern connection_t *broadcast;
+extern connection_t *everyone;
 
 extern void init_connections(void);
 extern void exit_connections(void);