X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.h;h=14713b219e777a7b5230b87bb9ee66602317e8ca;hp=07c7c49f168f9e31da5750f8622a6f9f1c854465;hb=d178b583df9fe2bf3ebb3a7377203efc5c46df32;hpb=64771f73ebbff04262defcde59263e98f89f0fa1 diff --git a/src/node.h b/src/node.h index 07c7c49f..14713b21 100644 --- a/src/node.h +++ b/src/node.h @@ -1,6 +1,9 @@ +#ifndef TINC_NODE_H +#define TINC_NODE_H + /* node.h -- header for node.c - Copyright (C) 2001-2010 Guus Sliepen , + Copyright (C) 2001-2016 Guus Sliepen , 2001-2005 Ivo Timmermans This program is free software; you can redistribute it and/or modify @@ -18,9 +21,6 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TINC_NODE_H__ -#define __TINC_NODE_H__ - #include "avl_tree.h" #include "connection.h" #include "event.h" @@ -40,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 */ @@ -49,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 */ @@ -66,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 */ @@ -101,4 +103,4 @@ 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__ */ +#endif