X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fedge.h;h=cc7a449b7e4b56fe6b962d61b22c5e36f3f27b6f;hb=facb61a34353a06d8286df34a6224585cc561c3e;hp=752dc5a9ad00fe2d2e231d924162fb5284756a81;hpb=fb7b6e7a0c966a88a682f656ca1caeb9a0583c5b;p=meshlink diff --git a/src/edge.h b/src/edge.h index 752dc5a9..cc7a449b 100644 --- a/src/edge.h +++ b/src/edge.h @@ -1,6 +1,9 @@ +#ifndef MESHLINK_EDGE_H +#define MESHLINK_EDGE_H + /* edge.h -- header for edge.c - Copyright (C) 2014 Guus Sliepen + Copyright (C) 2014, 2017 Guus Sliepen 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_EDGE_H__ -#define __TINC_EDGE_H__ - #include "splay_tree.h" #include "connection.h" #include "net.h" @@ -37,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 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 *); -#endif /* __TINC_EDGE_H__ */ +#endif