projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure malloc() is declared.
[tinc]
/
src
/
edge.h
diff --git
a/src/edge.h
b/src/edge.h
index
604082f
..
875b1aa
100644
(file)
--- a/
src/edge.h
+++ b/
src/edge.h
@@
-1,7
+1,7
@@
/*
edge.h -- header for edge.c
/*
edge.h -- header for edge.c
- Copyright (C) 2001-2002 Guus Sliepen <guus@sliepen.
warande.net
>,
- 2001-2002 Ivo Timmermans <i
timmermans@bigfoot.com
>
+ Copyright (C) 2001-2002 Guus Sliepen <guus@sliepen.
eu.org
>,
+ 2001-2002 Ivo Timmermans <i
vo@o2w.nl
>
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
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,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: edge.h,v 1.1.2.
7 2002/03/22 11:43:46
guus Exp $
+ $Id: edge.h,v 1.1.2.
11 2002/09/09 21:24:31
guus Exp $
*/
#ifndef __TINC_EDGE_H__
*/
#ifndef __TINC_EDGE_H__
@@
-29,24
+29,19
@@
#include "node.h"
#include "connection.h"
#include "node.h"
#include "connection.h"
-typedef struct halfconnection_t {
- struct node_t *node; /* node associated with this end of the connection */
-// sockaddr_t tcpaddress; /* real (internet) ip on this end of the meta connection */
- sockaddr_t udpaddress; /* real (internet) ip on this end of the vpn connection */
-} halfconnection_t;
-
typedef struct edge_t {
typedef struct edge_t {
- struct halfconnection_t from;
- struct halfconnection_t to;
+ struct node_t *from;
+ struct node_t *to;
+ sockaddr_t address;
+
+ long int options; /* options turned on for this edge */
+ int weight; /* weight of this edge */
- long int 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 connection_t *connection; /* connection associated with this edge, if available */
+ struct edge_t *reverse; /* edge in the opposite direction, if available */
} edge_t;
} edge_t;
-extern avl_tree_t *edge_tree; /* Tree with all known edges (replaces active_tree) */
-extern avl_tree_t *edge_weight_tree; /* Tree with all known edges sorted on weight */
+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 void init_edges(void);
extern void exit_edges(void);
@@
-59,4
+54,4
@@
extern void edge_del(edge_t *);
extern edge_t *lookup_edge(struct node_t *, struct node_t *);
extern void dump_edges(void);
extern edge_t *lookup_edge(struct node_t *, struct node_t *);
extern void dump_edges(void);
-#endif /* __TINC_EDGE_H__ */
+#endif
/* __TINC_EDGE_H__ */