X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=d6d07d423cf37e349fd26b1229466f55e1d41d67;hb=72642b40b3ad476101622da202b6f977a32b472f;hp=2f081863532dfa84e0884322046abbd4d882ad9f;hpb=79e9a4f743b7b59fed968575f6b36171cf4a0063;p=tinc

diff --git a/src/node.h b/src/node.h
index 2f081863..d6d07d42 100644
--- a/src/node.h
+++ b/src/node.h
@@ -1,6 +1,6 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2010 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -30,23 +30,29 @@
 typedef struct node_status_t {
 	unsigned int unused_active:1;		/* 1 if active (not used for nodes) */
 	unsigned int validkey:1;		/* 1 if we currently have a valid key for him */
-	unsigned int unused_waitingforkey:1;	/* 1 if we already sent out a request */
+	unsigned int waitingforkey:1;		/* 1 if we already sent out a request */
 	unsigned int visited:1;			/* 1 if this node has been visited by one of the graph algorithms */
 	unsigned int reachable:1;		/* 1 if this node is reachable in the graph */
 	unsigned int indirect:1;		/* 1 if this node is not directly reachable by us */
-	unsigned int unused:26;
+	unsigned int sptps:1;                   /* 1 if this node supports SPTPS */
+	unsigned int unused:25;
 } node_status_t;
 
 typedef struct node_t {
 	char *name;				/* name of this node */
 	uint32_t options;			/* options turned on for this node */
 
+	int sock;				/* Socket to use for outgoing UDP packets */
 	sockaddr_t address;			/* his real (internet) ip to send UDP packets to */
 	char *hostname;				/* the hostname of its real ip */
 
 	node_status_t status;
+	time_t last_state_change;
 	time_t last_req_key;
 
+	ecdsa_t ecdsa;				/* His public ECDSA key */
+	sptps_t sptps;
+
 	cipher_t incipher;                        /* Cipher for UDP packets */
 	digest_t indigest;                        /* Digest for UDP packets */	
 
@@ -58,6 +64,7 @@ typedef struct node_t {
 
 	int distance;
 	struct node_t *nexthop;			/* nearest node from us to him */
+	struct edge_t *prevedge;		/* nearest node from him to us */
 	struct node_t *via;			/* next hop for UDP packets */
 
 	splay_tree_t *subnet_tree;		/* Pointer to a tree of subnets belonging to this node */
@@ -85,7 +92,6 @@ typedef struct node_t {
 
 extern struct node_t *myself;
 extern splay_tree_t *node_tree;
-extern splay_tree_t *node_udp_tree;
 
 extern void init_nodes(void);
 extern void exit_nodes(void);