X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=23bde77677e4daf91145653e68ab9804ed7a852f;hb=48dd371b2ec69f02870aa5e2a67fc8adb4617ff1;hp=9ca1e8da271ba85058b82a043a2674e4b4479cc1;hpb=668750c022a02cc54756316907f1cbbf7d673025;p=tinc diff --git a/src/connection.h b/src/connection.h index 9ca1e8da..23bde776 100644 --- a/src/connection.h +++ b/src/connection.h @@ -49,6 +49,7 @@ typedef union connection_status_t { bool control: 1; /* 1 if this is a control connection */ bool pcap: 1; /* 1 if this is a control connection requesting packet capture */ bool log: 1; /* 1 if this is a control connection requesting log dump */ + bool log_color: 1; /* 1 if this connection supports ANSI escape codes */ bool invitation: 1; /* 1 if this is an invitation */ bool invitation_used: 1; /* 1 if the invitation has been consumed */ bool tarpit: 1; /* 1 if the connection should be added to the tarpit */ @@ -60,7 +61,6 @@ typedef union connection_status_t { #include "edge.h" #include "net.h" #include "node.h" -#include "compression.h" #ifndef DISABLE_LEGACY typedef struct legacy_crypto_t { @@ -109,11 +109,7 @@ typedef struct connection_t { sptps_t sptps; int outmaclength; - - union { - compression_level_t outcompression; - debug_t log_level; // used for REQ_LOG - }; + debug_t log_level; /* used for REQ_LOG */ uint8_t *hischallenge; /* The challenge we sent to him */ uint8_t *mychallenge; /* The challenge we received */ @@ -121,8 +117,8 @@ typedef struct connection_t { struct buffer_t inbuf; struct buffer_t outbuf; io_t io; /* input/output event on this metadata connection */ - int tcplen; /* length of incoming TCPpacket */ - int sptpslen; /* length of incoming SPTPS packet */ + uint32_t tcplen; /* length of incoming TCPpacket */ + uint32_t sptpslen; /* length of incoming SPTPS packet */ int allow_request; /* defined if there's only one request possible */ time_t last_ping_time; /* last time we saw some activity from the other end or pinged them */