Changeset 1031

Show
Ignore:
Timestamp:
04/16/07 17:38:22 (2 years ago)
Author:
ahu
Message:

no longer recurse for additional records - they are ignored anyhow

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/pdns/pdns/packethandler.cc

    r1015 r1031  
    333333      QType qtypes[2]; 
    334334      qtypes[0]="A"; qtypes[1]="AAAA"; 
    335       for(int n=0;n < d_doIPv6AdditionalProcessing + 1; ++n) { 
     335      for(int n=0 ; n < d_doIPv6AdditionalProcessing + 1; ++n) { 
    336336        B.lookup(qtypes[n],i->content,p);   
    337337        bool foundOne=false; 
     
    345345          rr.d_place=DNSResourceRecord::ADDITIONAL; 
    346346          r->addRecord(rr); 
    347            
    348         } 
    349         if(!foundOne) { 
    350           if(d_doRecursion && DP->recurseFor(p)) { 
    351             try { 
    352               Resolver resolver; 
    353               resolver.resolve(arg()["recursor"],i->content.c_str(),QType::A); 
    354               Resolver::res_t res=resolver.result(); 
    355               for(Resolver::res_t::const_iterator j=res.begin();j!=res.end();++j) { 
    356                 if(j->d_place==DNSResourceRecord::ANSWER) { 
    357                   rr=*j; 
    358                   rr.d_place=DNSResourceRecord::ADDITIONAL; 
    359                   r->addRecord(rr); 
    360                 } 
    361               } 
    362             } 
    363             catch(ResolverException& re) { 
    364               // L<<Logger::Error<<"Trying to do additional processing for answer to '"<<p->qdomain<<"' query: "<<re.reason<<endl; 
    365             } 
    366           } 
    367347        } 
    368348      }