Handle meshlink_channel_close() being called in callbacks.

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 8a632e26f0527e676c6cdbf662a05df70fd73ce8..f9225ee5cca65f98ac29a71f0c883d2edfc1bcdf 100644 (file)
--- 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;
@@ -199,13 +191,6 @@ struct meshlink_handle {
        meshlink_queue_t adns_queue;
        meshlink_queue_t adns_done_queue;
        signal_t adns_signal;
-
-       // Proxy configuration, currently not exposed.
-       char *proxyhost;
-       char *proxyport;
-       char *proxyuser;
-       char *proxypass;
-       proxytype_t proxytype;
 };
 
 /// A handle for a MeshLink node.
@@ -238,6 +223,7 @@ typedef struct meshlink_aio_buffer {
 struct meshlink_channel {
        struct node_t *node;
        void *priv;
+       bool in_callback;
 
        struct utcp_connection *c;
        meshlink_aio_buffer_t *aio_send;