Changeset 1117

Timestamp:

12/29/07 15:38:57 (10 months ago)

Author:

ahu

Message:

remove hideous code from the beginning of time (1997), in preparation for the 'gotoplexer'

Files:

• trunk/pdns/pdns/lwres.cc (modified) (10 diffs)
• trunk/pdns/pdns/lwres.hh (modified) (2 diffs)
• trunk/pdns/pdns/syncres.cc (modified) (20 diffs)
• trunk/pdns/pdns/syncres.hh (modified) (1 diff)

trunk/pdns/pdns/lwres.cc

@@ -1 +1 @@
-/*
-    PowerDNS Versatile Database Driven Nameserver
-6
+7
-
-    This program is free software; you can redistribute it and/or modify
@@ -37 +37 @@
-#include "dnsparser.hh"
-#include "logger.hh"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-//! returns -2 for OS limits error, -1 for permanent error that has to do with remote, 0 for timeout, 1 for success
-/** Never throws! */
-LWRes::asyncresolve(const ComboAddress& ip, const string& domain, int type, bool doTCP, struct timeval* now
+asyncresolve(const ComboAddress& ip, const string& domain, int type, bool doTCP, struct timeval* now, LWResult *lwr
-{
-
-
-
-
+
+
+
-  vector<uint8_t> vpacket;
-  DNSPacketWriter pw(vpacket, domain, type);
@@ -66 +51 @@
-  pw.getHeader()->rd=0;
-  pw.getHeader()->id=Utility::random();
-
-
-
-
+
-
-  int ret;
@@ -75 +57 @@
-  DTime dt;
-  dt.setTimeval(*now);
-
+
-  if(!doTCP) {
-    int queryfd;
@@ -88 +70 @@
-    // sleep until we see an answer to this, interface to mtasker
-    
-d_buf), d_bufsize-1,0, ip, &d_
+buf.get()), bufsize-1,0, ip, &
-                  domain, type, queryfd, now->tv_sec);
-  }
@@ -100 +82 @@
-      s.connect(ie);
-      
-
-
+t
+t
-      const char *msgP=(const char*)&*vpacket.begin();
-      string packet=string(lenP, lenP+2)+string(msgP, msgP+vpacket.size());
@@ -114 +96 @@
-        return ret;
-      
-
-len);
+t
+tlen); // switch to the 'len' shared with the rest of the function
-      
-      ret=arecvtcp(packet, len, &s);
@@ -121 +103 @@
-        return ret;
-      
-
-
-
-
-
+
+
+
+
-      }
-d_buf
-
+buf.get()
+
-      ret=1;
-    }
@@ -136 +117 @@
-  }
-
-
+
+
+
+
-  *now=dt.getTimeval();
-
-
-
-
-
-
+
-  try {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        g_stats.unexpectedCount++;
-      }
-      goto out;
-    }
-
-
+
-    for(MOADNSParser::answers_t::const_iterator i=mdp.d_answers.begin(); i!=mdp.d_answers.end(); ++i) {          
-      //      cout<<i->first.d_place<<"\t"<<i->first.d_label<<"\tIN\t"<<DNSRecordContent::NumberToType(i->first.d_type);
-      //      cout<<"\t"<<i->first.d_ttl<<"\t"<< i->first.d_content->getZoneRepresentation()<<endl;
-      DNSResourceRecord rr;
-      rr.qtype=i->first.d_type;
@@ -170 +144 @@
-      rr.content=i->first.d_content->getZoneRepresentation();  // this should be the serialised form
-      rr.d_place=(DNSResourceRecord::Place) i->first.d_place;
-re
+lwr->d_resul
-    }
-
-
-
+
+
-  }
-  catch(exception &mde) {
-    if(::arg().mustDo("log-common-errors"))
-d_
+
-  }
-  catch(...) {
-    L<<Logger::Notice<<"Unknown error parsing packet from remote server"<<endl;
-  }
+  
+  g_stats.serverParseError++; 
+  
+ out:
+  lwr->d_rcode=RCode::ServFail;
-
-
-
-
-
-
-
+
-}
-
+

