A first attempt at merging UTCP into MeshLink.

[meshlink] / src / edge.h

diff --git a/src/edge.h b/src/edge.h
index c6afdf6e19be9132c016a159119aa2cdc512663e..2a62cb754ab878dd4bbd11325f5f5f125744a451 100644 (file)
--- a/src/edge.h
+++ b/src/edge.h
@@ -1,7 +1,6 @@
 /*
     edge.h -- header for edge.c
-    Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
-                  2001-2005 Ivo Timmermans
+    Copyright (C) 2014 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,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_EDGE_H__
-#define __TINC_EDGE_H__
+#ifndef __MESHLINK_EDGE_H__
+#define __MESHLINK_EDGE_H__
 
 #include "splay_tree.h"
 #include "connection.h"
@@ -38,16 +37,14 @@ typedef struct edge_t {
        struct edge_t *reverse;                 /* edge in the opposite direction, if available */
 } 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 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 *);
 
-#endif /* __TINC_EDGE_H__ */
+#endif /* __MESHLINK_EDGE_H__ */