Add an astylerc file and reformat all code.

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index f7f0ba789b7164cd66e8afef1a542d4a27df02aa..710acdd794c40e1d67d30a5dcb0966c5ce1765df 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -33,10 +33,14 @@
 
 #define MAXSOCKETS 8    /* Probably overkill... */
 
-struct AvahiServer;
-struct AvahiSServiceBrowser;
-struct AvahiSimplePoll;
-struct AvahiSEntryGroup;
+static const char meshlink_invitation_label[] = "MeshLink invitation";
+static const char meshlink_tcp_label[] = "MeshLink TCP";
+static const char meshlink_udp_label[] = "MeshLink UDP";
+
+struct CattaServer;
+struct CattaSServiceBrowser;
+struct CattaSimplePoll;
+struct CattaSEntryGroup;
 
 typedef struct listen_socket_t {
        struct io_t tcp;
@@ -54,19 +58,14 @@ typedef enum proxytype_t {
        PROXY_EXEC,
 } proxytype_t;
 
-typedef struct outpacketqueue {
-       meshlink_node_t *destination;
-       const void *data;
-       unsigned int len;
-} outpacketqueue_t;
-
 /// A handle for an instance of MeshLink.
 struct meshlink_handle {
        char *name;
-       char *appname;
-       dclass_t dclass;
        void *priv;
 
+       char *appname;
+       dev_class_t devclass;
+
        char *confbase;
 
        meshlink_receive_cb_t receive_cb;
@@ -74,10 +73,12 @@ struct meshlink_handle {
        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;
@@ -115,12 +116,14 @@ struct meshlink_handle {
        bool localdiscovery;
        sockaddr_t localdiscovery_address;
 
+       bool default_blacklist;
+
        hash_t *node_udp_cache;
        struct connection_t *everyone;
        struct ecdsa *invitation_key;
 
-       int pinginterval;       /* seconds between pings */
-       int pingtimeout;        /* seconds to wait for response */
+       int pinginterval;       /* seconds between pings */
+       int pingtimeout;        /* seconds to wait for response */
        int maxtimeout;
 
        int sock;
@@ -135,11 +138,11 @@ struct meshlink_handle {
 
        pthread_t discovery_thread;
        bool discovery_threadstarted;
-       struct AvahiServer *avahi_server;
-       struct AvahiSServiceBrowser *avahi_browser;
-       struct AvahiSimplePoll *avahi_poll;
-       struct AvahiSEntryGroup *avahi_group;
-       char* avahi_servicetype;
+       struct CattaServer *catta_server;
+       struct CattaSServiceBrowser *catta_browser;
+       struct CattaSimplePoll *catta_poll;
+       struct CattaSEntryGroup *catta_group;
+       char* catta_servicetype;
 };
 
 /// A handle for a MeshLink node.
@@ -148,27 +151,34 @@ struct meshlink_node {
        void *priv;
 };
 
+/// A channel.
+struct meshlink_channel {
+       struct node_t *node;
+       void *priv;
+
+       struct utcp_connection *c;
+       meshlink_channel_receive_cb_t receive_cb;
+       meshlink_channel_poll_cb_t poll_cb;
+};
+
 /// Header for data packets routed between nodes
 typedef struct meshlink_packethdr {
        uint8_t destination[16];
        uint8_t source[16];
-} __attribute__ ((__packed__)) meshlink_packethdr_t;
+} __attribute__((__packed__)) meshlink_packethdr_t;
 
 extern void meshlink_send_from_queue(event_loop_t* el,meshlink_handle_t *mesh);
+extern void update_node_status(meshlink_handle_t *mesh, struct node_t *n);
 extern meshlink_log_level_t global_log_level;
 extern meshlink_log_cb_t global_log_cb;
 
-extern int cweight_from_dclass(dclass_t dclass);
-extern int max_ccount_from_dclass(dclass_t dclass);
-extern bool dclass_ccounts_satisfied(dclass_t dclass, splay_tree_t* counts, int total_count);
-
+/// Device class traits
 typedef struct {
-       dclass_t dclass;
-       int ccount;
-} dclass_ccount_t;
+       unsigned int min_connects;
+       unsigned int max_connects;
+       int edge_weight;
+} dev_class_traits_t;
 
-extern int dclass_ccount_compare(const void *a, const void *b);
-extern dclass_ccount_t* dclass_ccount_alloc();
-extern void dclass_ccount_delete(void *c);
+extern dev_class_traits_t dev_class_traits[];
 
 #endif // MESHLINK_INTERNAL_H