From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 12 Nov 2019 08:33:26 +0000 (+0100)
Subject: dnsdist: Correctly account actively discovered timeouts in StatNode
X-Git-Tag: dnsdist-1.4.0~8^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5e708dc7136de59f37e5b9e0e63835936bf6fab;p=thirdparty%2Fpdns.git

dnsdist: Correctly account actively discovered timeouts in StatNode
---

diff --git a/pdns/dnsdist-dynblocks.hh b/pdns/dnsdist-dynblocks.hh
index 5d9923fb07..dd834a1655 100644
--- a/pdns/dnsdist-dynblocks.hh
+++ b/pdns/dnsdist-dynblocks.hh
@@ -576,7 +576,7 @@ private:
         }
 
         if (suffixMatchRuleMatches) {
-          root.submit(c.name, c.dh.rcode, boost::none);
+          root.submit(c.name, ((c.dh.rcode == 0 && c.usec == std::numeric_limits<unsigned int>::max()) ? -1 : c.dh.rcode), boost::none);
         }
       }
     }
diff --git a/pdns/dnsdist-lua-inspection.cc b/pdns/dnsdist-lua-inspection.cc
index 1c335f283c..bbd3da7a3c 100644
--- a/pdns/dnsdist-lua-inspection.cc
+++ b/pdns/dnsdist-lua-inspection.cc
@@ -117,7 +117,7 @@ static void statNodeRespRing(statvisitor_t visitor, unsigned int seconds)
       if (seconds && c.when < cutoff)
         continue;
 
-      root.submit(c.name, c.dh.rcode, boost::none);
+      root.submit(c.name, ((c.dh.rcode == 0 && c.usec == std::numeric_limits<unsigned int>::max()) ? -1 : c.dh.rcode), boost::none);
     }
   }