From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Thu, 14 May 2015 14:40:02 +0000 (+0200)
Subject: snap
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~58^2~21^2~5^2~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fca2e23d65bcba8cae66a73da27b23f43711d7e;p=thirdparty%2Fpdns.git

snap
---

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 118373aa09..cca7037609 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -369,7 +369,7 @@ void *qthread(void *number)
      if(P->d.qr)
        continue;
 
-    S.ringAccount("queries", P->qdomain+"/"+P->qtype.getName());
+    S.ringAccount("queries", P->qdomain.toString()+"/"+P->qtype.getName());
     S.ringAccount("remotes",P->d_remote);
     if(logDNSQueries) {
       string remote;
@@ -377,7 +377,7 @@ void *qthread(void *number)
         remote = P->getRemote() + "<-" + P->getRealRemote().toString();
       else
         remote = P->getRemote();
-      L << Logger::Notice<<"Remote "<< remote <<" wants '" << P->qdomain<<"|"<<P->qtype.getName() << 
+      L << Logger::Notice<<"Remote "<< remote <<" wants '" << P->qdomain.toString()<<"|"<<P->qtype.getName() << 
             "', do = " <<P->d_dnssecOk <<", bufsize = "<< P->getMaxReplyLen()<<": ";
     }
 
diff --git a/pdns/communicator.hh b/pdns/communicator.hh
index 1be3673ba8..17f3f459e8 100644
--- a/pdns/communicator.hh
+++ b/pdns/communicator.hh
@@ -44,7 +44,7 @@ using namespace boost::multi_index;
 
 struct SuckRequest
 {
-  string domain;
+  DNSName domain;
   string master;
   bool operator<(const SuckRequest& b) const
   {
@@ -66,7 +66,7 @@ typedef UniQueue::index<IDTag>::type domains_by_name_t;
 class NotificationQueue
 {
 public:
-  void add(const string &domain, const string &ip)
+  void add(const DNSName &domain, const string &ip)
   {
     const ComboAddress caIp(ip);
 
@@ -80,7 +80,7 @@ public:
     d_nqueue.push_back(nr);
   }
 
-  bool removeIf(const string &remote, uint16_t id, const string &domain)
+  bool removeIf(const string &remote, uint16_t id, const DNSName &domain)
   {
     ServiceTuple stRemote, stQueued;
     parseService(remote, stRemote);
@@ -95,7 +95,7 @@ public:
     return false;
   }
 
-  bool getOne(string &domain, string &ip, uint16_t *id, bool &purged)
+  bool getOne(DNSName &domain, string &ip, uint16_t *id, bool &purged)
   {
     for(d_nqueue_t::iterator i=d_nqueue.begin();i!=d_nqueue.end();++i) 
       if(i->next <= time(0)) {
@@ -128,7 +128,7 @@ public:
 private:
   struct NotificationRequest
   {
-    string domain;
+    DNSName domain;
     string ip;
     int attempts;
     uint16_t id;
@@ -158,15 +158,15 @@ public:
   void go();
   
   
-  void drillHole(const string &domain, const string &ip);
-  bool justNotified(const string &domain, const string &ip);
-  void addSuckRequest(const string &domain, const string &master);
+  void drillHole(const DNSName &domain, const string &ip);
+  bool justNotified(const DNSName &domain, const string &ip);
+  void addSuckRequest(const DNSName &domain, const string &master);
   void addSlaveCheckRequest(const DomainInfo& di, const ComboAddress& remote);
   void addTrySuperMasterRequest(DNSPacket *p);
-  void notify(const string &domain, const string &ip);
+  void notify(const DNSName &domain, const string &ip);
   void mainloop();
   void retrievalLoopThread();
-  void sendNotification(int sock, const string &domain, const ComboAddress& remote, uint16_t id);
+  void sendNotification(int sock, const DNSName &domain, const ComboAddress& remote, uint16_t id);
 
   static void *launchhelper(void *p)
   {
@@ -178,15 +178,15 @@ public:
     static_cast<CommunicatorClass *>(p)->retrievalLoopThread();
     return 0;
   }
-  bool notifyDomain(const string &domain);
+  bool notifyDomain(const DNSName &domain);
 private:
   void makeNotifySockets();
-  void queueNotifyDomain(const string &domain, UeberBackend *B);
+  void queueNotifyDomain(const DNSName &domain, UeberBackend *B);
   int d_nsock4, d_nsock6;
   map<pair<string,string>,time_t>d_holes;
   pthread_mutex_t d_holelock;
   void launchRetrievalThreads();
-  void suck(const string &domain, const string &remote);
+  void suck(const DNSName &domain, const string &remote);
   void slaveRefresh(PacketHandler *P);
   void masterUpdateCheck(PacketHandler *P);
   pthread_mutex_t d_lock;
diff --git a/pdns/distributor.hh b/pdns/distributor.hh
index f50e65fabf..bbc59a8802 100644
--- a/pdns/distributor.hh
+++ b/pdns/distributor.hh
@@ -194,7 +194,7 @@ template<class Answer, class Question, class Backend>void *MultiThreadDistributo
 
         a->setRcode(RCode::ServFail);
         S.inc("servfail-packets");
-        S.ringAccount("servfail-queries",QD->Q->qdomain);
+        S.ringAccount("servfail-queries",QD->Q->qdomain.toString());
 
 	delete QD->Q;
       }
@@ -206,7 +206,7 @@ template<class Answer, class Question, class Backend>void *MultiThreadDistributo
 	
         a->setRcode(RCode::ServFail);
         S.inc("servfail-packets");
-        S.ringAccount("servfail-queries",QD->Q->qdomain);
+        S.ringAccount("servfail-queries",QD->Q->qdomain.toString());
 	delete QD->Q;
       }
 
@@ -238,7 +238,7 @@ template<class Answer, class Question, class Backend>int SingleThreadDistributor
     a=q->replyPacket();
     a->setRcode(RCode::ServFail);
     S.inc("servfail-packets");
-    S.ringAccount("servfail-queries",q->qdomain);
+    S.ringAccount("servfail-queries",q->qdomain.toString());
   }
   catch(...) {
     L<<Logger::Error<<"Caught unknown exception in Distributor thread "<<(unsigned long)pthread_self()<<endl;
@@ -247,7 +247,7 @@ template<class Answer, class Question, class Backend>int SingleThreadDistributor
     a=q->replyPacket();
     a->setRcode(RCode::ServFail);
     S.inc("servfail-packets");
-    S.ringAccount("servfail-queries",q->qdomain);
+    S.ringAccount("servfail-queries",q->qdomain.toString());
   }
   callback(a);
   return 0;
diff --git a/pdns/dnsname.hh b/pdns/dnsname.hh
index 542c85fa3c..14e73754b5 100644
--- a/pdns/dnsname.hh
+++ b/pdns/dnsname.hh
@@ -30,6 +30,8 @@ public:
   
   bool isPartOf(const DNSName& rhs) const;   //!< Are we part of the rhs name?
   bool operator==(const DNSName& rhs) const; //!< DNS-native comparison (case insensitive)
+  bool operator!=(const DNSName& other) const { return !(*this == other); }
+
   std::string toString() const;              //!< Our human-friendly, escaped, representation
   std::string toDNSString() const;           //!< Our representation in DNS native format
   void appendRawLabel(const std::string& str); //!< Append this unescaped label
diff --git a/pdns/dnsproxy.cc b/pdns/dnsproxy.cc
index 522b80b1f1..65a7845797 100644
--- a/pdns/dnsproxy.cc
+++ b/pdns/dnsproxy.cc
@@ -234,7 +234,7 @@ void DNSProxy::mainloop(void)
 
         if(p.qtype.getCode() != i->second.qtype || p.qdomain != i->second.qname) {
           L<<Logger::Error<<"Discarding packet from recursor backend with id "<<(d.id^d_xor)<<
-            ", qname or qtype mismatch ("<<p.qtype.getCode()<<" v " <<i->second.qtype<<", "<<p.qdomain<<" v "<<i->second.qname<<")"<<endl;
+            ", qname or qtype mismatch ("<<p.qtype.getCode()<<" v " <<i->second.qtype<<", "<<p.qdomain.toString()<<" v "<<i->second.qname.toString()<<")"<<endl;
           continue;
         }
 
diff --git a/pdns/dnsproxy.hh b/pdns/dnsproxy.hh
index c6eda47fac..94510d4727 100644
--- a/pdns/dnsproxy.hh
+++ b/pdns/dnsproxy.hh
@@ -79,7 +79,7 @@ private:
     ComboAddress remote;
     int outsock;
     time_t created;
-    string qname;
+    DNSName qname;
     uint16_t qtype;
     DNSPacket* complete;
     string aname;
diff --git a/pdns/mastercommunicator.cc b/pdns/mastercommunicator.cc
index 3c80120075..d1658f0086 100644
--- a/pdns/mastercommunicator.cc
+++ b/pdns/mastercommunicator.cc
@@ -43,7 +43,7 @@
 #include "namespaces.hh"
 
 
-void CommunicatorClass::queueNotifyDomain(const string &domain, UeberBackend *B)
+void CommunicatorClass::queueNotifyDomain(const DNSName &domain, UeberBackend *B)
 {
   bool hasQueuedItem=false;
   set<string> nsset, ips;
@@ -99,7 +99,7 @@ void CommunicatorClass::queueNotifyDomain(const string &domain, UeberBackend *B)
 }
 
 
-bool CommunicatorClass::notifyDomain(const string &domain)
+bool CommunicatorClass::notifyDomain(const DNSName &domain)
 {
   DomainInfo di;
   UeberBackend B;
@@ -177,12 +177,12 @@ time_t CommunicatorClass::doNotifications()
     }
 
     if(p.d.rcode)
-      L<<Logger::Warning<<"Received unsuccessful notification report for '"<<p.qdomain<<"' from "<<from.toStringWithPort()<<", error: "<<RCode::to_s(p.d.rcode)<<endl;      
+      L<<Logger::Warning<<"Received unsuccessful notification report for '"<<p.qdomain.toString()<<"' from "<<from.toStringWithPort()<<", error: "<<RCode::to_s(p.d.rcode)<<endl;      
 
     if(d_nq.removeIf(from.toStringWithPort(), p.d.id, p.qdomain))
-      L<<Logger::Warning<<"Removed from notification list: '"<<p.qdomain<<"' to "<<from.toStringWithPort()<<" "<< (p.d.rcode ? RCode::to_s(p.d.rcode) : "(was acknowledged)")<<endl;      
+      L<<Logger::Warning<<"Removed from notification list: '"<<p.qdomain.toString()<<"' to "<<from.toStringWithPort()<<" "<< (p.d.rcode ? RCode::to_s(p.d.rcode) : "(was acknowledged)")<<endl;      
     else {
-      L<<Logger::Warning<<"Received spurious notify answer for '"<<p.qdomain<<"' from "<< from.toStringWithPort()<<endl;
+      L<<Logger::Warning<<"Received spurious notify answer for '"<<p.qdomain.toString()<<"' from "<< from.toStringWithPort()<<endl;
       //d_nq.dump();
     }
   }
@@ -228,13 +228,13 @@ void CommunicatorClass::sendNotification(int sock, const string& domain, const C
   }
 }
 
-void CommunicatorClass::drillHole(const string &domain, const string &ip)
+void CommunicatorClass::drillHole(const DNSName &domain, const string &ip)
 {
   Lock l(&d_holelock);
   d_holes[make_pair(domain,ip)]=time(0);
 }
 
-bool CommunicatorClass::justNotified(const string &domain, const string &ip)
+bool CommunicatorClass::justNotified(const DNSName &domain, const string &ip)
 {
   Lock l(&d_holelock);
   if(d_holes.find(make_pair(domain,ip))==d_holes.end()) // no hole
@@ -256,7 +256,7 @@ void CommunicatorClass::makeNotifySockets()
     d_nsock6 = -1;
 }
 
-void CommunicatorClass::notify(const string &domain, const string &ip)
+void CommunicatorClass::notify(const DNSName &domain, const string &ip)
 {
   d_nq.add(domain, ip);
   d_any_sem.post();