X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.h;h=7fa769f8d784042edb85c319f31263146369e7bc;hp=01c2bf406eb7aad27df8ee4d38720096ec0d6002;hb=c2dc3784f127ef6db6e9960a4abecc1aab6f4e31;hpb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80

diff --git a/src/connection.h b/src/connection.h
index 01c2bf40..7fa769f8 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,6 +1,6 @@
 /*
     connection.h -- header for connection.c
-    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2013 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -36,7 +36,7 @@
 
 typedef struct connection_status_t {
 		unsigned int pinged:1;                  /* sent ping */
-		unsigned int active:1;                  /* 1 if active.. */
+		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 */
@@ -47,7 +47,9 @@ typedef struct connection_status_t {
 		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 unused:20;
+		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;
 } connection_status_t;
 
 #include "ecdsa.h"
@@ -57,9 +59,9 @@ typedef struct connection_status_t {
 
 typedef struct connection_t {
 	char *name;                     /* name he claims to have */
+	char *hostname;                 /* the hostname of its real ip */
 
 	union sockaddr_t address;       /* his real (internet) ip */
-	char *hostname;                 /* the hostname of its real ip */
 	int protocol_major;             /* used protocol */
 	int protocol_minor;             /* used protocol */
 
@@ -73,12 +75,15 @@ typedef struct connection_t {
 	struct node_t *node;            /* node associated with the other end */
 	struct edge_t *edge;            /* edge associated with this connection */
 
-	rsa_t rsa;                      /* his public RSA key */
-	ecdsa_t ecdsa;                  /* his public ECDSA 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;
+#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;
+#endif
+
+	ecdsa_t *ecdsa;                 /* his public ECDSA key */
 	sptps_t sptps;
 
 	int inmaclength;
@@ -90,9 +95,9 @@ typedef struct connection_t {
 
 	struct buffer_t inbuf;
 	struct buffer_t outbuf;
-	struct event inevent;           /* input event on this metadata connection */
-	struct event outevent;          /* output event on this metadata connection */
+	io_t io;                        /* input/output event on this metadata connection */
 	int tcplen;                     /* length of incoming TCPpacket */
+	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 */