From 296ff2ed6751cd38a1c4e93ecc8a68342ca39ba8 Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Thu, 17 Dec 2015 17:30:13 +0100 Subject: [PATCH] Correctly count udp-queries Closes #1723 --- pdns/common_startup.cc | 7 +------ regression-tests.nobackend/counters/expected_result | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc index d296b540d6..2a1dcb447d 100644 --- a/pdns/common_startup.cc +++ b/pdns/common_startup.cc @@ -341,7 +341,6 @@ void *qthread(void *number) int diff; bool logDNSQueries = ::arg().mustDo("log-dns-queries"); bool doRecursion = ::arg().mustDo("recursor"); - bool skipfirst=true; UDPNameserver *NS = N; // If we have SO_REUSEPORT then create a new port for all receiver threads @@ -361,11 +360,7 @@ void *qthread(void *number) continue; // packet was broken, try again } - if (skipfirst) - skipfirst=false; - else - numreceived++; - + numreceived++; if(P->d_remote.getSocklen()==sizeof(sockaddr_in)) numreceived4++; diff --git a/regression-tests.nobackend/counters/expected_result b/regression-tests.nobackend/counters/expected_result index 92c11ce915..fc566f6ff2 100644 --- a/regression-tests.nobackend/counters/expected_result +++ b/regression-tests.nobackend/counters/expected_result @@ -33,7 +33,7 @@ timedout-packets=0 udp-answers-bytes=264 udp-answers=4 udp-do-queries=0 -udp-queries=3 +udp-queries=4 udp4-answers-bytes=132 udp4-answers=2 udp4-queries=2 -- 2.47.2