From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 29 May 2017 16:16:10 +0000 (+0200)
Subject: dnsdist: Add labels count to StatNode, only set the name once
X-Git-Tag: rec-4.1.0-alpha1~25^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=431c43598fd7f17cf70b44383c7045c5c091bdf4;p=thirdparty%2Fpdns.git

dnsdist: Add labels count to StatNode, only set the name once
---

diff --git a/pdns/dnsdist-lua2.cc b/pdns/dnsdist-lua2.cc
index 2a98618c5b..738dc686f3 100644
--- a/pdns/dnsdist-lua2.cc
+++ b/pdns/dnsdist-lua2.cc
@@ -372,6 +372,7 @@ void moreLua(bool client)
                                                       } );
 
   g_lua.registerMember("fullname", &StatNode::fullname);
+  g_lua.registerMember("labelsCount", &StatNode::labelsCount);
   g_lua.registerMember("servfails", &StatNode::Stat::servfails);
   g_lua.registerMember("nxdomains", &StatNode::Stat::nxdomains);
   g_lua.registerMember("queries", &StatNode::Stat::queries);
diff --git a/pdns/statnode.cc b/pdns/statnode.cc
index f33e6f8d90..7a6959dd3a 100644
--- a/pdns/statnode.cc
+++ b/pdns/statnode.cc
@@ -1,6 +1,6 @@
 #include "statnode.hh"
 
-StatNode::Stat StatNode::print(int depth, Stat newstat, bool silent) const
+StatNode::Stat StatNode::print(unsigned int depth, Stat newstat, bool silent) const
 {
   if(!silent) {
     cout<<string(depth, ' ');
@@ -31,7 +31,7 @@ StatNode::Stat StatNode::print(int depth, Stat newstat, bool silent) const
 }
 
 
-void  StatNode::visit(visitor_t visitor, Stat &newstat, int depth) const
+void  StatNode::visit(visitor_t visitor, Stat &newstat, unsigned int depth) const
 {
   Stat childstat;
   childstat.queries += s.queries;
@@ -65,7 +65,7 @@ void StatNode::submit(const DNSName& domain, int rcode, const ComboAddress& remo
   for(auto const i : tmp) {
     parts.push_back(i);
   }
-  children[parts.back()].submit(parts, "", rcode, remote);
+  children[parts.back()].submit(parts, "", rcode, remote, 1);
 }
 
 /* www.powerdns.com. -> 
@@ -75,7 +75,7 @@ void StatNode::submit(const DNSName& domain, int rcode, const ComboAddress& remo
    www.powerdns.com. 
 */
 
-void StatNode::submit(deque<string>& labels, const std::string& domain, int rcode, const ComboAddress& remote)
+void StatNode::submit(deque<string>& labels, const std::string& domain, int rcode, const ComboAddress& remote, unsigned int count)
 {
   if(labels.empty())
     return;
@@ -92,7 +92,10 @@ void StatNode::submit(deque<string>& labels, const std::string& domain, int rcod
     ; //    cerr<<"Short name was already set to '"<<name<<"'"<<endl;
 
   if(labels.size()==1) {
-    fullname=name+"."+domain;
+    if (fullname.empty()) {
+      fullname=name+"."+domain;
+      labelsCount = count;
+    }
     //    cerr<<"Hit the end, set our fullname to '"<<fullname<<"'"<<endl<<endl;
     s.queries++;
     if(rcode<0)
@@ -106,10 +109,13 @@ void StatNode::submit(deque<string>& labels, const std::string& domain, int rcod
     s.remotes[remote]++;
   }
   else {
-    fullname=name+"."+domain;
+    if (fullname.empty()) {
+      fullname=name+"."+domain;
+      labelsCount = count;
+    }
     //    cerr<<"Not yet end, set our fullname to '"<<fullname<<"', recursing"<<endl;
     labels.pop_back();
-    children[labels.back()].submit(labels, fullname, rcode, remote);
+    children[labels.back()].submit(labels, fullname, rcode, remote, count+1);
   }
 }
 
diff --git a/pdns/statnode.hh b/pdns/statnode.hh
index 108a9d00d7..26759fd2ce 100644
--- a/pdns/statnode.hh
+++ b/pdns/statnode.hh
@@ -28,11 +28,7 @@
 class StatNode
 {
 public:
-  void submit(const DNSName& domain, int rcode, const ComboAddress& remote);
-  void submit(std::deque<std::string>& labels, const std::string& domain, int rcode, const ComboAddress& remote);
 
-  std::string name;
-  std::string fullname;
   struct Stat 
   {
     Stat() : queries(0), noerrors(0), nxdomains(0), servfails(0), drops(0){}
@@ -50,14 +46,21 @@ public:
       }
       return *this;
     }
-typedef std::map<ComboAddress,int,ComboAddress::addressOnlyLessThan> remotes_t;
+    typedef std::map<ComboAddress,int,ComboAddress::addressOnlyLessThan> remotes_t;
     remotes_t remotes;
   };
 
   Stat s;
-  Stat print(int depth=0, Stat newstat=Stat(), bool silent=false) const;
+  std::string name;
+  std::string fullname;
+  unsigned int labelsCount{0};
+
+  void submit(const DNSName& domain, int rcode, const ComboAddress& remote);
+  void submit(std::deque<std::string>& labels, const std::string& domain, int rcode, const ComboAddress& remote, unsigned int count);
+
+  Stat print(unsigned int depth=0, Stat newstat=Stat(), bool silent=false) const;
   typedef boost::function<void(const StatNode*, const Stat& selfstat, const Stat& childstat)> visitor_t;
-  void visit(visitor_t visitor, Stat& newstat, int depth=0) const;
+  void visit(visitor_t visitor, Stat& newstat, unsigned int depth=0) const;
   typedef std::map<std::string,StatNode, CIStringCompare> children_t;
   children_t children;