From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 17 Dec 2015 16:30:13 +0000 (+0100)
Subject: Correctly count udp-queries
X-Git-Tag: dnsdist-1.0.0-alpha1~40^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3058%2Fhead;p=thirdparty%2Fpdns.git

Correctly count udp-queries

Closes #1723
---

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