X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=569628cc3e6ebc05dca19f47d978c7e299c73961;hb=c023ad12147aa88810629c110ea6b1ab94267196;hp=a40de535a8dbc911f80ef10507354bbb9936e8ec;hpb=2fd608c4111ef4d48a649401d918f5981856cc44;p=meshlink diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h index a40de535..569628cc 100644 --- a/src/meshlink_internal.h +++ b/src/meshlink_internal.h @@ -35,12 +35,15 @@ #include -#define MAXSOCKETS 8 /* Probably overkill... */ +#define MAXSOCKETS 4 /* Probably overkill... */ static const char meshlink_invitation_label[] = "MeshLink invitation"; static const char meshlink_tcp_label[] = "MeshLink TCP"; static const char meshlink_udp_label[] = "MeshLink UDP"; +#define MESHLINK_CONFIG_VERSION 1 +#define MESHLINK_INVITATION_VERSION 1 + struct CattaServer; struct CattaSServiceBrowser; struct CattaSimplePoll; @@ -68,100 +71,126 @@ struct meshlink_open_params { dev_class_t devclass; int netns; + + const void *key; + size_t keylen; }; /// A handle for an instance of MeshLink. struct meshlink_handle { + // public members char *name; void *priv; - char *appname; - dev_class_t devclass; - - char *confbase; - FILE *conffile; - - meshlink_receive_cb_t receive_cb; - meshlink_node_status_cb_t node_status_cb; + // private members + pthread_mutex_t mesh_mutex; + event_loop_t loop; + struct node_t *self; meshlink_log_cb_t log_cb; meshlink_log_level_t log_level; - meshlink_channel_accept_cb_t channel_accept_cb; - meshlink_node_duplicate_cb_t node_duplicate_cb; - meshlink_connection_try_cb_t connection_try_cb; - - pthread_t thread; - bool threadstarted; - pthread_mutex_t mesh_mutex; - event_loop_t loop; - listen_socket_t listen_socket[MAXSOCKETS]; + // The most important network-related members come first int listen_sockets; + listen_socket_t listen_socket[MAXSOCKETS]; + + meshlink_receive_cb_t receive_cb; + meshlink_queue_t outpacketqueue; signal_t datafromapp; - struct node_t *self; + hash_t *node_udp_cache; - struct splay_tree_t *config; - struct splay_tree_t *edges; struct splay_tree_t *nodes; + struct splay_tree_t *edges; struct list_t *connections; struct list_t *outgoings; struct list_t *submeshes; - meshlink_queue_t outpacketqueue; - + // Meta-connection-related members struct splay_tree_t *past_request_tree; timeout_t past_request_timeout; + int connection_burst; int contradicting_add_edge; int contradicting_del_edge; int sleeptime; + time_t connection_burst_time; time_t last_config_check; + time_t last_hard_try; timeout_t pingtimer; timeout_t periodictimer; - char *myport; + struct connection_t *everyone; - char *proxyhost; - char *proxyport; - char *proxyuser; - char *proxypass; - proxytype_t proxytype; + int next_pit; + int pits[10]; - bool discovery; // Whether Catta is enabled or not - bool localdiscovery; - sockaddr_t localdiscovery_address; + // Infrequently used callbacks + meshlink_node_status_cb_t node_status_cb; + meshlink_channel_accept_cb_t channel_accept_cb; + meshlink_node_duplicate_cb_t node_duplicate_cb; + meshlink_connection_try_cb_t connection_try_cb; - bool default_blacklist; + // Mesh parameters + char *appname; + char *myport; - hash_t *node_udp_cache; - struct connection_t *everyone; + struct ecdsa *private_key; struct ecdsa *invitation_key; - int invitation_timeout; + int32_t devclass; + + int invitation_timeout; int pinginterval; /* seconds between pings */ int pingtimeout; /* seconds to wait for response */ int maxtimeout; + int udp_choice; - int sock; - sptps_t sptps; - char cookie[18], hash[18]; - char *data; - size_t thedatalen; - bool success; - char line[4096]; - char buffer[4096]; - size_t blen; + int netns; - pthread_t discovery_thread; + bool default_blacklist; + bool discovery; // Whether Catta is enabled or not + + + // Configuration + char *confbase; + FILE *conffile; + void *config_key; + + // Thread management + pthread_t thread; + pthread_cond_t cond; + pthread_mutex_t discovery_mutex; + pthread_cond_t discovery_cond; + bool threadstarted; bool discovery_threadstarted; + + // Catta + pthread_t discovery_thread; struct CattaServer *catta_server; struct CattaSServiceBrowser *catta_browser; struct CattaSimplePoll *catta_poll; struct CattaSEntryGroup *catta_group; char *catta_servicetype; + unsigned int catta_interfaces; - int netns; + // State used for meshlink_join() + int sock; + char cookie[18], hash[18]; + bool success; + sptps_t sptps; + char *data; + size_t thedatalen; + size_t blen; + char line[4096]; + char buffer[4096]; + + // Proxy configuration, currently not exposed. + char *proxyhost; + char *proxyport; + char *proxyuser; + char *proxypass; + proxytype_t proxytype; }; /// A handle for a MeshLink node. @@ -176,12 +205,28 @@ struct meshlink_submesh { void *priv; }; +/// An AIO buffer. +typedef struct meshlink_aio_buffer { + const void *data; + int fd; + size_t len; + size_t done; + union { + meshlink_aio_cb_t buffer; + meshlink_aio_fd_cb_t fd; + } cb; + void *priv; + struct meshlink_aio_buffer *next; +} meshlink_aio_buffer_t; + /// A channel. struct meshlink_channel { struct node_t *node; void *priv; struct utcp_connection *c; + meshlink_aio_buffer_t *aio_send; + meshlink_aio_buffer_t *aio_receive; meshlink_channel_receive_cb_t receive_cb; meshlink_channel_poll_cb_t poll_cb; }; @@ -198,6 +243,7 @@ extern meshlink_log_level_t global_log_level; extern meshlink_log_cb_t global_log_cb; extern int check_port(meshlink_handle_t *mesh); extern void handle_duplicate_node(meshlink_handle_t *mesh, struct node_t *n); +extern void handle_network_change(meshlink_handle_t *mesh, bool online); /// Device class traits typedef struct { @@ -206,6 +252,6 @@ typedef struct { int edge_weight; } dev_class_traits_t; -extern dev_class_traits_t dev_class_traits[]; +extern const dev_class_traits_t dev_class_traits[]; #endif