From 79339ce55f1c105c1b6662c687fd7055744cf4c7 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Fri, 18 Dec 2020 22:57:21 +0000
Subject: [PATCH] Fix $SYS/broker/publish/messages/+ counters not being updated
 for QoS 1, 2

Closes #1968. Thanks to promahn.
---
 ChangeLog.txt     | 4 ++--
 lib/packet_mosq.c | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 244709dd..ef70ad96 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -3,8 +3,8 @@ Broker:
 - Fix DH group not being set for TLS connections, which meant ciphers using
   DHE couldn't be used. Closes #1925. Closes #1476.
 - Fix local bridges being disconnected on SIGHUP. Closes #1942.
-
-
+- Fix $SYS/broker/publish/messages/+ counters not being updated for QoS 1, 2
+  messages. Closes #1968.
 - Fix listener not being reassociated with client when reloading a persistence
   file and `per_listener_settings true` is set and the client did not set a
   username. Closes #1891.
diff --git a/lib/packet_mosq.c b/lib/packet_mosq.c
index c6c03d1b..7305b044 100644
--- a/lib/packet_mosq.c
+++ b/lib/packet_mosq.c
@@ -285,6 +285,8 @@ int packet__write(struct mosquitto *mosq)
 			mosquitto__free(packet);
 			return MOSQ_ERR_SUCCESS;
 #endif
+		}else if(((packet->command)&0xF0) == CMD_PUBLISH){
+			G_PUB_MSGS_SENT_INC(1);
 		}
 
 		/* Free data and reset values */