Remove everything GPL that is not copyright Guus Sliepen, update copyright statements.

[meshlink] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index 10f4a76a924ee9dd8064e477fbf92d0f3703fa43..f8eb56b7a0f61aef23f00a964d018f3e600a2c0d 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,7 +1,6 @@
 /*
     connection.h -- header for connection.c
-    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans
+    Copyright (C) 2000-2013 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -47,7 +46,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:19;
 } connection_status_t;
 
 #include "ecdsa.h"
@@ -73,12 +74,12 @@ 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;
+       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;
        sptps_t sptps;
 
        int inmaclength;
@@ -108,6 +109,5 @@ 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 *);
 
 #endif /* __TINC_CONNECTION_H__ */