X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fedge.h;h=274e5d92f7d659b587c7456b86a23a0162f3d2eb;hb=5822f817aa802c2c5a83e9d99a8ae78cb822799b;hp=cf62b71be1f160f16f0c507c085c785b1845863f;hpb=108b238915c5f58b3d94ab433dc5d04e064c2b11;p=tinc diff --git a/src/edge.h b/src/edge.h index cf62b71b..274e5d92 100644 --- a/src/edge.h +++ b/src/edge.h @@ -1,6 +1,9 @@ +#ifndef TINC_EDGE_H +#define TINC_EDGE_H + /* edge.h -- header for edge.c - Copyright (C) 2001-2006 Guus Sliepen , + Copyright (C) 2001-2012 Guus Sliepen , 2001-2005 Ivo Timmermans This program is free software; you can redistribute it and/or modify @@ -18,9 +21,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" @@ -30,15 +30,16 @@ typedef struct edge_t { struct node_t *from; struct node_t *to; sockaddr_t address; + sockaddr_t local_address; - uint32_t 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); @@ -49,6 +50,6 @@ 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 *); +extern bool dump_edges(struct connection_t *); -#endif /* __TINC_EDGE_H__ */ +#endif