From: Emeric Brun <ebrun@haproxy.com>
Date: Fri, 29 Oct 2021 14:28:33 +0000 (+0200)
Subject: BUG/MINOR: resolvers: fix sent messages were counted twice
X-Git-Tag: v2.5-dev13~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c37caab21c172ca042d5ef3aca6d1102f479dd53;p=thirdparty%2Fhaproxy.git

BUG/MINOR: resolvers: fix sent messages were counted twice

The sent messages counter was increased at both resolver.c and dns.c
layers.

This patch let the dns.c layer count the sent messages since this
layer handle a retry if transport layer is not ready (EAGAIN on udp
or tcp session ring buffer full).

This patch should be backported on all versions using a split of those
layers for resolving (v >=2.4)
---

diff --git a/src/resolvers.c b/src/resolvers.c
index 003ce62d1a..e0a5b00715 100644
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -374,9 +374,7 @@ static int resolv_send_query(struct resolv_resolution *resolution)
 			continue;
 		}
 
-		if (dns_send_nameserver(ns, trash.area, len) < 0)
-			ns->counters->snd_error++;
-		else
+		if (dns_send_nameserver(ns, trash.area, len) >= 0)
 			resolution->nb_queries++;
 	}