X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.h;h=37ba073ee48cb741ade5480ebdb211d690414394;hb=075e6828a7533e7daa790225f17aa6bb39703278;hp=fee68593eafc86bd88ed266119d8cfa16f40343e;hpb=046158a216e78a0412186ec8463157f6bce45d5d;p=meshlink

diff --git a/src/node.h b/src/node.h
index fee68593..37ba073e 100644
--- a/src/node.h
+++ b/src/node.h
@@ -1,6 +1,6 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2009 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -23,6 +23,8 @@
 #ifndef __TINC_NODE_H__
 #define __TINC_NODE_H__
 
+#include <event.h>
+
 #include "splay_tree.h"
 #include "cipher.h"
 #include "connection.h"
@@ -30,17 +32,14 @@
 #include "list.h"
 #include "subnet.h"
 
-typedef union node_status_t {
-	struct {
-		int unused_active:1;			/* 1 if active (not used for nodes) */
-		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 visited:1;				/* 1 if this node has been visited by one of the graph algorithms */
-		int reachable:1;			/* 1 if this node is reachable in the graph */
-		int indirect:1;				/* 1 if this node is not directly reachable by us */
-		int unused:26;
-	};
-	uint32_t value;
+typedef struct node_status_t {
+	int unused_active:1;			/* 1 if active (not used for nodes) */
+	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 visited:1;				/* 1 if this node has been visited by one of the graph algorithms */
+	int reachable:1;			/* 1 if this node is reachable in the graph */
+	int indirect:1;				/* 1 if this node is not directly reachable by us */
+	int unused:26;
 } node_status_t;
 
 typedef struct node_t {
@@ -52,14 +51,16 @@ typedef struct node_t {
 
 	node_status_t status;
 
-	cipher_t cipher;                        /* Cipher for UDP packets */
-	digest_t digest;                        /* Digest for UDP packets */	
-	int maclength;				/* Portion of digest to use */
+	cipher_t incipher;                        /* Cipher for UDP packets */
+	digest_t indigest;                        /* Digest for UDP packets */	
 
-	int compression;			/* Compressionlevel, 0 = no compression */
+	cipher_t outcipher;                        /* Cipher for UDP packets */
+	digest_t outdigest;                        /* Digest for UDP packets */	
 
-	list_t *queue;				/* Queue for packets awaiting to be encrypted */
+	int incompression;			/* Compressionlevel, 0 = no compression */
+	int outcompression;			/* Compressionlevel, 0 = no compression */
 
+	int distance;
 	struct node_t *nexthop;			/* nearest node from us to him */
 	struct node_t *via;			/* next hop for UDP packets */
 
@@ -93,5 +94,6 @@ extern void node_del(node_t *);
 extern node_t *lookup_node(char *);
 extern node_t *lookup_node_udp(const sockaddr_t *);
 extern int dump_nodes(struct evbuffer *);
+extern void update_node_udp(node_t *, const sockaddr_t *);
 
 #endif							/* __TINC_NODE_H__ */