projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check_rsa() is broken, I don't know why, just remove it for now.
[tinc]
/
src
/
edge.h
diff --git
a/src/edge.h
b/src/edge.h
index
3bd475e
..
604082f
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 Guus Sliepen <guus@sliepen.warande.net>,
- 2001 Ivo Timmermans <itimmermans@bigfoot.com>
+ Copyright (C) 2001
-2002
Guus Sliepen <guus@sliepen.warande.net>,
+ 2001
-2002
Ivo Timmermans <itimmermans@bigfoot.com>
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.
2 2001/10/28 10:16:18
guus Exp $
+ $Id: edge.h,v 1.1.2.
7 2002/03/22 11:43:46
guus Exp $
*/
#ifndef __TINC_EDGE_H__
*/
#ifndef __TINC_EDGE_H__
@@
-25,22
+25,19
@@
#include <avl_tree.h>
#include <avl_tree.h>
+#include "net.h"
#include "node.h"
#include "connection.h"
#include "node.h"
#include "connection.h"
-/* I don't know if halfconnection_t is useful... */
-
typedef struct halfconnection_t {
struct node_t *node; /* node associated with this end of the connection */
typedef struct halfconnection_t {
struct node_t *node; /* node associated with this end of the connection */
-
- ipv4_t address; /* real (internet) ip on this end of the meta connection */
- short unsigned int port; /* port number of this end of the meta connection */
- char *hostname; /* the hostname of real ip */
+// 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 {
} halfconnection_t;
typedef struct edge_t {
- struct
node_t *
from;
- struct
node_t *
to;
+ struct
halfconnection_t
from;
+ struct
halfconnection_t
to;
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 */
@@
-55,6
+52,8
@@
extern void init_edges(void);
extern void exit_edges(void);
extern edge_t *new_edge(void);
extern void free_edge(edge_t *);
extern void exit_edges(void);
extern edge_t *new_edge(void);
extern void free_edge(edge_t *);
+extern avl_tree_t *new_edge_tree(void);
+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 edge_add(edge_t *);
extern void edge_del(edge_t *);
extern edge_t *lookup_edge(struct node_t *, struct node_t *);