X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fedge.h;h=3805e557c634146b87beafd5efa4438260e859b2;hp=4c65213b9f1dba9a0d9db39e76d7946bbe448286;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=5cbddc68bade0d1f8ded1b784bb27bb44c5dc5dc diff --git a/src/edge.h b/src/edge.h index 4c65213b..3805e557 100644 --- a/src/edge.h +++ b/src/edge.h @@ -1,7 +1,9 @@ +#ifndef MESHLINK_EDGE_H +#define MESHLINK_EDGE_H + /* edge.h -- header for edge.c - Copyright (C) 2001-2006 Guus Sliepen , - 2001-2005 Ivo Timmermans + 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 @@ -18,10 +20,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#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" @@ -31,24 +30,21 @@ 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 */ - 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 */ + uint32_t session_id; /* the session_id of the from node */ } edge_t; -extern avl_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 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 avl_tree_t *new_edge_tree(void) __attribute__ ((__malloc__)); -extern void free_edge_tree(avl_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); - -#endif /* __TINC_EDGE_H__ */ +extern struct splay_tree_t *new_edge_tree(void) __attribute__((__malloc__)); +extern void free_edge_tree(struct splay_tree_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 *) __attribute__((__warn_unused_result__)); + +#endif