Never automatically try to bind to ports >= 32768.

[meshlink] / src / node.h

diff --git a/src/node.h b/src/node.h
index 4c3f2afe72c5d808cafb41740d943490371c0969..918f1cce8db0821c064ac9dad125b53d3ef3ae55 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -38,6 +38,7 @@ typedef struct node_status_t {
        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
@@ -61,10 +62,12 @@ typedef struct node_t {
        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 */
@@ -99,15 +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) __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