Merge branch 'everbase' into roles

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index d4ab46cafc1da8dba6ae83d789252b3d438397a2..63a71dc048dc0f81d693908dab280a396fbf9499 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -24,8 +24,8 @@
 
 #include "event.h"
 #include "hash.h"
-#include "logger.h"
 #include "meshlink.h"
+#include "meshlink_queue.h"
 #include "sockaddr.h"
 #include "sptps.h"
 
@@ -62,8 +62,12 @@ typedef struct outpacketqueue {
 
 /// A handle for an instance of MeshLink.
 struct meshlink_handle {
-       char *confbase;
        char *name;
+       char *appname;
+       dclass_t dclass;
+       void *priv;
+
+       char *confbase;
 
        meshlink_receive_cb_t receive_cb;
        meshlink_node_status_cb_t node_status_cb;
@@ -88,7 +92,7 @@ struct meshlink_handle {
        struct list_t *connections;
        struct list_t *outgoings;
 
-       struct list_t *outpacketqueue;
+       meshlink_queue_t outpacketqueue;
 
        struct splay_tree_t *past_request_tree;
        timeout_t past_request_timeout;
@@ -115,7 +119,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;
@@ -136,6 +139,7 @@ struct meshlink_handle {
        struct AvahiSServiceBrowser *avahi_browser;
        struct AvahiSimplePoll *avahi_poll;
        struct AvahiSEntryGroup *avahi_group;
+       char* avahi_servicetype;
 };
 
 /// A handle for a MeshLink node.
@@ -151,6 +155,9 @@ 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;
 
+extern int weight_from_dclass(dclass_t dclass);
 
 #endif // MESHLINK_INTERNAL_H