X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=75015ffe3214669958cc5dedd3e23007993bf691;hb=33f241d97852d7a171f1aaf1bda7f66356ff889e;hp=0f2b1d6a44d86ac0b72f453245203e1a399d98f6;hpb=103543aa2c15d9f1e2aa313a2e593a7524cce484;p=tinc diff --git a/src/connection.h b/src/connection.h index 0f2b1d6a..75015ffe 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" @@ -32,21 +33,21 @@ #define OPTION_CLAMP_MSS 0x0008 typedef struct connection_status_t { - int pinged:1; /* sent ping */ - int active:1; /* 1 if active.. */ - int connecting:1; /* 1 if we are waiting for a non-blocking connect() to finish */ - int termreq:1; /* the termination of this connection was requested */ - int remove_unused:1; /* Set to 1 if you want this connection removed */ - int timeout_unused: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 control:1; - int unused:22; + unsigned int pinged:1; /* sent ping */ + unsigned int active:1; /* 1 if active.. */ + unsigned int connecting:1; /* 1 if we are waiting for a non-blocking connect() to finish */ + unsigned int termreq:1; /* the termination of this connection was requested */ + unsigned int remove_unused:1; /* Set to 1 if you want this connection removed */ + unsigned int timeout_unused:1; /* 1 if gotten timeout */ + 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; } connection_status_t; #include "edge.h" -#include "list.h" #include "net.h" #include "node.h" @@ -80,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 */ @@ -100,6 +103,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__ */