Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[meshlink] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index 2d84aced1cdee1119a549dbc222800c7625b2d17..2b6870e41c60d90260c0f2e561f237268c9fdd89 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,6 +1,6 @@
 /*
     connection.h -- header for connection.c
-    Copyright (C) 2000-2010 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -43,9 +43,10 @@ typedef struct connection_status_t {
                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;
-               unsigned int pcap:1;
-               unsigned int unused:21;
+               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;
 } connection_status_t;
 
 #include "ecdh.h"
@@ -106,6 +107,7 @@ 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 free_connection_partially(connection_t *);
 extern void connection_add(connection_t *);
 extern void connection_del(connection_t *);
 extern bool dump_connections(struct connection_t *);