X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.h;h=ff8b3335ba70740830a08d70f8e51245f315a32c;hb=HEAD;hp=e42aac4a4d894f02d4a840408c029aceda1d8349;hpb=8538d6c661a083774e5b54163eaf5cdbcadcda6d;p=meshlink

diff --git a/src/node.h b/src/node.h
index e42aac4a..918f1cce 100644
--- a/src/node.h
+++ b/src/node.h
@@ -23,7 +23,7 @@
 #include "event.h"
 #include "sockaddr.h"
 #include "sptps.h"
-#include "utcp/utcp.h"
+#include "utcp.h"
 #include "submesh.h"
 
 typedef struct node_status_t {
@@ -37,8 +37,12 @@ typedef struct node_status_t {
 	uint16_t destroyed: 1;              /* 1 if the node is being destroyed, deallocate channels when any callback is triggered */
 	uint16_t duplicate: 1;              /* 1 if the node is duplicate, ie. multiple nodes using the same Name are online */
 	uint16_t dirty: 1;                  /* 1 if the configuration of the node is dirty and needs to be written out */
+	uint16_t want_udp: 1;               /* 1 if we want working UDP because we have data to send */
+	uint16_t tiny: 1;                   /* 1 if this is a tiny node */
 } node_status_t;
 
+#define MAX_RECENT 5
+
 typedef struct node_t {
 	// Public member variables
 	char *name;                             /* name of this node */
@@ -50,17 +54,20 @@ typedef struct node_t {
 	dev_class_t devclass;
 
 	// Used for packet I/O
-	sptps_t sptps;
 	int sock;                               /* Socket to use for outgoing UDP packets */
+	uint32_t session_id;                    /* Unique ID for this node's currently running process */
+	sptps_t sptps;
 	sockaddr_t address;                     /* his real (internet) ip to send UDP packets to */
 
 	struct utcp *utcp;
 
 	// Traffic counters
-	uint64_t in_packets;
-	uint64_t in_bytes;
-	uint64_t out_packets;
-	uint64_t out_bytes;
+	uint64_t in_data;                       /* Bytes received from channels */
+	uint64_t out_data;                      /* Bytes sent via channels */
+	uint64_t in_forward;                    /* Bytes received for channels that need to be forwarded to other nodes */
+	uint64_t out_forward;                   /* Bytes forwarded from channel from other nodes */
+	uint64_t in_meta;                       /* Bytes received from meta-connections, heartbeat packets etc. */
+	uint64_t out_meta;                      /* Bytes sent on meta-connections, heartbeat packets etc. */
 
 	// MTU probes
 	timeout_t mtutimeout;                   /* Probe event */
@@ -72,7 +79,6 @@ typedef struct node_t {
 	struct meshlink_handle *mesh;           /* The mesh this node belongs to */
 	struct submesh_t *submesh;              /* Nodes Sub-Mesh Handle*/
 
-	time_t last_state_change;
 	time_t last_req_key;
 
 	struct ecdsa *ecdsa;                    /* His public ECDSA key */
@@ -82,9 +88,13 @@ typedef struct node_t {
 	time_t last_successfull_connection;
 
 	char *canonical_address;                /* The canonical address of this node, if known */
-	sockaddr_t recent[5];                   /* Recently seen addresses */
+	sockaddr_t recent[MAX_RECENT];          /* Recently seen addresses */
+	sockaddr_t catta_address;               /* Latest address seen by Catta */
 
 	// Graph-related member variables
+	time_t last_reachable;
+	time_t last_unreachable;
+
 	int distance;
 	struct node_t *nexthop;                 /* nearest node from us to him */
 	struct edge_t *prevedge;                /* nearest node from him to us */
@@ -92,14 +102,15 @@ typedef struct node_t {
 	struct splay_tree_t *edge_tree;         /* Edges with this node as one of the endpoints */
 } node_t;
 
-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 *n);
-extern void node_add(struct meshlink_handle *mesh, node_t *n);
-extern void node_del(struct meshlink_handle *mesh, node_t *n);
-extern node_t *lookup_node(struct meshlink_handle *mesh, const char *name);
-extern node_t *lookup_node_udp(struct meshlink_handle *mesh, const sockaddr_t *sa);
-extern void update_node_udp(struct meshlink_handle *mesh, node_t *n, const sockaddr_t *sa);
+void init_nodes(struct meshlink_handle *mesh);
+void exit_nodes(struct meshlink_handle *mesh);
+node_t *new_node(void) __attribute__((__malloc__));
+void free_node(node_t *n);
+void node_add(struct meshlink_handle *mesh, node_t *n);
+void node_del(struct meshlink_handle *mesh, node_t *n);
+node_t *lookup_node(struct meshlink_handle *mesh, const char *name) __attribute__((__warn_unused_result__));
+node_t *lookup_node_udp(struct meshlink_handle *mesh, const sockaddr_t *sa) __attribute__((__warn_unused_result__));
+void update_node_udp(struct meshlink_handle *mesh, node_t *n, const sockaddr_t *sa);
+bool node_add_recent_address(struct meshlink_handle *mesh, node_t *n, const sockaddr_t *addr);
 
 #endif