X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=8ba4e9801a6a743e47122fe6332e69baca3f691f;hb=42fe08d7834df4ef2c12af9f78d14f606dc4651d;hp=eaa89c5dbd59fb3aa3baf8f8c96db8e130b29e07;hpb=db8e6e4221c974314fd8b05d79dbc94152f01108;p=meshlink diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h index eaa89c5d..8ba4e980 100644 --- a/src/meshlink_internal.h +++ b/src/meshlink_internal.h @@ -57,14 +57,6 @@ typedef struct listen_socket_t { sockaddr_t broadcast_sa; } listen_socket_t; -typedef enum proxytype_t { - PROXY_NONE = 0, - PROXY_SOCKS4, - PROXY_SOCKS4A, - PROXY_SOCKS5, - PROXY_HTTP, -} proxytype_t; - struct meshlink_open_params { char *confbase; char *appname; @@ -99,6 +91,7 @@ struct meshlink_handle { struct node_t *self; meshlink_log_cb_t log_cb; meshlink_log_level_t log_level; + void *packet; // The most important network-related members come first int reachable; @@ -127,7 +120,6 @@ struct meshlink_handle { int contradicting_del_edge; int sleeptime; time_t connection_burst_time; - time_t last_config_check; time_t last_hard_try; time_t last_unreachable; timeout_t pingtimer; @@ -193,12 +185,12 @@ struct meshlink_handle { char *catta_servicetype; unsigned int catta_interfaces; - // Proxy configuration, currently not exposed. - char *proxyhost; - char *proxyport; - char *proxyuser; - char *proxypass; - proxytype_t proxytype; + // ADNS + pthread_t adns_thread; + pthread_cond_t adns_cond; + meshlink_queue_t adns_queue; + meshlink_queue_t adns_done_queue; + signal_t adns_signal; }; /// A handle for a MeshLink node. @@ -260,6 +252,6 @@ static inline int prng(meshlink_handle_t *mesh, uint64_t max) { } /// Fudge value of ~0.1 seconds, in microseconds. -static const unsigned int TIMER_FUDGE = 0x20000; +static const unsigned int TIMER_FUDGE = 0x8000000; #endif