X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=41986723763dca0c9edd5b43fc18bbf86318b178;hb=90c7fafe594cf6d03c15a072a3d749f3e4d78482;hp=9476996f185149026824affde53b587fc9748b4c;hpb=108b238915c5f58b3d94ab433dc5d04e064c2b11;p=tinc diff --git a/src/connection.h b/src/connection.h index 9476996f..41986723 100644 --- a/src/connection.h +++ b/src/connection.h @@ -1,6 +1,6 @@ /* connection.h -- header for connection.c - Copyright (C) 2000-2009 Guus Sliepen , + Copyright (C) 2000-2010 Guus Sliepen , 2000-2005 Ivo Timmermans This program is free software; you can redistribute it and/or modify @@ -21,6 +21,7 @@ #ifndef __TINC_CONNECTION_H__ #define __TINC_CONNECTION_H__ +#include "buffer.h" #include "cipher.h" #include "digest.h" #include "rsa.h" @@ -29,6 +30,7 @@ #define OPTION_INDIRECT 0x0001 #define OPTION_TCPONLY 0x0002 #define OPTION_PMTU_DISCOVERY 0x0004 +#define OPTION_CLAMP_MSS 0x0008 typedef struct connection_status_t { int pinged:1; /* sent ping */ @@ -40,7 +42,8 @@ typedef struct connection_status_t { 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:23; + int control:1; + int unused:22; } connection_status_t; #include "edge.h" @@ -78,8 +81,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 */ @@ -97,7 +102,6 @@ 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 int dump_connections(struct evbuffer *); -extern bool read_connection_config(connection_t *); +extern bool dump_connections(struct connection_t *); #endif /* __TINC_CONNECTION_H__ */