X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconnection.h;h=35dd19828ea706d6b26d786173fcfd021ec9def4;hb=61d9b04f66055e61f0afdf8955ff890f4da39288;hp=443930b50a9d7fb030a512b37006441921da62aa;hpb=a1b50920b9a52f86ca6e33fcb24d7fa34313a1ee;p=meshlink

diff --git a/src/connection.h b/src/connection.h
index 443930b5..35dd1982 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_CONNECTION_H
+#define MESHLINK_CONNECTION_H
+
 /*
     connection.h -- header for connection.c
-    Copyright (C) 2000-2013 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2000-2013, 2017 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
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CONNECTION_H__
-#define __TINC_CONNECTION_H__
-
 #include "buffer.h"
 #include "list.h"
 #include "sptps.h"
@@ -31,21 +31,21 @@
 #define OPTION_VERSION(x) ((x) >> 24) /* Top 8 bits are for protocol minor version */
 
 typedef struct connection_status_t {
-		unsigned int pinged:1;                  /* sent ping */
-		unsigned int active:1;                  /* 1 if active.. */
-		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 */
-		unsigned int timeout_unused:1;          /* 1 if gotten timeout */
-		unsigned int unused_encryptout:1;       /* 1 if we can encrypt outgoing traffic */
-		unsigned int unused_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;                 /* 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 invitation:1;              /* 1 if this is an invitation */
-		unsigned int invitation_used:1;         /* 1 if the invitation has been consumed */
-		unsigned int unused:19;
+	unsigned int pinged:1;                  /* sent ping */
+	unsigned int active:1;                  /* 1 if active.. */
+	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 */
+	unsigned int timeout_unused:1;          /* 1 if gotten timeout */
+	unsigned int unused_encryptout:1;       /* 1 if we can encrypt outgoing traffic */
+	unsigned int unused_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;                 /* 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 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"
@@ -64,8 +64,6 @@ typedef struct connection_t {
 	int socket;                     /* socket used for this connection */
 	uint32_t options;               /* options for this connection */
 	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 */
 
 	struct meshlink_handle *mesh;   /* the mesh this connection belongs to */
@@ -91,9 +89,9 @@ typedef struct connection_t {
 
 extern void init_connections(struct meshlink_handle *mesh);
 extern void exit_connections(struct meshlink_handle *mesh);
-extern connection_t *new_connection(void) __attribute__ ((__malloc__));
+extern connection_t *new_connection(void) __attribute__((__malloc__));
 extern void free_connection(connection_t *);
 extern void connection_add(struct meshlink_handle *mesh, connection_t *);
 extern void connection_del(struct meshlink_handle *mesh, connection_t *);
 
-#endif /* __TINC_CONNECTION_H__ */
+#endif