partial gsqlbackend dnsnamanificatio:n

diff --git a/modules/gmysqlbackend/smysql.cc b/modules/gmysqlbackend/smysql.cc
index 5dc519b0ae7d857be1316575b40527da5f889b75..e764930010d5bec65c87d5800a9a88f5dedf8928 100644 (file)
--- a/modules/gmysqlbackend/smysql.cc
+++ b/modules/gmysqlbackend/smysql.cc
@@ -118,7 +118,7 @@ public:
     return this;
   }
   SSqlStatement* bind(const string& name, const DNSName& value) {
-    return bind(name, stripDot(value.toString()));
+    return bind(name, stripDot(value.toString())); // FIXME toLower() ?
   }
   SSqlStatement* bindNull(const string& name) { 
     if (d_paridx >= d_parnum)

diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc
index c8975e9c5bf589e9daf2e2f89f92f734e5e8e1ef..dcaaf9c82c827274b89d500279c1ac4cbce6e164 100644 (file)
--- a/pdns/backends/gsql/gsqlbackend.cc
+++ b/pdns/backends/gsql/gsqlbackend.cc
@@ -290,13 +290,13 @@ bool GSQLBackend::setAccount(const string &domain, const string &account)
   return true;
 }
 
-bool GSQLBackend::getDomainInfo(const string &domain, DomainInfo &di)
+bool GSQLBackend::getDomainInfo(const DNSName &domain, DomainInfo &di)
 {
   /* fill DomainInfo from database info:
      id,name,master IP(s),last_check,notified_serial,type,account */
   try {
     d_InfoOfDomainsZoneQuery_stmt->
-      bind("domain", toLower(domain))->
+      bind("domain", domain)->
       execute()->
       getResult(d_result)->
       reset();
@@ -321,13 +321,13 @@ bool GSQLBackend::getDomainInfo(const string &domain, DomainInfo &di)
   di.serial = 0;
   try {
     SOAData sd;
-    if(!getSOA(domain,sd))
-      L<<Logger::Notice<<"No serial for '"<<domain<<"' found - zone is missing?"<<endl;
+    if(!getSOA(domain, sd))
+      L<<Logger::Notice<<"No serial for '"<<domain.toString()<<"' found - zone is missing?"<<endl;
     else
       di.serial = sd.serial;
   }
   catch(PDNSException &ae){
-    L<<Logger::Error<<"Error retrieving serial for '"<<domain<<"': "<<ae.reason<<endl;
+    L<<Logger::Error<<"Error retrieving serial for '"<<domain.toString()<<"': "<<ae.reason<<endl;
   }
 
   di.kind = DomainInfo::stringToKind(type);
@@ -636,7 +636,7 @@ bool GSQLBackend::getBeforeAndAfterNamesAbsolute(uint32_t id, const std::string&
   return true;
 }
 
-int GSQLBackend::addDomainKey(const string& name, const KeyData& key)
+int GSQLBackend::addDomainKey(const DNSName& name, const KeyData& key)
 {
   if(!d_dnssecQueries)
     return -1;
@@ -646,7 +646,7 @@ int GSQLBackend::addDomainKey(const string& name, const KeyData& key)
       bind("flags", key.flags)->
       bind("active", key.active)->
       bind("content", key.content)->
-      bind("domain", toLower(name))->
+      bind("domain", name)->
       execute()->
       reset();
   }
@@ -656,14 +656,14 @@ int GSQLBackend::addDomainKey(const string& name, const KeyData& key)
   return 1; // XXX FIXME, no idea how to get the id
 }
 
-bool GSQLBackend::activateDomainKey(const string& name, unsigned int id)
+bool GSQLBackend::activateDomainKey(const DNSName& name, unsigned int id)
 {
   if(!d_dnssecQueries)
     return false;
 
   try {
     d_ActivateDomainKeyQuery_stmt->
-      bind("domain", toLower(name))->
+      bind("domain", name)->
       bind("key_id", id)->
       execute()->
       reset();
@@ -674,14 +674,14 @@ bool GSQLBackend::activateDomainKey(const string& name, unsigned int id)
   return true;
 }
 
-bool GSQLBackend::deactivateDomainKey(const string& name, unsigned int id)
+bool GSQLBackend::deactivateDomainKey(const DNSName& name, unsigned int id)
 {
   if(!d_dnssecQueries)
     return false;
 
   try {
     d_DeactivateDomainKeyQuery_stmt->
-      bind("domain", toLower(name))->
+      bind("domain", name)->
       bind("key_id", id)->
       execute()->
       reset();
@@ -692,14 +692,14 @@ bool GSQLBackend::deactivateDomainKey(const string& name, unsigned int id)
   return true;
 }
 
-bool GSQLBackend::removeDomainKey(const string& name, unsigned int id)
+bool GSQLBackend::removeDomainKey(const DNSName& name, unsigned int id)
 {
   if(!d_dnssecQueries)
     return false;
 
   try {
     d_RemoveDomainKeyQuery_stmt->
-      bind("domain", toLower(name))->
+      bind("domain", name)->
       bind("key_id", id)->
       execute()->
       reset();
@@ -710,11 +710,11 @@ bool GSQLBackend::removeDomainKey(const string& name, unsigned int id)
   return true;
 }
 
-bool GSQLBackend::getTSIGKey(const string& name, string* algorithm, string* content)
+bool GSQLBackend::getTSIGKey(const DNSName& name, DNSName* algorithm, string* content)
 {
   try {
     d_getTSIGKeyQuery_stmt->
-      bind("key_name", toLower(name))->
+      bind("key_name", name)->
       execute();
   
     SSqlStatement::row_t row;
@@ -722,7 +722,7 @@ bool GSQLBackend::getTSIGKey(const string& name, string* algorithm, string* cont
     content->clear();
     while(d_getTSIGKeyQuery_stmt->hasNextRow()) {
       d_getTSIGKeyQuery_stmt->nextRow(row);
-      if(row.size() >= 2 && (algorithm->empty() || pdns_iequals(*algorithm, row[0]))) {
+      if(row.size() >= 2 && (!algorithm->countLabels() || *algorithm==row[0])) {
         *algorithm = row[0];
         *content = row[1];
       }
@@ -737,12 +737,12 @@ bool GSQLBackend::getTSIGKey(const string& name, string* algorithm, string* cont
   return !content->empty();
 }
 
-bool GSQLBackend::setTSIGKey(const string& name, const string& algorithm, const string& content)
+bool GSQLBackend::setTSIGKey(const DNSName& name, const DNSName& algorithm, const string& content)
 {
   try {
     d_setTSIGKeyQuery_stmt->
-      bind("key_name", toLower(name))->
-      bind("algorithm", toLower(algorithm))->
+      bind("key_name", name)->
+      bind("algorithm", algorithm)->
       bind("content", content)->
       execute()->
       reset();
@@ -753,11 +753,11 @@ bool GSQLBackend::setTSIGKey(const string& name, const string& algorithm, const
   return true;
 }
 
-bool GSQLBackend::deleteTSIGKey(const string& name)
+bool GSQLBackend::deleteTSIGKey(const DNSName& name)
 {
   try {
     d_deleteTSIGKeyQuery_stmt->
-      bind("key_name", toLower(name))->
+      bind("key_name", name)->
       execute()->
       reset();
   }
@@ -793,14 +793,14 @@ bool GSQLBackend::getTSIGKeys(std::vector< struct TSIGKey > &keys)
   return keys.empty();
 }
 
-bool GSQLBackend::getDomainKeys(const string& name, unsigned int kind, std::vector<KeyData>& keys)
+bool GSQLBackend::getDomainKeys(const DNSName& name, unsigned int kind, std::vector<KeyData>& keys)
 {
   if(!d_dnssecQueries)
     return false;
 
   try {
     d_ListDomainKeysQuery_stmt->
-      bind("domain", toLower(name))->
+      bind("domain", name)->
       execute();
   
     SSqlStatement::row_t row;
@@ -827,7 +827,7 @@ bool GSQLBackend::getDomainKeys(const string& name, unsigned int kind, std::vect
   return true;
 }
 
-void GSQLBackend::alsoNotifies(const string &domain, set<string> *ips)
+void GSQLBackend::alsoNotifies(const DNSName &domain, set<string> *ips)
 {
   vector<string> meta;
   getDomainMetadata(domain, "ALSO-NOTIFY", meta);
@@ -836,11 +836,11 @@ void GSQLBackend::alsoNotifies(const string &domain, set<string> *ips)
   }
 }
 
-bool GSQLBackend::getAllDomainMetadata(const string& name, std::map<std::string, std::vector<std::string> >& meta)
+bool GSQLBackend::getAllDomainMetadata(const DNSName& name, std::map<std::string, std::vector<std::string> >& meta)
 {
   try {
     d_GetAllDomainMetadataQuery_stmt->
-      bind("domain", toLower(name))->
+      bind("domain", name)->
       execute();
 
     SSqlStatement::row_t row;
@@ -861,14 +861,14 @@ bool GSQLBackend::getAllDomainMetadata(const string& name, std::map<std::string,
 }
 
 
-bool GSQLBackend::getDomainMetadata(const string& name, const std::string& kind, std::vector<std::string>& meta)
+bool GSQLBackend::getDomainMetadata(const DNSName& name, const std::string& kind, std::vector<std::string>& meta)
 {
   if(!d_dnssecQueries && isDnssecDomainMetadata(kind))
     return false;
 
   try {
     d_GetDomainMetadataQuery_stmt->
-      bind("domain", toLower(name))->
+      bind("domain", name)->
       bind("kind", kind)->
       execute();
   
@@ -888,14 +888,14 @@ bool GSQLBackend::getDomainMetadata(const string& name, const std::string& kind,
   return true;
 }
 
-bool GSQLBackend::setDomainMetadata(const string& name, const std::string& kind, const std::vector<std::string>& meta)
+bool GSQLBackend::setDomainMetadata(const DNSName& name, const std::string& kind, const std::vector<std::string>& meta)
 {
   if(!d_dnssecQueries && isDnssecDomainMetadata(kind))
     return false;
 
   try {
     d_ClearDomainMetadataQuery_stmt->
-      bind("domain", toLower(name))->
+      bind("domain", name)->
       bind("kind", kind)->
       execute()->
       reset();
@@ -904,7 +904,7 @@ bool GSQLBackend::setDomainMetadata(const string& name, const std::string& kind,
          d_SetDomainMetadataQuery_stmt->
            bind("kind", kind)->
            bind("content", value)->
-           bind("domain", toLower(name))->
+           bind("domain", name)->
            execute()->
            reset();
       }
@@ -925,7 +925,7 @@ void GSQLBackend::lookup(const QType &qtype,const DNSName &qname, DNSPacket *pkt
         d_query_stmt = d_NoIdQuery_stmt;
         d_query_stmt->
           bind("qtype", qtype.getName())->
-          bind("qname", qname); // DNSNameFIXME: toLower()?
+          bind("qname", qname);
       } else {
         d_query_stmt = d_IdQuery_stmt;
         d_query_stmt->
@@ -976,8 +976,9 @@ bool GSQLBackend::list(const DNSName &target, int domain_id, bool include_disabl
   return true;
 }
 
-bool GSQLBackend::listSubZone(const string &zone, int domain_id) {
-  string wildzone = "%." + zone;
+bool GSQLBackend::listSubZone(const DNSName &zone, int domain_id) {
+  
+  string wildzone = "%." + stripDot(zone.toString());  // tolower()?
 
   try {
     d_query_stmt = d_listSubZoneQuery_stmt;
@@ -1198,7 +1199,7 @@ void GSQLBackend::getAllDomains(vector<DomainInfo> *domains, bool include_disabl
   }
 }
 
-bool GSQLBackend::replaceRRSet(uint32_t domain_id, const string& qname, const QType& qt, const vector<DNSResourceRecord>& rrset)
+bool GSQLBackend::replaceRRSet(uint32_t domain_id, const DNSName& qname, const QType& qt, const vector<DNSResourceRecord>& rrset)
 {
   try {
     if (qt != QType::ANY) {
@@ -1479,12 +1480,12 @@ void GSQLBackend::feedComment(const Comment& comment)
   }
 }
 
-bool GSQLBackend::replaceComments(const uint32_t domain_id, const string& qname, const QType& qt, const vector<Comment>& comments)
+bool GSQLBackend::replaceComments(const uint32_t domain_id, const DNSName& qname, const QType& qt, const vector<Comment>& comments)
 {
   try {
     d_DeleteCommentRRsetQuery_stmt->
       bind("domain_id",domain_id)->
-      bind("qname",toLower(qname))->
+      bind("qname", qname)->
       bind("qtype",qt.getName())->
       execute()->
       reset();

diff --git a/pdns/backends/gsql/gsqlbackend.hh b/pdns/backends/gsql/gsqlbackend.hh
index 91ef318d0c6a4d206d6b135db505b2870f0a5111..b0d3514eaaa673562a42ced141ec4f245c9d5dd7 100644 (file)
--- a/pdns/backends/gsql/gsqlbackend.hh
+++ b/pdns/backends/gsql/gsqlbackend.hh
@@ -167,7 +167,7 @@ public:
   bool get(DNSResourceRecord &r);
   void getAllDomains(vector<DomainInfo> *domains, bool include_disabled=false);
   bool isMaster(const string &domain, const string &ip);
-  void alsoNotifies(const string &domain, set<string> *ips);
+  void alsoNotifies(const DNSName &domain, set<string> *ips);
   bool startTransaction(const string &domain, int domain_id=-1);
   bool commitTransaction();
   bool abortTransaction();
@@ -181,7 +181,7 @@ public:
   void setFresh(uint32_t domain_id);
   void getUnfreshSlaveInfos(vector<DomainInfo> *domains);
   void getUpdatedMasters(vector<DomainInfo> *updatedDomains);
-  bool getDomainInfo(const string &domain, DomainInfo &di);
+  bool getDomainInfo(const DNSName &domain, DomainInfo &di);
   void setNotified(uint32_t domain_id, uint32_t serial);
   bool setMaster(const string &domain, const string &ip);
   bool setKind(const string &domain, const DomainInfo::DomainKind kind);
@@ -198,28 +198,28 @@ public:
 
   virtual bool calculateSOASerial(const string& domain, const SOAData& sd, time_t& serial);
 
-  bool replaceRRSet(uint32_t domain_id, const string& qname, const QType& qt, const vector<DNSResourceRecord>& rrset);
-  bool listSubZone(const string &zone, int domain_id);
-  int addDomainKey(const string& name, const KeyData& key);
-  bool getDomainKeys(const string& name, unsigned int kind, std::vector<KeyData>& keys);
-  bool getAllDomainMetadata(const string& name, std::map<std::string, std::vector<std::string> >& meta);
-  bool getDomainMetadata(const string& name, const std::string& kind, std::vector<std::string>& meta);
-  bool setDomainMetadata(const string& name, const std::string& kind, const std::vector<std::string>& meta);
-  bool clearDomainAllMetadata(const string& domain);
+  bool replaceRRSet(uint32_t domain_id, const DNSName& qname, const QType& qt, const vector<DNSResourceRecord>& rrset);
+  bool listSubZone(const DNSName &zone, int domain_id);
+  int addDomainKey(const DNSName& name, const KeyData& key);
+  bool getDomainKeys(const DNSName& name, unsigned int kind, std::vector<KeyData>& keys);
+  bool getAllDomainMetadata(const DNSName& name, std::map<std::string, std::vector<std::string> >& meta);
+  bool getDomainMetadata(const DNSName& name, const std::string& kind, std::vector<std::string>& meta);
+  bool setDomainMetadata(const DNSName& name, const std::string& kind, const std::vector<std::string>& meta);
+  bool clearDomainAllMetadata(const DNSName& domain);
   
-  bool removeDomainKey(const string& name, unsigned int id);
-  bool activateDomainKey(const string& name, unsigned int id);
-  bool deactivateDomainKey(const string& name, unsigned int id);
+  bool removeDomainKey(const DNSName& name, unsigned int id);
+  bool activateDomainKey(const DNSName& name, unsigned int id);
+  bool deactivateDomainKey(const DNSName& name, unsigned int id);
   
-  bool getTSIGKey(const string& name, string* algorithm, string* content);
-  bool setTSIGKey(const string& name, const string& algorithm, const string& content);
-  bool deleteTSIGKey(const string& name);
+  bool getTSIGKey(const DNSName& name, DNSName* algorithm, string* content);
+  bool setTSIGKey(const DNSName& name, const DNSName& algorithm, const string& content);
+  bool deleteTSIGKey(const DNSName& name);
   bool getTSIGKeys(std::vector< struct TSIGKey > &keys);
 
   bool listComments(const uint32_t domain_id);
   bool getComment(Comment& comment);
   void feedComment(const Comment& comment);
-  bool replaceComments(const uint32_t domain_id, const string& qname, const QType& qt, const vector<Comment>& comments);
+  bool replaceComments(const uint32_t domain_id, const DNSName& qname, const QType& qt, const vector<Comment>& comments);
 
 private:
   DNSName d_qname;