X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=ddff03bbd7a7081510b3717aba08dee9d8f1d71a;hb=d82fcc88f355e3c8144478a860dfae0b299004a9;hp=ec6c0635dc3ce2c66e2f22559c7707e9a0bb7c76;hpb=bc0a24ec810cb911610ae7aafa245e47d1268cd2;p=tinc

diff --git a/src/connection.h b/src/connection.h
index ec6c0635..ddff03bb 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -62,7 +62,6 @@ typedef struct connection_t {
 	char *hostname;				/* the hostname of its real ip */
 	int protocol_version;		/* used protocol */
 
-	struct event ev;			/* events on this metadata connection */
 	int socket;					/* socket used for this connection */
 	long int options;			/* options for this connection */
 	connection_status_t status;	/* status info */
@@ -91,18 +90,11 @@ typedef struct connection_t {
 	char *mychallenge;			/* challenge we received from him */
 	char *hischallenge;			/* challenge we sent to him */
 
-	char buffer[MAXBUFSIZE];	/* metadata input buffer */
-	int buflen;					/* bytes read into buffer */
-	int reqlen;					/* length of incoming request */
+	struct bufferevent *buffer;			/* buffer events on this metadata connection */
+	struct event inevent;				/* input event on this metadata connection */
 	int tcplen;					/* length of incoming TCPpacket */
 	int allow_request;			/* defined if there's only one request possible */
 
-	char *outbuf;				/* metadata output buffer */
-	int outbufstart;			/* index of first meaningful byte in output buffer */
-	int outbuflen;				/* number of meaningful bytes in output buffer */
-	int outbufsize;				/* number of bytes allocated to output buffer */
-	struct event outev;			/* events on this metadata connection */
-
 	time_t last_ping_time;		/* last time we saw some activity from the other end or pinged them */
 
 	splay_tree_t *config_tree;	/* Pointer to configuration tree belonging to him */
@@ -117,7 +109,7 @@ 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 dump_connections(struct evbuffer *);
 extern bool read_connection_config(connection_t *);
 
 #endif							/* __TINC_CONNECTION_H__ */