Changeset 319 for trunk/pdns/pdns/backends/bind/bindbackend2.cc

Timestamp:

02/13/05 21:56:57 (8 years ago)

Author:

ahu

Message:

Upgrade a few more license statements to be precise about 'version 2'
Add hint that we should use ip_pktinfo in nameserver.hh, upgrade (C)
clean up bindbackend a lot, fix case sensitivity, remove 'WRONG' comments
complete move of debian directory

Files:

• trunk/pdns/pdns/backends/bind/bindbackend2.cc (modified) (19 diffs)

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

@@ -1 +1 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002-2003  PowerDNS.COM BV
+    Copyright (C) 2002-2005  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
@@ -16 +16 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-// $Id: bindbackend2.cc,v 1.6 2003/10/04 14:15:46 ahu Exp $ 
+
 #include <errno.h>
 #include <string>
@@ -47 +47 @@
 /** new scheme of things:
     we have zone-id map
-    a zone-id has a vector of DNSResourceRecords */
+    a zone-id has a vector of DNSResourceRecords 
+    on start of query, we find the best zone to answer from
+
+    handle::get walks this vector linearly... */
 
 map<string,int> Bind2Backend::s_name_id_map;
@@ -115 +118 @@
 bool Bind2Backend::startTransaction(const string &qname, int id)
 {
-
   BB2DomainInfo &bbd=*s_id_zone_map[d_transaction_id=id];
   d_transaction_tmpname=bbd.d_filename+"."+itoa(random());
@@ -171 +173 @@
   string content=r.content;
 
-  // SOA needs stripping too! XXX FIXME
+  // SOA needs stripping too! XXX FIXME - also, this should not be here I think
   switch(r.qtype.getCode()) {
   case QType::TXT:
@@ -283 +285 @@
       i!=ret.end();
       ++i)
-    ; // *i=*i; //tolower(*i);
+    *i=tolower(*i);
 
 
@@ -299 +301 @@
   rr.qname=canonic(qnameu);
   rr.qtype=qtype;
-  rr.content=content;
+  rr.content=canonic(content); // I think this is wrong, the zoneparser should not come up with . terminated stuff XXX FIXME
   rr.ttl=ttl;
   rr.priority=prio;
@@ -384 +386 @@
 }
 
-
-
 Bind2Backend::Bind2Backend(const string &suffix)
 {
@@ -427 +427 @@
   
   loadConfig();
-  
 
   extern DynListener *dl;
@@ -587 +586 @@
     Does not throw errors or anything, may update d_status however */
 
-
 void Bind2Backend::queueReload(BB2DomainInfo *bbd)
 {
@@ -626 +624 @@
 {
   d_handle=new Bind2Backend::handle;
-  d_handle->d_records=new vector<DNSResourceRecord>; // WRONG
-  //  cout<<"Lookup! for "<<qname<<endl;
-  string domain=qname;
+
+  string domain=toLower(qname);
+
+  if(arg().mustDo("query-logging"))
+    L<<"Lookup for '"<<qtype.getName()<<"' of '"<<domain<<"'"<<endl;
+
   while(!s_name_id_map.count(domain) && chopOff(domain));
 
   if(!s_name_id_map.count(domain)) {
     //    cout<<"no such domain: '"<<qname<<"'"<<endl;
-    d_handle->d_iter=d_handle->d_records->end();  // WRONG
     d_handle->d_list=false;
     d_handle->d_bbd=0;
@@ -641 +641 @@
 
   //  cout<<"domain: '"<<domain<<"', id="<<id<<endl;
-  
 
   DLOG(L<<"Bind2Backend constructing handle for search for "<<qtype.getName()<<" for "<<
@@ -649 +648 @@
   d_handle->parent=this;
   d_handle->qtype=qtype;
-  string compressed=toLower(qname);
-  d_handle->d_records=s_id_zone_map[id]->d_records;
+
+  d_handle->d_records=s_id_zone_map[id]->d_records; // give it a copy
   d_handle->d_bbd=0;
   if(!d_handle->d_records->empty()) {
@@ -656 +655 @@
     if(!bbd.d_loaded) {
       delete d_handle;
-      throw DBException("Zone temporarily not available (file missing, or master dead)"); // fuck
+      throw DBException("Zone temporarily not available (file missing, or master dead)"); // fsck
     }
 
@@ -662 +661 @@
       L<<Logger::Warning<<"Can't get read lock on zone '"<<bbd.d_name<<"'"<<endl;
       delete d_handle;
-      throw DBException("Temporarily unavailable due to a zone lock"); // fuck
-    }
-      
-
+      throw DBException("Temporarily unavailable due to a zone lock"); // fsck
+    }
+    
     if(!bbd.current()) {
       L<<Logger::Warning<<"Zone '"<<bbd.d_name<<"' ("<<bbd.d_filename<<") needs reloading"<<endl;
@@ -682 +680 @@
 {
   d_bbd=0;
+  d_records=0;
   count=0;
 }
@@ -687 +686 @@
 bool Bind2Backend::get(DNSResourceRecord &r)
 {
+  if(!d_handle->d_records)
+    return false;
+
   if(!d_handle->get(r)) {
     delete d_handle;
     d_handle=0;
+
+    if(arg().mustDo("query-logging"))
+      L<<"End of answers"<<endl;
+
     return false;
   }
+  if(arg().mustDo("query-logging"))
+    L<<"Returning: '"<<r.qtype.getName()<<"' of '"<<r.qname<<"', content: '"<<r.content<<"'"<<endl;
   return true;
 }
@@ -708 +716 @@
        qname<<"- "<<d_records->size()<<" available!"<<endl);
   
-  while(d_iter!=d_records->end() && (d_iter->qname!=qname || !(qtype=="ANY" || (d_iter)->qtype==qtype))) {
+  // this is a linear walk!!! XXX FIXME
+  while(d_iter!=d_records->end() && (strcasecmp(d_iter->qname.c_str(),qname.c_str()) || !(qtype=="ANY" || (d_iter)->qtype==qtype))) {
     DLOG(L<<Logger::Warning<<"Skipped "<<qname<<"/"<<QType(d_iter->qtype).getName()<<": '"<<d_iter->content<<"'"<<endl);
     d_iter++;
@@ -721 +730 @@
   DLOG(L << "Bind2Backend get() returning a rr with a "<<QType(d_iter->qtype).getCode()<<endl);
 
-  r.qname=qname; // fill this in
+  r.qname=qname;
   
   r.content=(d_iter)->content;