From: Aki Tuomi <cmouse@cmouse.fi>
Date: Mon, 15 Jun 2015 10:48:44 +0000 (+0300)
Subject: Use DNSName in Pipe backend
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~58^2~21^2~5^2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d173a2a075396421f617e5f727689562c284560;p=thirdparty%2Fpdns.git

Use DNSName in Pipe backend
---

diff --git a/modules/pipebackend/pipebackend.cc b/modules/pipebackend/pipebackend.cc
index 2d6e9b78f5..573defa661 100644
--- a/modules/pipebackend/pipebackend.cc
+++ b/modules/pipebackend/pipebackend.cc
@@ -109,11 +109,11 @@ PipeBackend::PipeBackend(const string &suffix)
    }
 }
 
-void PipeBackend::lookup(const QType &qtype,const string &qname, DNSPacket *pkt_p,  int zoneId)
+void PipeBackend::lookup(const QType& qtype,const DNSName& qname, DNSPacket *pkt_p,  int zoneId)
 {
    try {
       d_disavow=false;
-      if(d_regex && !d_regex->match(qname+";"+qtype.getName())) { 
+      if(d_regex && !d_regex->match(qname.toStringNoDot()+";"+qtype.getName())) { 
          if(::arg().mustDo("query-logging"))
             L<<Logger::Error<<"Query for '"<<qname<<"' type '"<<qtype.getName()<<"' failed regex '"<<d_regexstr<<"'"<<endl;
          d_disavow=true; // don't pass to backend
@@ -129,7 +129,7 @@ void PipeBackend::lookup(const QType &qtype,const string &qname, DNSPacket *pkt_
          }
          // pipebackend-abi-version = 1
          // type    qname           qclass  qtype   id      remote-ip-address
-         query<<"Q\t"<<qname<<"\tIN\t"<<qtype.getName()<<"\t"<<zoneId<<"\t"<<remoteIP;
+         query<<"Q\t"<<qname.toStringNoDot()<<"\tIN\t"<<qtype.getName()<<"\t"<<zoneId<<"\t"<<remoteIP;
 
          // add the local-ip-address if pipebackend-abi-version is set to 2
          if (d_abiVersion >= 2)
@@ -150,7 +150,7 @@ void PipeBackend::lookup(const QType &qtype,const string &qname, DNSPacket *pkt_
    d_qname=qname;
 }
 
-bool PipeBackend::list(const string &target, int inZoneId, bool include_disabled)
+bool PipeBackend::list(const DNSName& target, int inZoneId, bool include_disabled)
 {
    try {
       d_disavow=false;
@@ -159,7 +159,7 @@ bool PipeBackend::list(const string &target, int inZoneId, bool include_disabled
 
 // type    qname           qclass  qtype   id      ip-address
       if (d_abiVersion >= 4)
-        query<<"AXFR\t"<<inZoneId<<"\t"<<target;
+        query<<"AXFR\t"<<inZoneId<<"\t"<<target.toStringNoDot();
       else
         query<<"AXFR\t"<<inZoneId;
 
diff --git a/modules/pipebackend/pipebackend.hh b/modules/pipebackend/pipebackend.hh
index fe51bfc35e..e1b732327e 100644
--- a/modules/pipebackend/pipebackend.hh
+++ b/modules/pipebackend/pipebackend.hh
@@ -37,15 +37,15 @@ class PipeBackend : public DNSBackend
 public:
   PipeBackend(const string &suffix="");
   ~PipeBackend();
-  void lookup(const QType &, const string &qdomain, DNSPacket *p=0, int zoneId=-1);
-  bool list(const string &target, int domain_id, bool include_disabled=false);
+  void lookup(const QType&, const DNSName& qdomain, DNSPacket *p=0, int zoneId=-1);
+  bool list(const DNSName& target, int domain_id, bool include_disabled=false);
   bool get(DNSResourceRecord &r);
   
   static DNSBackend *maker();
   
 private:
   shared_ptr<CoWrapper> d_coproc;
-  string d_qname;
+  DNSName d_qname;
   QType d_qtype;
   Regex* d_regex;
   string d_regexstr;