Releasing 1.0.29.

[tinc] / src / node.h

diff --git a/src/node.h b/src/node.h
index 107a59b..69ed12f 100644 (file)
--- 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-2016 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -24,7 +24,6 @@
 #include "avl_tree.h"
 #include "connection.h"
 #include "event.h"
-#include "list.h"
 #include "subnet.h"
 
 typedef struct node_status_t {
@@ -41,6 +40,7 @@ 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 */
 
@@ -50,12 +50,12 @@ typedef struct node_t {
        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 */
+       EVP_CIPHER_CTX *inctx;                  /* Cipher context */
        
        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 */
+       EVP_CIPHER_CTX *outctx;                 /* Cipher context */
        
        const EVP_MD *indigest;                 /* Digest type for MAC of packets received from him */
        int inmaclength;                        /* Length of MAC */
@@ -67,6 +67,7 @@ typedef struct node_t {
        int outcompression;                     /* Compressionlevel, 0 = no compression */
 
        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 */
 
        avl_tree_t *subnet_tree;                /* Pointer to a tree of subnets belonging to this node */