X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fedge.h;h=2e59fa1de02da0a411787b82359ed855935c9dd5;hb=ea20fcfcded669ce8fbbda3a1f93f354ed254603;hp=75d4f94ec37df0e13c739c374e748447259dfe7d;hpb=a7ef599e6bdd8730c5a949d4c1727c38d5b6ff9e;p=meshlink diff --git a/src/edge.h b/src/edge.h index 75d4f94e..2e59fa1d 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" @@ -30,21 +30,20 @@ typedef struct edge_t { struct node_t *to; sockaddr_t address; - 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 */ + + int weight; /* weight of this edge */ } edge_t; -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 struct splay_tree_t *new_edge_tree(void) __attribute__ ((__malloc__)); +extern struct splay_tree_t *new_edge_tree(void) __attribute__((__malloc__)); extern void free_edge_tree(struct splay_tree_t *); -extern void edge_add(edge_t *); -extern void edge_del(edge_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