-#include "splay_tree.h"
-
-#define OPTION_INDIRECT 0x0001
-#define OPTION_TCPONLY 0x0002
-#define OPTION_PMTU_DISCOVERY 0x0004
-#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 pcap:1;
- int unused:21;
+#include "list.h"
+#include "sptps.h"
+
+#define OPTION_INDIRECT 0x0001
+#define OPTION_TCPONLY 0x0002
+#define OPTION_PMTU_DISCOVERY 0x0004
+#define OPTION_CLAMP_MSS 0x0008
+#define OPTION_VERSION(x) ((x) >> 24) /* Top 8 bits are for protocol minor version */
+
+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;