X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=77ca87a55901b07f9bc5faa321b00b82ca171b62;hb=3fca2cad485ef70360bca085c5c4d052b6deb15b;hp=0f2b1d6a44d86ac0b72f453245203e1a399d98f6;hpb=79e46d08a46f2fef2ee4e8eac7ba487007160564;p=tinc

diff --git a/src/connection.h b/src/connection.h
index 0f2b1d6a..77ca87a5 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -21,6 +21,7 @@
 #ifndef __TINC_CONNECTION_H__
 #define __TINC_CONNECTION_H__
 
+#include "buffer.h"
 #include "cipher.h"
 #include "digest.h"
 #include "rsa.h"
@@ -42,7 +43,8 @@ typedef struct connection_status_t {
 		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 control:1;
-		int unused:22;
+		int pcap:1;
+		int unused:21;
 } connection_status_t;
 
 #include "edge.h"
@@ -80,8 +82,10 @@ typedef struct connection_t {
 
 	char *hischallenge;		/* The challenge we sent to him */
 
-	struct bufferevent *buffer;			/* buffer events on this metadata connection */
+	struct buffer_t inbuf;
+	struct buffer_t outbuf;
 	struct event inevent;				/* input event on this metadata connection */
+	struct event outevent;				/* output event on this metadata connection */
 	int tcplen;					/* length of incoming TCPpacket */
 	int allow_request;			/* defined if there's only one request possible */
 
@@ -100,6 +104,5 @@ extern void free_connection(connection_t *);
 extern void connection_add(connection_t *);
 extern void connection_del(connection_t *);
 extern bool dump_connections(struct connection_t *);
-extern bool read_connection_config(connection_t *);
 
 #endif							/* __TINC_CONNECTION_H__ */