X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fedge.h;h=032acbc5659758ca0a489a3088bbd38c37090b11;hb=42d2dff33306beae8ddbd9cc991ad80f135950a6;hp=a1b7e3e66f8f9345fb68b92b415a5bd466628d22;hpb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;p=tinc diff --git a/src/edge.h b/src/edge.h index a1b7e3e6..032acbc5 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,6 +30,7 @@ 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 */ @@ -42,13 +43,13 @@ extern splay_tree_t *edge_weight_tree; /* Tree with all known edges sor extern void init_edges(void); extern void exit_edges(void); -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 edge_t *lookup_edge(struct node_t *, struct node_t *); -extern bool dump_edges(struct connection_t *); - -#endif /* __TINC_EDGE_H__ */ +extern edge_t *new_edge(void) __attribute__((__malloc__)); +extern void free_edge(edge_t *e); +extern splay_tree_t *new_edge_tree(void) __attribute__((__malloc__)); +extern void free_edge_tree(splay_tree_t *edge_tree); +extern void edge_add(edge_t *e); +extern void edge_del(edge_t *e); +extern edge_t *lookup_edge(struct node_t *from, struct node_t *to); +extern bool dump_edges(struct connection_t *c); + +#endif