X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=d0dccf3e97dce5ce01ec0a099e1da1860ff872eb;hb=58f4b845b9a7d83739af77337f2ce263d8df7838;hp=05d751ccda77d73d46cb92d6c26af7a5ed9aa523;hpb=8dfa072733feab737cabf69f000c70657719826a;p=tinc

diff --git a/src/node.h b/src/node.h
index 05d751cc..d0dccf3e 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
@@ -25,31 +25,34 @@
 #include "cipher.h"
 #include "connection.h"
 #include "digest.h"
-#include "ecdh.h"
 #include "subnet.h"
 
 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 ecdh:1;			/* 1 if this node supports ECDH key exchange */
-	unsigned int unused:25;
+	unsigned int sptps:1;                   /* 1 if this node supports SPTPS */
+	unsigned int udp_confirmed:1;		/* 1 if the address is one that we received UDP traffic on */
+	unsigned int unused:24;
 } 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;
 
-	ecdh_t ecdh;				/* State for ECDH key exchange */
+	ecdsa_t ecdsa;				/* His public ECDSA key */
+	sptps_t sptps;
 
 	cipher_t incipher;                        /* Cipher for UDP packets */
 	digest_t indigest;                        /* Digest for UDP packets */	
@@ -62,6 +65,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 */
@@ -89,7 +93,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);