Reduce pointer indirection for global list_t variables

[tinc] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index b6f8105..b23e02b 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -35,21 +35,22 @@
 #define OPTION_VERSION(x) ((x) >> 24) /* Top 8 bits are for protocol minor version */
 
 typedef struct connection_status_t {
-               unsigned int pinged:1;                  /* sent ping */
-               unsigned int unused_active:1;
-               unsigned int connecting:1;              /* 1 if we are waiting for a non-blocking connect() to finish */
-               unsigned int unused_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;                 /* 1 if this is a control connection */
-               unsigned int pcap:1;                    /* 1 if this is a control connection requesting packet capture */
-               unsigned int log:1;                     /* 1 if this is a control connection requesting log dump */
-               unsigned int invitation:1;              /* 1 if this is an invitation */
-               unsigned int invitation_used:1;         /* 1 if the invitation has been consumed */
-               unsigned int unused:18;
+       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;
 } connection_status_t;
 
 #include "ecdsa.h"
@@ -88,18 +89,17 @@ typedef struct connection_t {
        ecdsa_t *ecdsa;                 /* his public ECDSA key */
        sptps_t sptps;
 
-       int inmaclength;
        int outmaclength;
-       int incompression;
-       int outcompression;
+       int outcompression;             /* compression level from compression_level_t */
 
-       char *hischallenge;             /* The challenge we sent to him */
+       uint8_t *hischallenge;          /* The challenge we sent to him */
+       uint8_t *mychallenge;           /* The challenge we received */
 
        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 */
+       int 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 */
@@ -107,15 +107,15 @@ 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);
 extern void exit_connections(void);
-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 bool dump_connections(struct connection_t *);
+extern connection_t *new_connection(void) __attribute__((__malloc__));
+extern void free_connection(connection_t *c);
+extern void connection_add(connection_t *c);
+extern void connection_del(connection_t *c);
+extern bool dump_connections(struct connection_t *c);
 
 #endif