connection_t: split compression_level/log_level into two fields

[tinc] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index b23e02b..9ca1e8d 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -27,6 +27,7 @@
 #include "rsa.h"
 #include "list.h"
 #include "sptps.h"
+#include "logger.h"
 
 #define OPTION_INDIRECT         0x0001
 #define OPTION_TCPONLY          0x0002
@@ -34,29 +35,53 @@
 #define OPTION_CLAMP_MSS        0x0008
 #define OPTION_VERSION(x) ((x) >> 24) /* Top 8 bits are for protocol minor version */
 
-typedef struct connection_status_t {
-       bool pinged: 1;                 /* sent ping */
-       bool unused_active: 1;
-       bool connecting: 1;             /* 1 if we are waiting for a non-blocking connect() to finish */
-       bool unused_termreq: 1;         /* the termination of this connection was requested */
-       bool remove_unused: 1;          /* Set to 1 if you want this connection removed */
-       bool timeout_unused: 1;         /* 1 if gotten timeout */
-       bool encryptout: 1;             /* 1 if we can encrypt outgoing traffic */
-       bool decryptin: 1;              /* 1 if we have to decrypt incoming traffic */
-       bool mst: 1;                    /* 1 if this connection is part of a minimum spanning tree */
-       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 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 */
-       uint32_t unused: 17;
+typedef union connection_status_t {
+       struct {
+               bool pinged: 1;                 /* sent ping */
+               bool unused_active: 1;
+               bool connecting: 1;             /* 1 if we are waiting for a non-blocking connect() to finish */
+               bool unused_termreq: 1;         /* the termination of this connection was requested */
+               bool remove_unused: 1;          /* Set to 1 if you want this connection removed */
+               bool timeout_unused: 1;         /* 1 if gotten timeout */
+               bool encryptout: 1;             /* 1 if we can encrypt outgoing traffic */
+               bool decryptin: 1;              /* 1 if we have to decrypt incoming traffic */
+               bool mst: 1;                    /* 1 if this connection is part of a minimum spanning tree */
+               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 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 */
+       };
+       uint32_t value;
 } connection_status_t;
 
 #include "ecdsa.h"
 #include "edge.h"
 #include "net.h"
 #include "node.h"
+#include "compression.h"
+
+#ifndef DISABLE_LEGACY
+typedef struct legacy_crypto_t {
+       cipher_t cipher;
+       digest_t digest;
+       uint64_t budget;
+} legacy_crypto_t;
+
+bool init_crypto_by_nid(legacy_crypto_t *c, nid_t cipher, nid_t digest) ATTR_WARN_UNUSED;
+bool init_crypto_by_name(legacy_crypto_t *c, const char *cipher, const char *digest) ATTR_WARN_UNUSED;
+bool decrease_budget(legacy_crypto_t *c, size_t bytes) ATTR_WARN_UNUSED;
+
+typedef struct legacy_ctx_t {
+       rsa_t *rsa;                    /* his public RSA key or my private RSA key */
+       legacy_crypto_t in;            /* cipher/digest he will use to send data to us */
+       legacy_crypto_t out;           /* cipher/digest we will use to send data to him */
+} legacy_ctx_t;
+
+legacy_ctx_t *new_legacy_ctx(rsa_t *rsa) ATTR_MALLOC;
+void free_legacy_ctx(legacy_ctx_t *ctx);
+#endif
 
 typedef struct connection_t {
        char *name;                     /* name he claims to have */
@@ -77,20 +102,18 @@ typedef struct connection_t {
        struct edge_t *edge;            /* edge associated with this connection */
 
 #ifndef DISABLE_LEGACY
-       rsa_t *rsa;                     /* his public RSA key */
-       cipher_t *incipher;             /* Cipher he will use to send data to us */
-       cipher_t *outcipher;            /* Cipher we will use to send data to him */
-       digest_t *indigest;
-       digest_t *outdigest;
-       uint64_t inbudget;
-       uint64_t outbudget;
+       legacy_ctx_t *legacy;
 #endif
 
        ecdsa_t *ecdsa;                 /* his public ECDSA key */
        sptps_t sptps;
 
        int outmaclength;
-       int outcompression;             /* compression level from compression_level_t */
+
+       union {
+               compression_level_t outcompression;
+               debug_t log_level; // used for REQ_LOG
+       };
 
        uint8_t *hischallenge;          /* The challenge we sent to him */
        uint8_t *mychallenge;           /* The challenge we received */
@@ -112,7 +135,7 @@ extern connection_t *everyone;
 
 extern void init_connections(void);
 extern void exit_connections(void);
-extern connection_t *new_connection(void) __attribute__((__malloc__));
+extern connection_t *new_connection(void) ATTR_MALLOC;
 extern void free_connection(connection_t *c);
 extern void connection_add(connection_t *c);
 extern void connection_del(connection_t *c);