Merge pull request #4541 from rgacogne/fix-suffix-match-tree

dnsdist: Fix insertion issues in SuffixMatchTree, move it to dnsname.hh

diff --cc pdns/dnsdist.hh
index a8d877fbab9b66fbdcec012a4082cc5438bab2f5,dbbfb3d83a410e34fb28b3011d68c77908a2dabc..e7851cefd0025c980fa320d158545b2b7bea738f
--- 1/pdns/dnsdist.hh
--- 2/pdns/dnsdist.hh
+++ b/pdns/dnsdist.hh
@@@ -569,102 -554,7 +569,8 @@@ enum ednsHeaderFlags 
    EDNS_HEADER_FLAG_DO = 32768
  };
  
- /* Quest in life: serve as a rapid block list. If you add a DNSName to a root SuffixMatchNode, 
-    anything part of that domain will return 'true' in check */
- template<typename T>
- struct SuffixMatchTree
- {
-   SuffixMatchTree(const std::string& name_="", bool endNode_=false) : name(name_), endNode(endNode_)
-   {}
- 
-   SuffixMatchTree(const SuffixMatchTree& rhs)
-   {
-     name = rhs.name;
-     d_human = rhs.d_human;
-     children = rhs.children;
-     endNode = rhs.endNode;
-     d_value = rhs.d_value;
-   }
-   std::string name;
-   std::string d_human;
-   mutable std::set<SuffixMatchTree> children;
-   mutable bool endNode;
-   mutable T d_value;
-   bool operator<(const SuffixMatchTree& rhs) const
-   {
-     return strcasecmp(name.c_str(), rhs.name.c_str()) < 0;
-   }
-   typedef SuffixMatchTree value_type;
- 
-   template<typename V>
-   void visit(const V& v) const {
-     for(const auto& c : children) 
-       c.visit(v);
-     if(endNode)
-       v(*this);
-   }
- 
-   void add(const DNSName& name, const T& t) 
-   {
-     add(name.getRawLabels(), t);
-   }
- 
-   void add(std::vector<std::string> labels, const T& value) const
-   {
-     if(labels.empty()) { // this allows insertion of the root
-       endNode=true;
-       d_value=value;
-     }
-     else if(labels.size()==1) {
-       SuffixMatchTree newChild(*labels.begin(), true);
-       newChild.d_value=value;
-       children.insert(newChild);
-     }
-     else {
-       SuffixMatchTree newnode(*labels.rbegin(), false);
-       auto res=children.insert(newnode);
-       if(!res.second) {
-         children.erase(newnode);
-         res=children.insert(newnode);
-       }
-       labels.pop_back();
-       res.first->add(labels, value);
-     }
-   }
- 
-   T* lookup(const DNSName& name)  const
-   {
-     if(children.empty()) { // speed up empty set
-       if(endNode)
-         return &d_value;
-       return 0;
-     }
-     return lookup(name.getRawLabels());
-   }
- 
-   T* lookup(std::vector<std::string> labels) const
-   {
-     if(labels.empty()) { // optimization
-       if(endNode)
-         return &d_value;
-       return 0;
-     }
- 
-     SuffixMatchTree smn(*labels.rbegin());
-     auto child = children.find(smn);
-     if(child == children.end()) {
-       if(endNode)
-         return &d_value;
-       return 0;
-     }
-     labels.pop_back();
-     return child->lookup(labels);
-   }
-   
- };
- 
  extern GlobalStateHolder<SuffixMatchTree<DynBlock>> g_dynblockSMT;
 +extern DNSAction::Action g_dynBlockAction;
  
  extern GlobalStateHolder<vector<CarbonConfig> > g_carbon;
  extern GlobalStateHolder<ServerPolicy> g_policy;

diff --cc pdns/dnsname.hh
Simple merge

diff --cc pdns/test-dnsname_cc.cc
Simple merge