trunk/pdns/pdns/lwres.hh

@@ -1 +1 @@
-/*
-    PowerDNS Versatile Database Driven Nameserver
-5
+7
-
-    This program is free software; you can redistribute it and/or modify
@@ -53 +53 @@
-
-//! LWRes class 
-
+ult
-{
-public:
-  LWRes();
-  ~LWRes();
-  string i;
-
-  typedef vector<DNSResourceRecord> res_t;
-
-
-
+
-  int d_rcode;
-  bool d_aabit, d_tcbit;
-  uint32_t d_usec;
-private:
-  int d_sock;
-  unsigned char *d_buf;
-  int getLength();
-  int d_len;
-  int d_soacount;
-  string d_domain;
-  int d_type;
-  int d_timeout;
-  ComboAddress d_ip;
-  bool d_inaxfr;
-  int d_bufsize;
-};
-
+int asyncresolve(const ComboAddress& ip, const string& domain, int type, bool doTCP, struct timeval* now, LWResult* res);
+
-#endif // PDNS_LWRES_HH

trunk/pdns/pdns/syncres.cc

@@ -1 +1 @@
-/*
-    PowerDNS Versatile Database Driven Nameserver
-6
+7
-
-    This program is free software; you can redistribute it and/or modify
@@ -198 +198 @@
-  if(!(d_nocache && qtype.getCode()==QType::NS && qname==".")) {
-    if(d_cacheonly) { // very limited OOB support
+      LWResult lwr;
-      LOG<<prefix<<qname<<": Recursion not requested for '"<<qname<<"|"<<qtype.getName()<<"', peeking at auth/forward zones"<<endl;
-      string authname(qname);
@@ -204 +205 @@
-        string server=iter->second.d_server;
-        if(server.empty()) {
-          LWRes::res_t result;
-          ret.clear();
-          doOOBResolve(qname, qtype, ret, depth, res);
@@ -212 +212 @@
-          LOG<<prefix<<qname<<": forwarding query to hardcoded nameserver '"<<server<<"' for zone '"<<authname<<"'"<<endl;
-          ComboAddress remoteIP(server, 53);
-
-// filter out the good stuff from d_lwr.result()
-LWRes::res_t result=d_lwr.result();
-
-::res_t::const_iterator i=result.begin();i!=
+
+res=asyncresolve(remoteIP, qname, qtype.getCode(), false, &d_now, &lwr);    
+// filter out the good stuff from lwr.result()
+
+ult::res_t::const_iterator i=lwr.d_result.begin();i!=lwr.d_
-            if(i->d_place == DNSResourceRecord::ANSWER)
-              ret.push_back(*i);
@@ -599 +599 @@
-  }
-  
-
+ult
-
-  LOG<<prefix<<qname<<": Cache consultations done, have "<<(unsigned int)nameservers.size()<<" NS to contact"<<endl;
@@ -629 +629 @@
-      int resolveret;
-
+      LWResult lwr;
-      if(tns->empty()) {
-        LOG<<prefix<<qname<<": Domain is out-of-band"<<endl;
-d_
-d_
-d_
+
+
+
-      }
-      else {
@@ -659 +660 @@
-
-        }
+
-        for(remoteIP = remoteIPs.begin(); remoteIP != remoteIPs.end(); ++remoteIP) {
-          LOG<<prefix<<qname<<": Trying IP "<< remoteIP->toString() <<", asking '"<<qname<<"|"<<qtype.getName()<<"'"<<endl;
@@ -679 +681 @@
-            }
-            
-d_lwr.asyncresolve(*remoteIP, qname, qtype.getCode(), doTCP, &d_now
+asyncresolve(*remoteIP, qname, qtype.getCode(), doTCP, &d_now, &lwr
-            if(resolveret != 1) {
-              if(resolveret==0) {
@@ -692 +694 @@
-              else {
-                s_unreachables++; d_unreachables++;
- "<< (doTCP ? "over TCP" : "") 
+"<< (doTCP ? " over TCP" : "") <<", possible error: "<<strerror(errno)
-              }
-              
@@ -715 +717 @@
-          continue; 
-        
-
-
-
+
-          if(!doTCP) {
-            doTCP=true;
@@ -727 +727 @@
-        }
-        
-d_
+
-          LOG<<prefix<<qname<<": "<<*tns<<" returned a ServFail, trying sibling IP or NS"<<endl;
-          s_throttle.throttle(d_now.tv_sec,make_tuple(*remoteIP, qname, qtype.getCode()),60,3);
-          continue;
-        }
-result.size()<<" answers from "<<*tns<<" ("<< remoteIP->toString() <<"), rcode="<<d_lwr.d_rcode<<", in "<<d_
+lwr.d_result.size()<<" answers from "<<*tns<<" ("<< remoteIP->toString() <<"), rcode="<<lwr.d_rcode<<", in "<<
-
-        /*  // for you IPv6 fanatics :-)
-        if(remoteIP->sin4.sin_family==AF_INET6)
-d_
+
-        */
-
-d_
+
-      }
-
@@ -746 +746 @@
-
-      // reap all answers from this packet that are acceptable
-::res_t::const_iterator i=result.begin();i!=
+ult::res_t::const_iterator i=lwr.d_result.begin();i != lwr.d_
-        LOG<<prefix<<qname<<": accept answer '"<<i->qname<<"|"<<i->qtype.getName()<<"|"<<i->content<<"' from '"<<auth<<"' nameservers? ";
-        if(i->qtype.getCode()==QType::ANY) {
@@ -754 +754 @@
-          
-        if(dottedEndsOn(i->qname, auth)) {
-d_lwr.d_aabit && d_
+lwr.d_aabit && 
-            LOG<<"NO! Is from delegation-only zone"<<endl;
-            s_nodelegated++;
@@ -788 +788 @@
-        }
-
-d_
+
-      }
-      set<string, CIStringCompare> nsset;  
@@ -796 +796 @@
-      string newauth, soaname, newtarget;
-
-::res_t::const_iterator i=result.begin();i!=
+ult::res_t::const_iterator i=lwr.d_result.begin();i!=lwr.d_
-        if(i->d_place==DNSResourceRecord::AUTHORITY && dottedEndsOn(qname,i->qname) && i->qtype.getCode()==QType::SOA && 
-d_
+
-          LOG<<prefix<<qname<<": got negative caching indication for RECORD '"<<qname+"'"<<endl;
-          ret.push_back(*i);
@@ -819 +819 @@
-        else if(i->d_place==DNSResourceRecord::ANSWER && !Utility::strcasecmp(i->qname.c_str(),qname.c_str()) && 
-                ( (i->qtype==qtype) ||
-d_
+
-          
-          LOG<<prefix<<qname<<": answer is in: resolved to '"<< i->content<<"|"<<i->qtype.getName()<<"'"<<endl;
@@ -837 +837 @@
-        }
-        else if(!done && i->d_place==DNSResourceRecord::AUTHORITY && dottedEndsOn(qname,i->qname) && i->qtype.getCode()==QType::SOA && 
-d_
+
-          LOG<<prefix<<qname<<": got negative caching indication for '"<< (qname+"|"+i->qtype.getName()+"'") <<endl;
-          ret.push_back(*i);
@@ -857 +857 @@
-        return 0;
-      }
-d_
+
-        LOG<<prefix<<qname<<": status=NXDOMAIN, we are done "<<(negindic ? "(have negative SOA)" : "")<<endl;
-        return RCode::NXDomain;
@@ -875 +875 @@
-        return doResolve(newtarget, qtype, ret, depth + 1, beenthere2);
-      }
-d_
+
-        LOG<<prefix<<qname<<": status=noerror, other types may exist, but we are done "<<(negindic ? "(have negative SOA)" : "")<<endl;
-        return 0;
@@ -886 +886 @@
-      }
-      else if(isCanonical(*tns)) {
-;
+
-      }
-    }

trunk/pdns/pdns/syncres.hh

@@ -373 +373 @@
-  bool d_cacheonly;
-  bool d_nocache;
-  LWRes d_lwr;
-
-  struct GetBestNSAnswer