X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fedge.h;h=dd3d6704cc6846c557aa16b802140eb4eca1af5f;hb=6e80da3370249caa1082c23c3ef55f338d1e9e74;hp=b841bc9b71576d1aa7a65461568d37ea5dc9a3be;hpb=e449d94caef963809d417f16497f6f978e10d731;p=tinc diff --git a/src/edge.h b/src/edge.h index b841bc9b..dd3d6704 100644 --- a/src/edge.h +++ b/src/edge.h @@ -1,7 +1,7 @@ /* edge.h -- header for edge.c - Copyright (C) 2001-2003 Guus Sliepen , - 2001-2003 Ivo Timmermans + Copyright (C) 2001-2006 Guus Sliepen , + 2001-2005 Ivo Timmermans 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,13 +17,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: edge.h,v 1.1.2.14 2003/07/17 15:06:26 guus Exp $ + $Id$ */ #ifndef __TINC_EDGE_H__ #define __TINC_EDGE_H__ -#include "avl_tree.h" +#include "splay_tree.h" #include "connection.h" #include "net.h" #include "node.h" @@ -40,17 +40,17 @@ typedef struct edge_t { struct edge_t *reverse; /* edge in the opposite direction, if available */ } edge_t; -extern avl_tree_t *edge_weight_tree; /* Tree with all known edges sorted on weight */ +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 edge_t *new_edge(void) __attribute__ ((__malloc__)); extern void free_edge(edge_t *); -extern avl_tree_t *new_edge_tree(void) __attribute__ ((malloc)); -extern void free_edge_tree(avl_tree_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 edge_t *lookup_edge(struct node_t *, struct node_t *); -extern void dump_edges(void); +extern int dump_edges(struct evbuffer *); #endif /* __TINC_EDGE_H__ */