From c7795d6b93297ec5d1ce5d9d998a42aec575502e Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Sat, 6 Mar 2021 02:13:10 +0000
Subject: Fix not always incrementing the DNSBL stats.

---
 src/modules/m_dnsbl.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 6712e2674..57a780ff2 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -84,7 +84,10 @@ class DNSBLResolver : public DNS::Request
 		/* Check the user still exists */
 		LocalUser* them = IS_LOCAL(ServerInstance->FindUUID(theiruid));
 		if (!them || them->client_sa != theirsa)
+		{
+			ConfEntry->stats_misses++;
 			return;
+		}
 
 		int i = countExt.get(them);
 		if (i)
@@ -242,6 +245,20 @@ class DNSBLResolver : public DNS::Request
 
 	void OnError(const DNS::Query *q) CXX11_OVERRIDE
 	{
+		bool is_miss = true;
+		switch (q->error)
+		{
+			case DNS::ERROR_NO_RECORDS:
+			case DNS::ERROR_DOMAIN_NOT_FOUND:
+				ConfEntry->stats_misses++;
+				break;
+
+			default:
+				ConfEntry->stats_errors++;
+				is_miss = false;
+				break;
+		}
+
 		LocalUser* them = IS_LOCAL(ServerInstance->FindUUID(theiruid));
 		if (!them || them->client_sa != theirsa)
 			return;
@@ -250,13 +267,9 @@ class DNSBLResolver : public DNS::Request
 		if (i)
 			countExt.set(them, i - 1);
 
-		if (q->error == DNS::ERROR_NO_RECORDS || q->error == DNS::ERROR_DOMAIN_NOT_FOUND)
-		{
-			ConfEntry->stats_misses++;
+		if (is_miss)
 			return;
-		}
 
-		ConfEntry->stats_errors++;
 		ServerInstance->SNO->WriteGlobalSno('d', "An error occurred whilst checking whether %s (%s) is on the '%s' DNS blacklist: %s",
 			them->GetFullRealHost().c_str(), them->GetIPString().c_str(), ConfEntry->name.c_str(), this->manager->GetErrorStr(q->error).c_str());
 	}
-- 
cgit v1.2.3