Changeset 494

Timestamp:

09/24/05 19:27:19 (8 years ago)

Author:

ahu

Message:

fix parsing of NAPTR records in bind-style zonefiles
slight speedup in domain lookups
improve query-logging details for bindbackend

Location:

trunk/pdns/pdns/backends/bind

Files:

• bindbackend2.cc (modified) (3 diffs)
• bindbackend2.hh (modified) (1 diff)
• zoneparser2.cc (modified) (4 diffs)

trunk/pdns/pdns/backends/bind/bindbackend2.cc

@@ -50 +50 @@
 */
 
-map<string,int> Bind2Backend::s_name_id_map;
+Bind2Backend::name_id_map_t Bind2Backend::s_name_id_map;
 
 // this map contains BB2DomainInfo structs, each of which contains a *pointer* to domain data
@@ -656 +656 @@
   string domain=toLower(qname);
 
-  if(arg().mustDo("query-logging"))
-    L<<"Lookup for '"<<qtype.getName()<<"' of '"<<domain<<"'"<<endl;
+  bool mustlog=arg().mustDo("query-logging");
+  if(mustlog) 
+    L<<Logger::Warning<<"Lookup for '"<<qtype.getName()<<"' of '"<<domain<<"'"<<endl;
 
   while(!s_name_id_map.count(domain) && chopOff(domain));
 
-  if(!s_name_id_map.count(domain)) {
+  name_id_map_t::const_iterator iditer=s_name_id_map.find(domain);
+
+  if(iditer==s_name_id_map.end()) {
+    if(mustlog)
+      L<<Logger::Warning<<"Found no authoritative zone for "<<qname<<endl;
     d_handle.d_list=false;
     return;
   }
-  unsigned int id=s_name_id_map[domain];
-
-  d_handle.id=id;
+  //  unsigned int id=*iditer;
+  if(mustlog)
+    L<<Logger::Warning<<"Found data in zone '"<<domain<<"' with id "<<iditer->second<<endl;
+    
+  d_handle.id=iditer->second;
   
   DLOG(L<<"Bind2Backend constructing handle for search for "<<qtype.getName()<<" for "<<
@@ -675 +682 @@
     d_handle.qname=qname.substr(0,qname.size()-domain.length()-1); // strip domain name
 
-  
   d_handle.parent=this;
   d_handle.qtype=qtype;
   d_handle.domain=qname.substr(qname.size()-domain.length());
 
-  d_handle.d_records=s_id_zone_map[id].d_records; // give it a copy
+  d_handle.d_records=s_id_zone_map[iditer->second].d_records; // give it a copy
   if(!d_handle.d_records->empty()) {
-    BB2DomainInfo& bbd=s_id_zone_map[id];
+    BB2DomainInfo& bbd=s_id_zone_map[iditer->second];
     if(!bbd.d_loaded) {
       d_handle.reset();

trunk/pdns/pdns/backends/bind/bindbackend2.hh

@@ -162 +162 @@
   };
 
-  static map<string,int> s_name_id_map;  //!< convert a name to a domain id
+  typedef map<string,int> name_id_map_t;
+  static name_id_map_t s_name_id_map;  //!< convert a name to a domain id
 
   typedef map<uint32_t, BB2DomainInfo> id_zone_map_t;

trunk/pdns/pdns/backends/bind/zoneparser2.cc

@@ -182 +182 @@
   rec.ttl=ttl;
   rec.prio=prio;
+
+  //  cerr<<"filled with type: "<<rec.qtype<<", "<<QType::chartocode(qtype.c_str())<<": "<<content<<endl;
   recs.push_back(rec);
 }
@@ -233 +235 @@
 
   vector<string> parts;
-  stringtok(parts,tline," \t\"");  // THIS IS WRONG, THE " SHOULD BE TREATED! XXX FIXME
+  stringtok(parts,tline," \t");  // we used to strip " here
   if(parts[0][0]!='$' && !isspace(parts[0][0]))
     lastfirstword=parts[0];
@@ -531 +533 @@
 
 
-//  cerr<<qname<<", "<<qclass<<", "<<qtype<<", "<<ttl<<", rest from field "<<cpos<<endl;
+  //  cerr<<qname<<", "<<qclass<<", "<<qtype<<", "<<ttl<<", rest from field "<<cpos<<endl;
           
   int left=words.size()-cpos;
   string content;
 
-   if((qtype=="MX" && left==2) || (qtype=="SRV" && left==4)){
-     int prio=atoi(words[cpos++].c_str());left--;
-     content=words[cpos++];left--;
-     
-     while(left--)
-       content+=" "+words[cpos++];
-     
+  if((qtype=="MX" && left==2) || (qtype=="SRV" && left==4)){
+    int prio=atoi(words[cpos++].c_str());left--;
+    content=words[cpos++];left--;
+    
+    while(left--)
+      content+=" "+words[cpos++];
+    
     if(content=="@")
       content=d_origin;
@@ -567 +569 @@
     if(qtype=="SOA")
       soaCanonic(content);
-    
+    if(qtype=="TXT" && content.size() > 2) {  // strip quotes from TXT
+      if(content[0]=='"')
+        content=content.substr(1);
+      if(content[content.size()-1]=='"')
+        content.resize(content.size()-1);
+    }
+      
     fillRec(qname, qtype, content,ttl, 0, rec);
     return true;