From 6a01453ce0c39d56d49c684d5b0fcbb56c3b3d6e Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Wed, 25 Sep 2019 12:17:17 +0100
Subject: [PATCH] Build fixes.

---
 lib/loop.c        | 3 +++
 lib/net_mosq.c    | 2 +-
 lib/socks_mosq.c  | 1 +
 lib/srv_mosq.c    | 3 ++-
 src/context.c     | 1 +
 src/handle_auth.c | 1 +
 src/websockets.c  | 3 ++-
 7 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/loop.c b/lib/loop.c
index 1903feda..ad9bc0f3 100644
--- a/lib/loop.c
+++ b/lib/loop.c
@@ -47,6 +47,9 @@ int mosquitto_loop(struct mosquitto *mosq, int timeout, int max_packets)
 	char pairbuf;
 	int maxfd = 0;
 	time_t now;
+#ifdef WITH_SRV
+	int state;
+#endif
 
 	if(!mosq || max_packets < 1) return MOSQ_ERR_INVAL;
 #ifndef WIN32
diff --git a/lib/net_mosq.c b/lib/net_mosq.c
index 9fd75856..c2907452 100644
--- a/lib/net_mosq.c
+++ b/lib/net_mosq.c
@@ -210,7 +210,7 @@ int net__socket_close(struct mosquitto *mosq)
 	if(mosq->wsi)
 	{
 		if(mosq->state != mosq_cs_disconnecting){
-			context__set_state(mosq, mosq_cs_disconnect_ws);
+			mosquitto__set_state(mosq, mosq_cs_disconnect_ws);
 		}
 		libwebsocket_callback_on_writable(mosq->ws_context, mosq->wsi);
 	}else
diff --git a/lib/socks_mosq.c b/lib/socks_mosq.c
index 78959ecf..a9f0bbcd 100644
--- a/lib/socks_mosq.c
+++ b/lib/socks_mosq.c
@@ -37,6 +37,7 @@ Contributors:
 #include "net_mosq.h"
 #include "packet_mosq.h"
 #include "send_mosq.h"
+#include "util_mosq.h"
 
 #define SOCKS_AUTH_NONE 0x00
 #define SOCKS_AUTH_GSS 0x01
diff --git a/lib/srv_mosq.c b/lib/srv_mosq.c
index 50f30118..b05d257d 100644
--- a/lib/srv_mosq.c
+++ b/lib/srv_mosq.c
@@ -28,6 +28,7 @@ Contributors:
 #include "memory_mosq.h"
 #include "mosquitto_internal.h"
 #include "mosquitto.h"
+#include "util_mosq.h"
 
 #ifdef WITH_SRV
 static void srv_callback(void *arg, int status, int timeouts, unsigned char *abuf, int alen)
@@ -91,7 +92,7 @@ int mosquitto_connect_srv(struct mosquitto *mosq, const char *host, int keepaliv
 		mosquitto__free(h);
 	}
 
-	mosquitto__set_state(mosq_cs_connect_srv);
+	mosquitto__set_state(mosq, mosq_cs_connect_srv);
 
 	mosq->keepalive = keepalive;
 
diff --git a/src/context.c b/src/context.c
index 9996f8b8..35e57310 100644
--- a/src/context.c
+++ b/src/context.c
@@ -25,6 +25,7 @@ Contributors:
 #include "packet_mosq.h"
 #include "property_mosq.h"
 #include "time_mosq.h"
+#include "util_mosq.h"
 #include "will_mosq.h"
 
 #include "uthash.h"
diff --git a/src/handle_auth.c b/src/handle_auth.c
index 254a832e..64baacc9 100644
--- a/src/handle_auth.c
+++ b/src/handle_auth.c
@@ -25,6 +25,7 @@ Contributors:
 #include "packet_mosq.h"
 #include "property_mosq.h"
 #include "send_mosq.h"
+#include "util_mosq.h"
 #include "will_mosq.h"
 
 
diff --git a/src/websockets.c b/src/websockets.c
index b297534f..8c03a08a 100644
--- a/src/websockets.c
+++ b/src/websockets.c
@@ -38,6 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "memory_mosq.h"
 #include "packet_mosq.h"
 #include "sys_tree.h"
+#include "util_mosq.h"
 
 #include <stdlib.h>
 #include <errno.h>
@@ -424,7 +425,7 @@ static int callback_mqtt(struct libwebsocket_context *context,
 
 				if(rc && (mosq->out_packet || mosq->current_out_packet)) {
 					if(mosq->state != mosq_cs_disconnecting){
-						context__set_state(mosq, mosq_cs_disconnect_ws);
+						mosquitto__set_state(mosq, mosq_cs_disconnect_ws);
 					}
 					libwebsocket_callback_on_writable(mosq->ws_context, mosq->wsi);
 				} else if (rc) {