Fix all compiler warnings found using -Wall -W -pedantic.

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 710acdd794c40e1d67d30a5dcb0966c5ce1765df..d7d4910b18cfccf79461195d3246f137d4396445 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_INTERNAL_H
+#define MESHLINK_INTERNAL_H
+
 /*
     meshlink_internal.h -- Internal parts of the public API.
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MESHLINK_INTERNAL_H
-#define MESHLINK_INTERNAL_H
-
 #include "system.h"
 
 #include "event.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 {
@@ -181,4 +181,4 @@ typedef struct {
 
 extern dev_class_traits_t dev_class_traits[];
 
-#endif // MESHLINK_INTERNAL_H
+#endif