X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnode.h;h=ff8b3335ba70740830a08d70f8e51245f315a32c;hp=dc15e3f299f9c2767fa06a5b23ca95ae390a05d4;hb=529b8fab8c21e7ae5af91d742ff202eab38e51f3;hpb=282b99f3c71705bd6e34d4e4f9e8369ea63c87ed

diff --git a/src/node.h b/src/node.h
index dc15e3f2..ff8b3335 100644
--- a/src/node.h
+++ b/src/node.h
@@ -37,8 +37,11 @@ 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 */
 } node_status_t;
 
+#define MAX_RECENT 5
+
 typedef struct node_t {
 	// Public member variables
 	char *name;                             /* name of this node */
@@ -47,11 +50,12 @@ typedef struct node_t {
 	// Private member variables
 	node_status_t status;
 	uint16_t minmtu;                        /* Probed minimum MTU */
-	int32_t devclass;
+	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;
@@ -72,7 +76,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 +85,12 @@ 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 */
 
 	// 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 */
@@ -98,8 +104,9 @@ 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 node_t *lookup_node(struct meshlink_handle *mesh, const char *name) __attribute__((__warn_unused_result__));
+extern node_t *lookup_node_udp(struct meshlink_handle *mesh, const sockaddr_t *sa) __attribute__((__warn_unused_result__));
 extern void update_node_udp(struct meshlink_handle *mesh, node_t *n, const sockaddr_t *sa);
+extern bool node_add_recent_address(struct meshlink_handle *mesh, node_t *n, const sockaddr_t *addr);
 
 #endif