Ensure tinc compiles with gcc -std=c99.

[oweals/tinc.git] / src / node.h

diff --git a/src/node.h b/src/node.h
index 05055bbd59e2f1486d1e136218fbc760061a92a8..528716de865a4d5b4106792ed535849f7b085298 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -1,7 +1,7 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2003 Guus Sliepen <guus@sliepen.eu.org>,
-                  2001-2003 Ivo Timmermans <ivo@o2w.nl>
+    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
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
     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.4 2003/08/24 20:38:25 guus Exp $
+    $Id$
 */
 
 #ifndef __TINC_NODE_H__
@@ -25,13 +25,14 @@
 
 #include "avl_tree.h"
 #include "connection.h"
+#include "event.h"
 #include "list.h"
 #include "subnet.h"
 
 typedef struct node_status_t {
-       int active:1;                           /* 1 if active.. */
+       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 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 */
@@ -39,7 +40,7 @@ typedef struct node_status_t {
 } node_status_t;
 
 typedef struct node_t {
-       char *name;                                     /* name of this node */
+       char *name;                             /* name of this node */
        long int options;                       /* options turned on for this node */
 
        sockaddr_t address;                     /* his real (internet) ip to send UDP packets to */
@@ -47,30 +48,43 @@ typedef struct node_t {
 
        node_status_t status;
 
-       const EVP_CIPHER *cipher;       /* Cipher type for UDP packets */
-       char *key;                                      /* Cipher key and iv */
-       int keylength;                          /* Cipher key and iv length */
-       EVP_CIPHER_CTX packet_ctx;      /* Cipher context */
+       const EVP_CIPHER *incipher;             /* Cipher type for UDP packets received from him */
+       char *inkey;                            /* Cipher key and iv */
+       int inkeylength;                        /* Cipher key and iv length */
+       EVP_CIPHER_CTX inctx;                   /* Cipher context */
        
-       const EVP_MD *digest;           /* Digest type for MAC */
-       int maclength;                          /* Length of MAC */
+       const EVP_CIPHER *outcipher;            /* Cipher type for UDP packets sent to him*/
+       char *outkey;                           /* Cipher key and iv */
+       int outkeylength;                       /* Cipher key and iv length */
+       EVP_CIPHER_CTX outctx;                  /* Cipher context */
+       
+       const EVP_MD *indigest;                 /* Digest type for MAC of packets received from him */
+       int inmaclength;                        /* Length of MAC */
 
-       int compression;                        /* Compressionlevel, 0 = no compression */
+       const EVP_MD *outdigest;                /* Digest type for MAC of packets sent to him*/
+       int outmaclength;                       /* Length of MAC */
 
-       list_t *queue;                          /* Queue for packets awaiting to be encrypted */
+       int incompression;                      /* Compressionlevel, 0 = no compression */
+       int outcompression;                     /* Compressionlevel, 0 = no compression */
 
-       struct node_t *nexthop;         /* nearest node from us to him */
+       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 *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 */
+       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) */
 
-       uint32_t sent_seqno;            /* Sequence number last sent to this node */
-       uint32_t received_seqno;        /* Sequence number last received from this node */
-       unsigned char late[16]; /* Bitfield marking late packets */
+       uint32_t sent_seqno;                    /* Sequence number last sent to this node */
+       uint32_t received_seqno;                /* Sequence number last received from this node */
+       unsigned char late[16];                 /* Bitfield marking late packets */
+
+       length_t mtu;                           /* Maximum size of packets to send to this node */
+       length_t minmtu;                        /* Probed minimum MTU */
+       length_t maxmtu;                        /* Probed maximum MTU */
+       int mtuprobes;                          /* Number of probes */
+       event_t *mtuevent;                      /* Probe event */
 } node_t;
 
 extern struct node_t *myself;
@@ -85,6 +99,7 @@ extern void node_add(node_t *);
 extern void node_del(node_t *);
 extern node_t *lookup_node(char *);
 extern node_t *lookup_node_udp(const sockaddr_t *);
+extern void update_node_udp(node_t *, const sockaddr_t *);
 extern void dump_nodes(void);
 
 #endif                                                 /* __TINC_NODE_H__ */