X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=2d84aced1cdee1119a549dbc222800c7625b2d17;hb=65d6f023c46ac3a087f59b60762f87c869783f21;hp=a7db40aa6bca3ebb647b5b24a3ddf44e685364c4;hpb=b995243ac3d9605003996ba879808ddcbc77ae15;p=tinc diff --git a/src/connection.h b/src/connection.h index a7db40aa..2d84aced 100644 --- 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,8 +48,9 @@ typedef struct connection_status_t { unsigned int unused:21; } connection_status_t; +#include "ecdh.h" +#include "ecdsa.h" #include "edge.h" -#include "list.h" #include "net.h" #include "node.h" @@ -57,7 +59,8 @@ typedef struct connection_t { union sockaddr_t address; /* his real (internet) ip */ char *hostname; /* the hostname of its real ip */ - int protocol_version; /* used protocol */ + int protocol_major; /* used protocol */ + int protocol_minor; /* used protocol */ int socket; /* socket used for this connection */ uint32_t options; /* options for this connection */ @@ -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);