X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=8d5537b2b95823f947aa5f730616b75c150748f8;hb=38c25d62c2bc76908bd95fb21c8f5e39ad269884;hp=87988db4002bc036da0c85448d6da84550016714;hpb=de78d79db84c486afcc353884ec1770866beb653;p=tinc

diff --git a/src/connection.h b/src/connection.h
index 87988db4..8d5537b2 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -26,23 +26,28 @@
 #include <openssl/rsa.h>
 #include <openssl/evp.h>
 
+#include <event.h>
+
 #include "avl_tree.h"
 
 #define OPTION_INDIRECT		0x0001
 #define OPTION_TCPONLY		0x0002
 #define OPTION_PMTU_DISCOVERY	0x0004
 
-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:1;				/* Set to 1 if you want this connection removed */
-	int timeout: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 unused:23;
+typedef union connection_status_t {
+	struct {
+		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:1;				/* Set to 1 if you want this connection removed */
+		int timeout: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 unused:23;
+	};
+	uint32_t value;
 } connection_status_t;
 
 #include "edge.h"
@@ -57,9 +62,10 @@ typedef struct connection_t {
 	char *hostname;				/* the hostname of its real ip */
 	int protocol_version;		/* used protocol */
 
+	struct event ev;			/* events on this metadata connection */
 	int socket;					/* socket used for this connection */
 	long int options;			/* options for this connection */
-	struct connection_status_t status;	/* status info */
+	connection_status_t status;	/* status info */
 	int estimated_weight;		/* estimation for the weight of the edge for this connection */
 	struct timeval start;		/* time this connection was started, used for above estimation */
 	struct outgoing_t *outgoing;	/* used to keep track of outgoing connections */