From 4c4ca389383df3006556d8608d5f4e44467d8224 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Thu, 29 Aug 2019 12:12:05 +0100
Subject: [PATCH] Fix support for libwebsockets 3.x.

---
 ChangeLog.txt    |  1 +
 src/websockets.c | 14 +++-----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 22bdc2d8..526a3c87 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,7 @@
 Broker:
 - Fix v5 DISCONNECT packets with remaining length == 2 being treated as a
   protocol error. Closes #1367.
+- Fix support for libwebsockets 3.x.
 
 Build:
 - Fix missing function warnings on NetBSD.
diff --git a/src/websockets.c b/src/websockets.c
index 8a6d3aa4..02a1e56c 100644
--- a/src/websockets.c
+++ b/src/websockets.c
@@ -180,7 +180,7 @@ static int callback_mqtt(struct libwebsocket_context *context,
 	struct mosquitto_db *db;
 	struct mosquitto *mosq = NULL;
 	struct mosquitto__packet *packet;
-	int count, i, j;
+	int count;
 	const struct libwebsocket_protocols *p;
 	struct libws_mqtt_data *u = (struct libws_mqtt_data *)user;
 	size_t pos;
@@ -195,16 +195,7 @@ static int callback_mqtt(struct libwebsocket_context *context,
 			mosq = context__init(db, WEBSOCKET_CLIENT);
 			if(mosq){
 				p = libwebsockets_get_protocol(wsi);
-				for (i=0; i<db->config->listener_count; i++){
-					if (db->config->listeners[i].protocol == mp_websockets) {
-						for (j=0; db->config->listeners[i].ws_protocol[j].name; j++){
-							if (p == &db->config->listeners[i].ws_protocol[j]){
-								mosq->listener = &db->config->listeners[i];
-								mosq->listener->client_count++;
-							}
-						}
-					}
-				}
+				mosq->listener = p->user;
 				if(!mosq->listener){
 					mosquitto__free(mosq);
 					return -1;
@@ -715,6 +706,7 @@ struct libwebsocket_context *mosq_websockets_init(struct mosquitto__listener *li
 		p[i].callback = protocols[i].callback;
 		p[i].per_session_data_size = protocols[i].per_session_data_size;
 		p[i].rx_buffer_size = protocols[i].rx_buffer_size;
+		p[i].user = listener;
 	}
 
 	memset(&info, 0, sizeof(info));