X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=0c93fedfe1f853a1fb43d8960e4d4691cb5cf33d;hb=refs%2Fheads%2F1.0-gnutls;hp=1b3ca36755d24564ce9547db6d73d082026319e2;hpb=e449d94caef963809d417f16497f6f978e10d731;p=tinc

diff --git a/src/connection.h b/src/connection.h
index 1b3ca367..0c93fedf 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -17,24 +17,19 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: connection.h,v 1.1.2.34 2003/07/17 15:06:26 guus Exp $
+    $Id: connection.h,v 1.1.2.40 2003/12/20 21:25:17 guus Exp $
 */
 
 #ifndef __TINC_CONNECTION_H__
 #define __TINC_CONNECTION_H__
 
-#include <openssl/rsa.h>
-#include <openssl/evp.h>
+#include <gnutls/gnutls.h>
 
 #include "avl_tree.h"
-#include "conf.h"
-#include "edge.h"
-#include "list.h"
-#include "net.h"
-#include "node.h"
 
 #define OPTION_INDIRECT		0x0001
 #define OPTION_TCPONLY		0x0002
+#define OPTION_PMTU_DISCOVERY	0x0004
 
 typedef struct connection_status_t {
 	int pinged:1;				/* sent ping */
@@ -45,19 +40,24 @@ typedef struct connection_status_t {
 	int timeout:1;				/* 1 if gotten timeout */
 	int encryptout:1;			/* 1 if we can encrypt outgoing traffic */
 	int decryptin:1;			/* 1 if we have to decrypt incoming traffic */
-	int mst:1;					/* 1 if this connection is part of a minimum spanning tree */
-	int unused:18;
+	int mst:1;				/* 1 if this connection is part of a minimum spanning tree */
+	int unused:23;
 } connection_status_t;
 
+#include "edge.h"
+#include "list.h"
+#include "net.h"
+#include "node.h"
+
 typedef struct connection_t {
-	char *name;					/* name he claims to have */
+	char *name;			/* name he claims to have */
 
-	sockaddr_t address;			/* his real (internet) ip */
-	char *hostname;				/* the hostname of its real ip */
+	union sockaddr_t address;	/* his real (internet) ip */
+	char *hostname;			/* the hostname of its real ip */
 	int protocol_version;		/* used protocol */
 
-	int socket;					/* socket used for this connection */
-	long int options;			/* options for this connection */
+	int socket;			/* socket used for this connection */
+	long int options;		/* options for this connection */
 	struct connection_status_t status;	/* status info */
 	int estimated_weight;		/* estimation for the weight of the edge for this connection */
 	struct timeval start;		/* time this connection was started, used for above estimation */
@@ -66,29 +66,14 @@ typedef struct connection_t {
 	struct node_t *node;		/* node associated with the other end */
 	struct edge_t *edge;		/* edge associated with this connection */
 
-	RSA *rsa_key;				/* his public/private key */
-	const EVP_CIPHER *incipher;	/* Cipher he will use to send data to us */
-	const EVP_CIPHER *outcipher;	/* Cipher we will use to send data to him */
-	EVP_CIPHER_CTX *inctx;		/* Context of encrypted meta data that will come from him to us */
-	EVP_CIPHER_CTX *outctx;		/* Context of encrypted meta data that will be sent from us to him */
-	char *inkey;				/* His symmetric meta key + iv */
-	char *outkey;				/* Our symmetric meta key + iv */
-	int inkeylength;			/* Length of his key + iv */
-	int outkeylength;			/* Length of our key + iv */
-	const EVP_MD *indigest;
-	const EVP_MD *outdigest;
-	int inmaclength;
-	int outmaclength;
-	int incompression;
-	int outcompression;
-	char *mychallenge;			/* challenge we received from him */
-	char *hischallenge;			/* challenge we sent to him */
+	gnutls_session session;
+	gnutls_certificate_credentials credentials;
 
 	char buffer[MAXBUFSIZE];	/* metadata input buffer */
-	int buflen;					/* bytes read into buffer */
-	int reqlen;					/* length of incoming request */
-	int tcplen;					/* length of incoming TCPpacket */
-	int allow_request;			/* defined if there's only one request possible */
+	int buflen;			/* bytes read into buffer */
+	int reqlen;			/* length of incoming request */
+	int tcplen;			/* length of incoming TCPpacket */
+	int allow_request;		/* defined if there's only one request possible */
 
 	time_t last_ping_time;		/* last time we saw some activity from the other end */
 
@@ -100,11 +85,11 @@ extern connection_t *broadcast;
 
 extern void init_connections(void);
 extern void exit_connections(void);
-extern connection_t *new_connection(void) __attribute__ ((malloc));
+extern connection_t *new_connection(void) __attribute__ ((__malloc__));
 extern void free_connection(connection_t *);
 extern void connection_add(connection_t *);
 extern void connection_del(connection_t *);
 extern void dump_connections(void);
-extern int read_connection_config(connection_t *);
+extern bool read_connection_config(connection_t *);
 
 #endif							/* __TINC_CONNECTION_H__ */