X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fedge.h;h=ba18e875df95108ef1bfa49c8c0f080868295831;hb=947f09ff2c507a80bbe7f92ed0d41b06c98d5375;hp=1e1801e597ba52179d03fb31d19fad71ccb6f483;hpb=a1b50920b9a52f86ca6e33fcb24d7fa34313a1ee;p=meshlink diff --git a/src/edge.h b/src/edge.h index 1e1801e5..ba18e875 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,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 */ + + int weight; /* weight of this edge */ + uint32_t session_id; /* the session_id of the from node */ } edge_t; 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 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(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