Merge branch 'channels'

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 6b47481f879e972fb4a83f5d801fe9b985cd2382..517dc1e01cb8dbee31824f040f7c0a6140015f9e 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -24,7 +24,6 @@
 
 #include "event.h"
 #include "hash.h"
-#include "logger.h"
 #include "meshlink.h"
 #include "meshlink_queue.h"
 #include "sockaddr.h"
@@ -64,21 +63,23 @@ typedef struct outpacketqueue {
 /// A handle for an instance of MeshLink.
 struct meshlink_handle {
        char *name;
+       char *appname;
+       dev_class_t devclass;
        void *priv;
 
        char *confbase;
 
-       char *appname;
-
        meshlink_receive_cb_t receive_cb;
        meshlink_node_status_cb_t node_status_cb;
        meshlink_log_cb_t log_cb;
        meshlink_log_level_t log_level;
 
+       meshlink_channel_accept_cb_t channel_accept_cb;
+
        pthread_t thread;
        bool threadstarted;
        pthread_mutex_t outpacketqueue_mutex;
-       pthread_mutex_t nodes_mutex;
+       pthread_mutex_t mesh_mutex;
        event_loop_t loop;
        listen_socket_t listen_socket[MAXSOCKETS];
        int listen_sockets;
@@ -120,7 +121,6 @@ struct meshlink_handle {
        struct connection_t *everyone;
        struct ecdsa *invitation_key;
 
-       debug_t debug_level;
        int pinginterval;       /* seconds between pings */
        int pingtimeout;        /* seconds to wait for response */
        int maxtimeout;
@@ -150,6 +150,13 @@ struct meshlink_node {
        void *priv;
 };
 
+/// A channel.
+struct meshlink_channel {
+       struct utcp_connection *c;
+       struct node_t *node;
+       meshlink_channel_receive_cb_t receive_cb;
+};
+
 /// Header for data packets routed between nodes
 typedef struct meshlink_packethdr {
        uint8_t destination[16];
@@ -157,6 +164,16 @@ typedef struct meshlink_packethdr {
 } __attribute__ ((__packed__)) meshlink_packethdr_t;
 
 extern void meshlink_send_from_queue(event_loop_t* el,meshlink_handle_t *mesh);
+extern meshlink_log_level_t global_log_level;
+extern meshlink_log_cb_t global_log_cb;
+
+/// Device class traits
+typedef struct {
+       unsigned int min_connects;
+       unsigned int max_connects;
+       int edge_weight;
+} dev_class_traits_t;
 
+extern dev_class_traits_t dev_class_traits[];
 
 #endif // MESHLINK_INTERNAL_H