X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fedge.h;h=2e59fa1de02da0a411787b82359ed855935c9dd5;hp=ea45f497ec4442da08e084bda52f60c2384ff062;hb=f31267783fccb4e17d914c64243b0cba4e5632c4;hpb=40c28589328a2aa96c2ce1419c5d90616c758b3d

diff --git a/src/edge.h b/src/edge.h
index ea45f497..2e59fa1d 100644
--- a/src/edge.h
+++ b/src/edge.h
@@ -1,7 +1,9 @@
+#ifndef MESHLINK_EDGE_H
+#define MESHLINK_EDGE_H
+
 /*
     edge.h -- header for edge.c
-    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2001-2005 Ivo Timmermans
+    Copyright (C) 2014, 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
@@ -18,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_EDGE_H__
-#define __TINC_EDGE_H__
-
 #include "splay_tree.h"
 #include "connection.h"
 #include "net.h"
@@ -31,24 +30,20 @@ typedef struct edge_t {
 	struct node_t *to;
 	sockaddr_t address;
 
-	uint32_t options;			/* options turned on for this edge */
-	int weight;					/* weight of this edge */
+	struct connection_t *connection;        /* connection associated with this edge, if available */
+	struct edge_t *reverse;                 /* edge in the opposite direction, if available */
 
-	struct connection_t *connection;	/* connection associated with this edge, if available */
-	struct edge_t *reverse;		/* edge in the opposite direction, if available */
+	int weight;                             /* weight of this edge */
 } edge_t;
 
-extern splay_tree_t *edge_weight_tree;	/* Tree with all known edges sorted on weight */
-
-extern void init_edges(void);
-extern void exit_edges(void);
-extern edge_t *new_edge(void) __attribute__ ((__malloc__));
+extern void init_edges(struct meshlink_handle *mesh);
+extern void exit_edges(struct meshlink_handle *mesh);
+extern edge_t *new_edge(void) __attribute__((__malloc__));
 extern void free_edge(edge_t *);
-extern splay_tree_t *new_edge_tree(void) __attribute__ ((__malloc__));
-extern void free_edge_tree(splay_tree_t *);
-extern void edge_add(edge_t *);
-extern void edge_del(edge_t *);
+extern struct splay_tree_t *new_edge_tree(void) __attribute__((__malloc__));
+extern void free_edge_tree(struct splay_tree_t *);
+extern void edge_add(struct meshlink_handle *mesh, edge_t *);
+extern void edge_del(struct meshlink_handle *mesh, edge_t *);
 extern edge_t *lookup_edge(struct node_t *, struct node_t *);
-extern bool dump_edges(struct connection_t *);
 
-#endif							/* __TINC_EDGE_H__ */
+#endif