Don't use assert() to check the results of pthread_*() calls.

[meshlink] / src / node.h

diff --git a/src/node.h b/src/node.h
index ff8b3335ba70740830a08d70f8e51245f315a32c..63f3c2c8bad55132aa694981c702d760777d2b1e 100644 (file)
--- 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 {
@@ -85,7 +85,8 @@ typedef struct node_t {
        time_t last_successfull_connection;
 
        char *canonical_address;                /* The canonical address of this node, if known */
-       sockaddr_t recent[MAX_RECENT];                   /* 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;
@@ -98,15 +99,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) __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);
+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