X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=58eea4e694742ab26d0af94b39177493bbb41bbb;hb=8ac096b5bf9da1b3961a3ac4a03d083629222a63;hp=20e00763c0a1d9881b15509b34061b0327b0bce0;hpb=3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b;p=tinc

diff --git a/src/connection.h b/src/connection.h
index 20e00763..58eea4e6 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,6 +1,6 @@
 /*
     connection.h -- header for connection.c
-    Copyright (C) 2000-2010 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -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
@@ -42,9 +43,10 @@ typedef struct connection_status_t {
 		unsigned int encryptout:1;		/* 1 if we can encrypt outgoing traffic */
 		unsigned int decryptin:1;		/* 1 if we have to decrypt incoming traffic */
 		unsigned int mst:1;			/* 1 if this connection is part of a minimum spanning tree */
-		unsigned int control:1;
-		unsigned int pcap:1;
-		unsigned int unused:21;
+		unsigned int control:1;			/* 1 if this is a control connection */
+		unsigned int pcap:1;			/* 1 if this is a control connection requesting packet capture */
+		unsigned int log:1;			/* 1 if this is a control connection requesting log dump */
+		unsigned int unused:20;
 } connection_status_t;
 
 #include "ecdh.h"
@@ -73,11 +75,11 @@ typedef struct connection_t {
 
 	rsa_t rsa;			/* his public RSA key */
 	ecdsa_t ecdsa;			/* his public ECDSA key */
-	ecdsa_t ecdh;			/* state for ECDH key exchange */
 	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;