Use getsockname() to get a listening sockets actual address in meshlink_stop().

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index fa5e60ea44fbf099ef77e9dafc0123f1c19735eb..d7d4910b18cfccf79461195d3246f137d4396445 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -55,7 +55,6 @@ typedef enum proxytype_t {
        PROXY_SOCKS4A,
        PROXY_SOCKS5,
        PROXY_HTTP,
-       PROXY_EXEC,
 } proxytype_t;
 
 /// A handle for an instance of MeshLink.
@@ -77,7 +76,6 @@ struct meshlink_handle {
 
        pthread_t thread;
        bool threadstarted;
-       pthread_mutex_t outpacketqueue_mutex;
        pthread_mutex_t mesh_mutex;
        event_loop_t loop;
        listen_socket_t listen_socket[MAXSOCKETS];
@@ -113,6 +111,7 @@ struct meshlink_handle {
        char *proxypass;
        proxytype_t proxytype;
 
+       bool discovery;         // Whether Catta is enabled or not
        bool localdiscovery;
        sockaddr_t localdiscovery_address;
 
@@ -142,7 +141,7 @@ struct meshlink_handle {
        struct CattaSServiceBrowser *catta_browser;
        struct CattaSimplePoll *catta_poll;
        struct CattaSEntryGroup *catta_group;
-       char* catta_servicetype;
+       char *catta_servicetype;
 };
 
 /// A handle for a MeshLink node.
@@ -167,10 +166,11 @@ typedef struct meshlink_packethdr {
        uint8_t source[16];
 } __attribute__((__packed__)) meshlink_packethdr_t;
 
-extern void meshlink_send_from_queue(event_loop_t* el,meshlink_handle_t *mesh);
+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 check_port(meshlink_handle_t *mesh);
 
 /// Device class traits
 typedef struct {