fixed some potentially nasty memory issues

[meshlink] / src / node.h

diff --git a/src/node.h b/src/node.h
index f6415a1d075f0191ff60abe819b9e567dbdd01d8..409449c94e80ed1c382d82522c275474ee86d7dc 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_NODE_H__
-#define __TINC_NODE_H__
+#ifndef __MESHLINK_NODE_H__
+#define __MESHLINK_NODE_H__
 
 #include "event.h"
 #include "sockaddr.h"
@@ -33,13 +33,19 @@ typedef struct node_status_t {
        unsigned int indirect:1;                /* 1 if this node is not directly reachable by us */
        unsigned int unused_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 broadcast:1;               /* 1 if the next UDP packet should be broadcast to the local network */
-       unsigned int unused:23;
+       unsigned int broadcast:1;               /* 1 if the next UDP packet should be broadcast to the local network */
+       unsigned int blacklisted:1;             /* 1 if the node is blacklist so we never want to speak with him anymore*/
+       unsigned int unused:22;
 } node_status_t;
 
 typedef struct node_t {
        char *name;                             /* name of this node */
+       void *priv;
+       
        uint32_t options;                       /* options turned on for this node */
+       dev_class_t devclass;
+
+       struct meshlink_handle *mesh;           /* The mesh this node belongs to */
 
        int sock;                               /* Socket to use for outgoing UDP packets */
        sockaddr_t address;                     /* his real (internet) ip to send UDP packets to */
@@ -63,6 +69,7 @@ typedef struct node_t {
        struct 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) */
+       time_t last_connect_try;
 
        uint32_t sent_seqno;                    /* Sequence number last sent to this node */
        uint32_t received_seqno;                /* Sequence number last received from this node */
@@ -88,14 +95,14 @@ typedef struct node_t {
        uint64_t out_bytes;
 } node_t;
 
-extern void init_nodes(void);
-extern void exit_nodes(void);
+extern void init_nodes(struct meshlink_handle *mesh);
+extern void exit_nodes(struct meshlink_handle *mesh);
 extern node_t *new_node(void) __attribute__ ((__malloc__));
 extern void free_node(node_t *);
-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 node_add(struct meshlink_handle *mesh, node_t *);
+extern void node_del(struct meshlink_handle *mesh, node_t *);
+extern node_t *lookup_node(struct meshlink_handle *mesh, const char *);
+extern node_t *lookup_node_udp(struct meshlink_handle *mesh, const sockaddr_t *);
+extern void update_node_udp(struct meshlink_handle *mesh, node_t *, const sockaddr_t *);
 
-#endif /* __TINC_NODE_H__ */
+#endif /* __MESHLINK_NODE_H__ */