projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed everything from connection.c that has already been moved to node.c and
[tinc]
/
src
/
vertex.h
diff --git
a/src/vertex.h
b/src/vertex.h
index
b5504d5
..
9490f48
100644
(file)
--- a/
src/vertex.h
+++ b/
src/vertex.h
@@
-17,25
+17,35
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: vertex.h,v 1.1.2.
1 2001/10/09 19:30:30
guus Exp $
+ $Id: vertex.h,v 1.1.2.
3 2001/10/10 08:49:47
guus Exp $
*/
*/
+#ifndef __TINC_VERTEX_H__
+#define __TINC_VERTEX_H__
+
+#include <avl_tree.h>
+
+#include "node.h"
+#include "connection.h"
+
typedef struct vertex_t {
typedef struct vertex_t {
- struct halfconnection_t *from;
- struct halfconnection_t *to;
+ struct halfconnection_t from;
+ struct halfconnection_t to;
+
long int options; /* options turned on for this connection */
long int options; /* options turned on for this connection */
+ int metric; /* weight of this vertex */
+
+ struct connection_t *connection; /* connection associated with this vertex, if available */
} vertex_t;
typedef struct halfconnection_t {
} vertex_t;
typedef struct halfconnection_t {
- struct node_t *node;
+ struct node_t *node;
/* node associated with this end of the connection */
- ipv4_t address; /* his real (internet) ip to send UDP packets to */
- short unsigned int port; /* port number of UDP connection */
- char *hostname; /* the hostname of its real ip */
-
- RSA *rsa_key;
- EVP_CIPHER_CTX *ctx;
- char *metakey;
- char *pktkey;
- char *challenge;
+ ipv4_t address; /* real (internet) ip on this end of the meta connection */
+ short unsigned int port; /* port number of this end of the meta connection */
+ char *hostname; /* the hostname of real ip */
} halfconnection_t;
} halfconnection_t;
+
+extern avl_tree_t *vertex_tree; /* Tree with all known vertices (replaces active_tree) */
+
+#endif /* __TINC_VERTEX_H__ */