X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fedge.h;h=752dc5a9ad00fe2d2e231d924162fb5284756a81;hb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;hp=dd3d6704cc6846c557aa16b802140eb4eca1af5f;hpb=08aabbf9317806bc50a9a6693ca866c8936ce26b;p=meshlink diff --git a/src/edge.h b/src/edge.h index dd3d6704..752dc5a9 100644 --- a/src/edge.h +++ b/src/edge.h @@ -1,7 +1,6 @@ /* edge.h -- header for edge.c - Copyright (C) 2001-2006 Guus Sliepen , - 2001-2005 Ivo Timmermans + Copyright (C) 2014 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 @@ -13,11 +12,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id$ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef __TINC_EDGE_H__ @@ -33,14 +30,14 @@ typedef struct edge_t { struct node_t *to; sockaddr_t address; - long int options; /* options turned on for this edge */ - int weight; /* weight of this edge */ + 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 */ } edge_t; -extern splay_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); @@ -51,6 +48,5 @@ 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 int dump_edges(struct evbuffer *); -#endif /* __TINC_EDGE_H__ */ +#endif /* __TINC_EDGE_H__ */