projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't include netutl.h.
[tinc]
/
src
/
node.h
diff --git
a/src/node.h
b/src/node.h
index
b7c77e6
..
83305ce
100644
(file)
--- a/
src/node.h
+++ b/
src/node.h
@@
-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: node.h,v 1.1.2.
6 2001/10/28 10:16:18 guus
Exp $
+ $Id: node.h,v 1.1.2.
9 2001/11/16 15:56:44 zarq
Exp $
*/
#ifndef __TINC_NODE_H__
*/
#ifndef __TINC_NODE_H__
@@
-32,7
+32,7
@@
typedef struct node_status_t {
int active:1; /* 1 if active.. */
int validkey:1; /* 1 if we currently have a valid key for him */
int waitingforkey:1; /* 1 if we already sent out a request */
int active:1; /* 1 if active.. */
int validkey:1; /* 1 if we currently have a valid key for him */
int waitingforkey:1; /* 1 if we already sent out a request */
- int
mst:1; /* 1 if this node has been visited by the MST algorithm
*/
+ int
visited:1; /* 1 if this node has been visited by one of the graph algorithms
*/
int unused:28;
} node_status_t;
int unused:28;
} node_status_t;
@@
-40,8
+40,8
@@
typedef struct node_t {
char *name; /* name of this node */
long int options; /* options turned on for this node */
char *name; /* name of this node */
long int options; /* options turned on for this node */
-
ipv4_t address;
/* his real (internet) ip to send UDP packets to */
-
short unsigned int port; /* port number of UDP connection
*/
+
struct addrinfo *address;
/* his real (internet) ip to send UDP packets to */
+
char *port; /* string representation of the port number
*/
char *hostname; /* the hostname of its real ip */
struct node_status_t status;
char *hostname; /* the hostname of its real ip */
struct node_status_t status;
@@
-50,13
+50,15
@@
typedef struct node_t {
char *key; /* Cipher key and iv */
int keylength; /* Cipher key and iv length*/
char *key; /* Cipher key and iv */
int keylength; /* Cipher key and iv length*/
- list_t *queue; /* Queue for packets awaiting to be encrypted */
+ list_t *queue;
/* Queue for packets awaiting to be encrypted */
struct node_t *nexthop; /* nearest node from us to him */
struct node_t *via; /* next hop for UDP packets */
avl_tree_t *subnet_tree; /* Pointer to a tree of subnets belonging to this node */
struct node_t *nexthop; /* nearest node from us to him */
struct node_t *via; /* next hop for UDP packets */
avl_tree_t *subnet_tree; /* Pointer to a tree of subnets belonging to this node */
+ avl_tree_t *edge_tree; /* Edges with this node as one of the endpoints */
+
struct connection_t *connection; /* Connection associated with this node (if a direct connection exists) */
} node_t;
struct connection_t *connection; /* Connection associated with this node (if a direct connection exists) */
} node_t;
@@
-70,7
+72,7
@@
extern void free_node(node_t *n);
extern void node_add(node_t *n);
extern void node_del(node_t *n);
extern node_t *lookup_node(char *);
extern void node_add(node_t *n);
extern void node_del(node_t *n);
extern node_t *lookup_node(char *);
-extern node_t *lookup_node_udp(
ipv4_t, port_t
);
+extern node_t *lookup_node_udp(
struct addrinfo *
);
extern void dump_nodes(void);
extern void dump_nodes(void);