Merge branch 'master' into dirtydebug

[meshlink] / src / node.h

diff --git a/src/node.h b/src/node.h
index 51938cd63e3a9d5fe1024e47b61512881578a4e8..fa27bfd2926ce90ad81becd1a9052cf03a2f6d2e 100644 (file)
--- 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
@@ -26,7 +26,6 @@
 #include "connection.h"
 #include "digest.h"
 #include "event.h"
-#include "subnet.h"
 
 typedef struct node_status_t {
        unsigned int unused_active:1;           /* 1 if active (not used for nodes) */
@@ -37,7 +36,8 @@ 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 broadcast:1;               /* 1 if the next UDP packet should be broadcast to the local network */
+       unsigned int unused:23;
 } node_status_t;
 
 typedef struct node_t {
@@ -52,14 +52,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 */
@@ -69,8 +69,6 @@ typedef struct node_t {
        struct edge_t *prevedge;                /* nearest node from him to us */
        struct node_t *via;                     /* next hop for UDP packets */
 
-       splay_tree_t *subnet_tree;              /* Pointer to a tree of subnets belonging to this node */
-
        splay_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) */
@@ -111,8 +109,6 @@ 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 bool dump_nodes(struct connection_t *);
-extern bool dump_traffic(struct connection_t *);
 extern void update_node_udp(node_t *, const sockaddr_t *);
 
 #endif /* __TINC_NODE_H__ */