Enable and fix many extra warnings supported by GCC and Clang.

[tinc] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index 4a9ef44..60ec60a 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -35,22 +35,21 @@
 #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;
+       uint32_t pinged: 1;                 /* sent ping */
+       uint32_t unused_active: 1;
+       uint32_t connecting: 1;             /* 1 if we are waiting for a non-blocking connect() to finish */
+       uint32_t unused_termreq: 1;         /* the termination of this connection was requested */
+       uint32_t remove_unused: 1;          /* Set to 1 if you want this connection removed */
+       uint32_t timeout_unused: 1;         /* 1 if gotten timeout */
+       uint32_t encryptout: 1;             /* 1 if we can encrypt outgoing traffic */
+       uint32_t decryptin: 1;              /* 1 if we have to decrypt incoming traffic */
+       uint32_t mst: 1;                    /* 1 if this connection is part of a minimum spanning tree */
+       uint32_t control: 1;                /* 1 if this is a control connection */
+       uint32_t pcap: 1;                   /* 1 if this is a control connection requesting packet capture */
+       uint32_t log: 1;                    /* 1 if this is a control connection requesting log dump */
+       uint32_t invitation: 1;             /* 1 if this is an invitation */
+       uint32_t invitation_used: 1;        /* 1 if the invitation has been consumed */
+       uint32_t tarpit: 1;                 /* 1 if the connection should be added to the tarpit */
 } connection_status_t;
 
 #include "ecdsa.h"
@@ -78,10 +77,10 @@ typedef struct connection_t {
 
 #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;
+       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;
 #endif
@@ -107,7 +106,7 @@ typedef struct connection_t {
        splay_tree_t *config_tree;      /* Pointer to configuration tree belonging to him */
 } connection_t;
 
-extern list_t *connection_list;
+extern list_t connection_list;
 extern connection_t *everyone;
 
 extern void init_connections(void);