X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=b6db18b30822b2a90642f4dfe721afbc58f00592;hb=26d3ee0dd9b770a857615752b5c5588be0354a16;hp=51938cd63e3a9d5fe1024e47b61512881578a4e8;hpb=61275547cdf950e1c4499f19044ff171a9a74af7;p=tinc

diff --git a/src/node.h b/src/node.h
index 51938cd6..b6db18b3 100644
--- a/src/node.h
+++ b/src/node.h
@@ -1,6 +1,6 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2013 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -37,11 +37,13 @@ typedef struct node_status_t {
 	unsigned int indirect:1;                /* 1 if this node is not directly reachable by us */
 	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;
+	unsigned int send_locally:1;		/* 1 if the next UDP packet should be sent on the local network */
+	unsigned int unused:23;
 } node_status_t;
 
 typedef struct node_t {
 	char *name;                             /* name of this node */
+	node_id_t id;                           /* unique node ID (name hash) */
 	uint32_t options;                       /* options turned on for this node */
 
 	int sock;                               /* Socket to use for outgoing UDP packets */
@@ -52,14 +54,14 @@ typedef struct node_t {
 	time_t last_state_change;
 	time_t last_req_key;
 
-	ecdsa_t ecdsa;                          /* His public ECDSA 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 */
+	cipher_t *incipher;                     /* Cipher for UDP packets */
+	digest_t *indigest;                     /* Digest for UDP packets */
 
-	cipher_t outcipher;                     /* Cipher for UDP packets */
-	digest_t outdigest;                     /* Digest for UDP packets */
+	cipher_t *outcipher;                    /* Cipher for UDP packets */
+	digest_t *outdigest;                    /* Digest for UDP packets */
 
 	int incompression;                      /* Compressionlevel, 0 = no compression */
 	int outcompression;                     /* Compressionlevel, 0 = no compression */
@@ -110,6 +112,7 @@ extern void free_node(node_t *);
 extern void node_add(node_t *);
 extern void node_del(node_t *);
 extern node_t *lookup_node(char *);
+extern node_t *lookup_node_id(const node_id_t *);
 extern node_t *lookup_node_udp(const sockaddr_t *);
 extern bool dump_nodes(struct connection_t *);
 extern bool dump_traffic(struct connection_t *);