Changeset 1658

Timestamp:

07/03/10 15:36:02 (3 years ago)

Author:

ahu

Message:

backport of master/slave parallel communicator

Location:

tags/pdns-2-9-22-x/pdns

Files:

• Makefile.am (modified) (1 diff)
• communicator.cc (modified) (4 diffs)
• communicator.hh (modified) (2 diffs)
• dnsrecords.hh (modified) (1 diff)
• inflighter.cc (added)
• mastercommunicator.cc (added)
• misc.hh (modified) (1 diff)
• resolver.cc (modified) (11 diffs)
• resolver.hh (modified) (1 diff)
• slavecommunicator.cc (added)

tags/pdns-2-9-22-x/pdns/Makefile.am

@@ -31 +31 @@
 dynlistener.cc dynlistener.hh  dynhandler.cc dynhandler.hh  \
 resolver.hh resolver.cc communicator.cc communicator.hh dnsproxy.cc \
+mastercommunicator.cc slavecommunicator.cc \
 dnsproxy.hh randombackend.cc unix_utility.cc common_startup.cc \
 utility.hh iputils.hh common_startup.hh unix_semaphore.cc \

tags/pdns-2-9-22-x/pdns/communicator.cc

@@ -1 +1 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002-2008  PowerDNS.COM BV
+    Copyright (C) 2002-2009  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
@@ -33 +33 @@
 #include <boost/lexical_cast.hpp>
 
-using namespace boost;
+// #include "namespaces.hh"
 
-void CommunicatorClass::addSuckRequest(const string &domain, const string &master, bool priority)
-{
-  Lock l(&d_lock);
-  
-  SuckRequest sr;
-  sr.domain = domain;
-  sr.master = master;
-
-  if(priority) {
-    d_suckdomains.push_front(sr);
-    //  d_havepriosuckrequest=true;
-  }
-  else 
-    d_suckdomains.push_back(sr);
-  
-  d_suck_sem.post();
-  d_any_sem.post();
-}
-
-void CommunicatorClass::suck(const string &domain,const string &remote)
-{
-  L<<Logger::Error<<"Initiating transfer of '"<<domain<<"' from remote '"<<remote<<"'"<<endl;
-  uint32_t domain_id;
-  PacketHandler P;
-
-  DomainInfo di;
-  di.backend=0;
-  bool first=true;    
-  try {
-    Resolver resolver;
-    resolver.axfr(remote, domain.c_str());
-
-    UeberBackend *B=dynamic_cast<UeberBackend *>(P.getBackend());
-
-    if(!B->getDomainInfo(domain, di) || !di.backend) {
-      L<<Logger::Error<<"Can't determine backend for domain '"<<domain<<"'"<<endl;
-      return;
-    }
-    domain_id=di.id;
-
-    Resolver::res_t recs;
-
-    while(resolver.axfrChunk(recs)) {
-      if(first) {
-        L<<Logger::Error<<"AXFR started for '"<<domain<<"', transaction started"<<endl;
-        di.backend->startTransaction(domain, domain_id);
-        first=false;
-      }
-      for(Resolver::res_t::iterator i=recs.begin();i!=recs.end();++i) {
-        if(!endsOn(i->qname, domain)) { 
-          L<<Logger::Error<<"Remote "<<remote<<" tried to sneak in out-of-zone data '"<<i->qname<<"' during AXFR of zone '"<<domain<<"', ignoring"<<endl;
-          continue;
-        }
-        i->domain_id=domain_id;
-        if(i->qtype.getCode()>=1024)
-          throw DBException("Database can't store unknown record type "+lexical_cast<string>(i->qtype.getCode()-1024));
-
-        di.backend->feedRecord(*i);
-      }
-    }
-    di.backend->commitTransaction();
-    di.backend->setFresh(domain_id);
-    L<<Logger::Error<<"AXFR done for '"<<domain<<"', zone committed"<<endl;
-  }
-  catch(DBException &re) {
-    L<<Logger::Error<<"Unable to feed record during incoming AXFR of '"+domain+"': "<<re.reason<<endl;
-    if(di.backend && !first) {
-      L<<Logger::Error<<"Aborting possible open transaction for domain '"<<domain<<"' AXFR"<<endl;
-      di.backend->abortTransaction();
-    }
-  }
-  catch(ResolverException &re) {
-    L<<Logger::Error<<"Unable to AXFR zone '"+domain+"' from remote '"<<remote<<"': "<<re.reason<<endl;
-    if(di.backend && !first) {
-      L<<Logger::Error<<"Aborting possible open transaction for domain '"<<domain<<"' AXFR"<<endl;
-      di.backend->abortTransaction();
-    }
-  }
-}
-
-class FindNS
-{
-public:
-  vector<string>lookup(const string &name, DNSBackend *B)
-  {
-    vector<string>addresses;
-    struct hostent *h;
-    h=gethostbyname(name.c_str());
-
-    if(h) {
-      for(char **h_addr_list=h->h_addr_list;*h_addr_list;++h_addr_list) {
-        ostringstream os;
-        unsigned char *p=reinterpret_cast<unsigned char *>(*h_addr_list);
-        os<<(int)*p++<<".";
-        os<<(int)*p++<<".";
-        os<<(int)*p++<<".";
-        os<<(int)*p++;
-
-        addresses.push_back(os.str());
-      }
-    }
-
-    B->lookup(QType(QType::A),name);
-    DNSResourceRecord rr;
-    while(B->get(rr)) 
-      addresses.push_back(rr.content);   // SOL if you have a CNAME for an NS
-
-    return addresses;
-  }
-}d_fns;
-
-void CommunicatorClass::queueNotifyDomain(const string &domain, DNSBackend *B)
-{
-  set<string> ips;
-  
-  DNSResourceRecord rr;
-  set<string>nsset;
-
-  B->lookup(QType(QType::NS),domain);
-  while(B->get(rr)) 
-    nsset.insert(rr.content);
-  
-  for(set<string>::const_iterator j=nsset.begin();j!=nsset.end();++j) {
-    vector<string>nsips=d_fns.lookup(*j, B);
-    if(nsips.empty())
-      L<<Logger::Warning<<"Unable to queue notification of domain '"<<domain<<"': nameservers do not resolve!"<<endl;
-    for(vector<string>::const_iterator k=nsips.begin();k!=nsips.end();++k)
-      ips.insert(*k);
-  }
-  
-  // make calls to d_nq.add(domain, ip);
-  for(set<string>::const_iterator j=ips.begin();j!=ips.end();++j) {
-    L<<Logger::Warning<<"Queued notification of domain '"<<domain<<"' to "<<*j<<endl;
-    d_nq.add(domain,*j);
-  }
-  
-  set<string>alsoNotify;
-  B->alsoNotifies(domain, &alsoNotify);
-  
-  for(set<string>::const_iterator j=alsoNotify.begin();j!=alsoNotify.end();++j) {
-    L<<Logger::Warning<<"Queued also-notification of domain '"<<domain<<"' to "<<*j<<endl;
-    d_nq.add(domain,*j);
-  }
-}
-
-bool CommunicatorClass::notifyDomain(const string &domain)
-{
-  DomainInfo di;
-  PacketHandler P;
-  if(!P.getBackend()->getDomainInfo(domain, di)) {
-    L<<Logger::Error<<"No such domain '"<<domain<<"' in our database"<<endl;
-    return false;
-  }
-  queueNotifyDomain(domain, P.getBackend());
-  // call backend and tell them we sent out the notification - even though that is premature    
-  di.backend->setNotified(di.id, di.serial);
-
-  return true; 
-}
-
-
-void CommunicatorClass::masterUpdateCheck(PacketHandler *P)
-{
-  if(!::arg().mustDo("master"))
-    return; 
-
-  UeberBackend *B=dynamic_cast<UeberBackend *>(P->getBackend());
-  vector<DomainInfo> cmdomains;
-  B->getUpdatedMasters(&cmdomains);
-  
-  if(cmdomains.empty()) {
-    if(d_masterschanged)
-      L<<Logger::Warning<<"No master domains need notifications"<<endl;
-    d_masterschanged=false;
-  }
-  else {
-    d_masterschanged=true;
-    L<<Logger::Error<<cmdomains.size()<<" domain"<<(cmdomains.size()>1 ? "s" : "")<<" for which we are master need"<<
-      (cmdomains.size()>1 ? "" : "s")<<
-      " notifications"<<endl;
-  }
-
-  // figure out A records of everybody needing notification
-  // do this via the FindNS class, d_fns
-  
-  for(vector<DomainInfo>::const_iterator i=cmdomains.begin();i!=cmdomains.end();++i) {
-    extern PacketCache PC;
-    vector<string> topurge;
-    topurge.push_back(i->zone);
-    PC.purge(topurge); // fixes cvstrac ticket #30
-    queueNotifyDomain(i->zone,P->getBackend());
-    i->backend->setNotified(i->id,i->serial); 
-  }
-}
-
-void CommunicatorClass::slaveRefresh(PacketHandler *P)
-{
-  UeberBackend *B=dynamic_cast<UeberBackend *>(P->getBackend());
-  vector<DomainInfo> sdomains;
-  B->getUnfreshSlaveInfos(&sdomains);
-  
-  if(sdomains.empty())
-  {
-    if(d_slaveschanged)
-      L<<Logger::Warning<<"All slave domains are fresh"<<endl;
-    d_slaveschanged=false;
-    return;
-  }
-  else 
-    L<<Logger::Warning<<sdomains.size()<<" slave domain"<<(sdomains.size()>1 ? "s" : "")<<" need"<<
-      (sdomains.size()>1 ? "" : "s")<<
-      " checking"<<endl;
-  map<string, int> skipMasters;
-  for(vector<DomainInfo>::iterator i=sdomains.begin();i!=sdomains.end();++i) {
-    Resolver resolver;   
-    resolver.makeUDPSocket();  
-    d_slaveschanged=true;
-    uint32_t ourserial=i->serial, theirserial=0;
-    
-    if(d_havepriosuckrequest) {
-      d_havepriosuckrequest=false;
-      break;
-    }
-
-    random_shuffle(i->masters.begin(), i->masters.end());
-    for(vector<string>::const_iterator iter = i->masters.begin(); iter != i->masters.end(); ++iter) {
-      try {
-        if(skipMasters[*iter] > 5)
-          throw AhuException("Skipping query to '"+*iter+"' because of previous timeouts in this cycle");
-        
-        resolver.getSoaSerial(*iter, i->zone, &theirserial);
-        skipMasters[*iter]=0;   
-        if(theirserial<i->serial) {
-          L<<Logger::Error<<"Domain "<<i->zone<<" more recent than master, our serial "<<ourserial<<" > their serial "<<theirserial<<endl;
-          i->backend->setFresh(i->id);
-        }
-        else if(theirserial==i->serial) {
-          L<<Logger::Warning<<"Domain "<<i->zone<<" is fresh"<<endl;
-          i->backend->setFresh(i->id);
-        }
-        else {
-          L<<Logger::Warning<<"Domain "<<i->zone<<" is stale, master serial "<<theirserial<<", our serial "<<i->serial<<endl;
-          addSuckRequest(i->zone, *iter);
-        }
-        break;
-      }
-      catch(ResolverException &re) {
-        if(re.reason.find("Timeout") != string::npos)
-          skipMasters[*iter]++;
-
-        L<<Logger::Error<<"Error trying to retrieve/refresh '"+i->zone+"': "+re.reason<<endl;
-        if(next(iter) != i->masters.end()) 
-          L<<Logger::Error<<"Trying next master '"<<*next(iter)<<"' for '"+i->zone+"'"<<endl;
-      }
-      catch(AhuException &re) {
-        L<<Logger::Error<<"Error trying to retrieve/refresh '"+i->zone+"': "+re.reason<<endl;
-        if(next(iter) != i->masters.end()) 
-          L<<Logger::Error<<"Trying next master '"<<*next(iter)<<"' for '"+i->zone+"'"<<endl;
-      }
-    }
-  }
-}  
-
-time_t CommunicatorClass::doNotifications()
-{
-  ComboAddress from;
-  Utility::socklen_t fromlen=sizeof(from);
-  char buffer[1500];
-  int size;
-  static Resolver d_nresolver;
-  // receive incoming notifications on the nonblocking socket and take them off the list
-
-  while((size=recvfrom(d_nsock,buffer,sizeof(buffer),0,(struct sockaddr *)&from,&fromlen))>0) {
-    DNSPacket p;
-
-    p.setRemote(&from);
-
-    if(p.parse(buffer,size)<0) {
-      L<<Logger::Warning<<"Unable to parse SOA notification answer from "<<p.getRemote()<<endl;
-      continue;
-    }
-
-    if(p.d.rcode)
-      L<<Logger::Warning<<"Received unsuccesful notification report for '"<<p.qdomain<<"' from "<<p.getRemote()<<", rcode: "<<p.d.rcode<<endl;      
-    
-    if(d_nq.removeIf(p.getRemote(), p.d.id, p.qdomain))
-      L<<Logger::Warning<<"Removed from notification list: '"<<p.qdomain<<"' to "<<p.getRemote()<< (p.d.rcode ? "" : " (was acknowledged)")<<endl;      
-    else
-      L<<Logger::Warning<<"Received spurious notify answer for '"<<p.qdomain<<"' from "<<p.getRemote()<<endl;      
-  }
-
-  // send out possible new notifications
-  string domain, ip;
-  uint16_t id;
-
-  bool purged;
-  while(d_nq.getOne(domain, ip, &id, purged)) {
-    if(!purged) {
-      try {
-        d_nresolver.notify(d_nsock, domain, ip, id);
-        drillHole(domain, ip);
-      }
-      catch(ResolverException &re) {
-        L<<Logger::Error<<"Error trying to resolve '"+ip+"' for notifying '"+domain+"' to server: "+re.reason<<endl;
-      }
-    }
-    else
-      L<<Logger::Error<<Logger::NTLog<<"Notification for "<<domain<<" to "<<ip<<" failed after retries"<<endl;
-  }
-
-  return d_nq.earliest();
-}
-
-void CommunicatorClass::drillHole(const string &domain, const string &ip)
-{
-  Lock l(&d_holelock);
-  d_holes[make_pair(domain,ip)]=time(0);
-}
-
-bool CommunicatorClass::justNotified(const string &domain, const string &ip)
-{
-  Lock l(&d_holelock);
-  if(d_holes.find(make_pair(domain,ip))==d_holes.end()) // no hole
-    return false;
-
-  if(d_holes[make_pair(domain,ip)]>time(0)-900)    // recent hole
-    return true;
-
-  // do we want to purge this? XXX FIXME 
-  return false;
-}
-
-void CommunicatorClass::makeNotifySocket()
-{
-  if((d_nsock=socket(AF_INET, SOCK_DGRAM,0))<0)
-    throw AhuException(string("notification socket: ")+strerror(errno));
-
-  struct sockaddr_in sin;
-  memset((char *)&sin,0, sizeof(sin));
-  
-  sin.sin_family = AF_INET;
-
-  // Bind to a specific IP (query-local-address) if specified
-  string querylocaladdress(::arg()["query-local-address"]);
-  if (querylocaladdress=="") {
-    sin.sin_addr.s_addr = INADDR_ANY;
-  }
-  else
-  {
-    struct hostent *h=0;
-    h=gethostbyname(querylocaladdress.c_str());
-    if(!h) {
-      Utility::closesocket(d_nsock);
-      d_nsock=-1;       
-      throw AhuException("Unable to resolve query local address");
-    }
-
-    sin.sin_addr.s_addr = *(int*)h->h_addr;
-  }
-  
-  int n=0;
-  for(;n<10;n++) {
-    sin.sin_port = htons(10000+(Utility::random()%50000));
-    
-    if(::bind(d_nsock, (struct sockaddr *)&sin, sizeof(sin)) >= 0) 
-      break;
-  }
-  if(n==10) {
-    Utility::closesocket(d_nsock);
-    d_nsock=-1;
-    throw AhuException(string("binding notify socket: ")+strerror(errno));
-  }
-  if( !Utility::setNonBlocking( d_nsock ))
-    throw AhuException(string("error getting or setting notify socket non-blocking: ")+strerror(errno));
-
-}
-
-void CommunicatorClass::notify(const string &domain, const string &ip)
-{
-  d_nq.add(domain, ip);
-
-  d_any_sem.post();
-}
 
 void CommunicatorClass::mainloop(void)
@@ -438 +55 @@
       slaveRefresh(&P);
       masterUpdateCheck(&P);
-
-      tick=min(doNotifications(),
-               d_tickinterval);
+      tick=doNotifications();
+      
+      tick = min (tick, d_tickinterval); 
 
       //      L<<Logger::Error<<"tick = "<<tick<<", d_tickinterval = "<<d_tickinterval<<endl;
@@ -446 +63 @@
 
       while(time(0) < next) {
-        rc=d_any_sem.tryWait();
+        rc=d_any_sem.tryWait();
 
-        if(rc)
-          Utility::sleep(1);
-        else { 
-          if(!d_suck_sem.tryWait()) {
-            SuckRequest sr;
-            {
-              Lock l(&d_lock);
-              sr=d_suckdomains.front();
-              d_suckdomains.pop_front();
-            }
-            suck(sr.domain,sr.master);
-          }
-        }
-        // this gets executed at least once every second
-        doNotifications();
+        if(rc)
+          Utility::sleep(1);
+        else { 
+          if(!d_suck_sem.tryWait()) {
+            SuckRequest sr;
+            {
+              Lock l(&d_lock);
+              sr=d_suckdomains.front();
+              d_suckdomains.pop_front();
+            }
+            suck(sr.domain,sr.master);
+          }
+        }
+        // this gets executed at least once every second
+        doNotifications();
       }
     }

tags/pdns-2-9-22-x/pdns/communicator.hh

@@ -67 +67 @@
 
       if(i->id==id && i->ip==remote && i->domain==domain) {
-        d_nqueue.erase(i);
-        return true;
+        d_nqueue.erase(i);
+        return true;
       }
     }
@@ -78 +78 @@
     for(d_nqueue_t::iterator i=d_nqueue.begin();i!=d_nqueue.end();++i) 
       if(i->next <= time(0)) {
-        i->attempts++;
-        purged=false;
-        i->next=time(0)+1+(1<<i->attempts);
-        domain=i->domain;
-        ip=i->ip;
-        *id=i->id;
-        purged=false;
-        if(i->attempts>4) {
-          purged=true;
-          d_nqueue.erase(i);
-        }
-        return true;
+        i->attempts++;
+        purged=false;
+        i->next=time(0)+1+(1<<i->attempts);
+        domain=i->domain;
+        ip=i->ip;
+        *id=i->id;
+        purged=false;
+        if(i->attempts>4) {
+          purged=true;
+          d_nqueue.erase(i);
+        }
+        return true;
       }
     return false;

tags/pdns-2-9-22-x/pdns/dnsrecords.hh

@@ -322 +322 @@
   includeboilerplate(SOA)
   SOARecordContent(const string& mname, const string& rname, const struct soatimes& st);
+  struct soatimes d_st;
 
 private:
   string d_mname;
   string d_rname;
-  struct soatimes d_st;
+
 };
 

tags/pdns-2-9-22-x/pdns/misc.hh

@@ -304 +304 @@
   return tv.tv_sec + tv.tv_usec/1000000.0f;
 }
+inline bool operator<(const struct timeval& lhs, const struct timeval& rhs) 
+{
+  return make_pair(lhs.tv_sec, lhs.tv_usec) < make_pair(rhs.tv_sec, rhs.tv_usec);
+}
+
+
 struct CIStringCompare: public binary_function<string, string, bool>  
 {

tags/pdns-2-9-22-x/pdns/resolver.cc

@@ -1 +1 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002 - 2008 PowerDNS.COM BV
+    Copyright (C) 2002 - 2009 PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
@@ -26 +26 @@
 #include <algorithm>
 #include <sstream>
+#include "dnsrecords.hh"
 #include <cstring>
 #include <string>
@@ -41 +42 @@
 #include "dns_random.hh"
 
-using namespace boost;
+// #include "namespaces.hh"
 
 void Resolver::makeUDPSocket()
@@ -114 +115 @@
 }
 
-char* Resolver::sendReceive(const string &ip, uint16_t remotePort, const char *packet, int length, unsigned int *replen)
-{
-  makeTCPSocket(ip, remotePort);
-
-  if(sendData(packet,length,d_sock)<0) 
-    throw ResolverException("Unable to send packet to remote nameserver "+ip+": "+stringerror());
-
-  int plen=getLength();
-  if(plen<0)
-    throw ResolverException("EOF trying to get length of answer from remote TCP server");
-
-  char *answer=new char[plen];
-  try {
-    timeoutReadn(answer,plen);
-    *replen=plen;
-    return answer;
-  }
-  catch(...) {
-    delete answer;
-    throw; // whop!
-  }
-  return 0;
-}
-
 int Resolver::notify(int sock, const string &domain, const string &ip, uint16_t id)
 {
@@ -152 +129 @@
 }
 
-void Resolver::sendResolve(const string &ip, const char *domain, int type)
+uint16_t Resolver::sendResolve(const string &ip, const char *domain, int type)
 {
   vector<uint8_t> packet;
@@ -176 +153 @@
     throw ResolverException("Unable to ask query of "+st.host+":"+itoa(st.port)+": "+stringerror());
   }
+  return d_randomid;
+}
+
+bool Resolver::tryGetSOASerial(string* domain, uint32_t *theirSerial, uint16_t* id)
+{
+  Utility::setNonBlocking( d_sock );
+  
+  if(waitForData(d_sock, 0, 500000) == 0)
+    return false;
+  
+  int err;
+  ComboAddress fromaddr;
+  socklen_t addrlen=fromaddr.getSocklen();
+  err = recvfrom(d_sock, reinterpret_cast< char * >( d_buf ), 512, 0,(struct sockaddr*)(&fromaddr), &addrlen);
+  if(err < 0) {
+    if(errno == EAGAIN)
+      return false;
+    
+    throw ResolverException("recvfrom error waiting for answer: "+stringerror());
+  }
+  
+  MOADNSParser mdp((char*)d_buf, err);
+  *id=mdp.d_header.id;
+  *domain = stripDot(mdp.d_qname);
+  
+  if(mdp.d_answers.empty())
+    throw ResolverException("Query to '" + fromaddr.toString() + "' for SOA of '" + *domain + "' produced no results");
+  
+  if(mdp.d_qtype != QType::SOA || mdp.d_answers.begin()->first.d_type != QType::SOA) 
+    throw ResolverException("Query to '" + fromaddr.toString() + "' for SOA of '" + *domain + "' returned wrong record type");
+
+  shared_ptr<SOARecordContent> rrc=boost::dynamic_pointer_cast<SOARecordContent>(mdp.d_answers.begin()->first.d_content);
+
+  *theirSerial=rrc->d_st.serial;
+  
+  
+  return true;
 }
 
 int Resolver::receiveResolve(struct sockaddr* fromaddr, Utility::socklen_t addrlen)
 {
-  fd_set rd;
-  FD_ZERO(&rd);
-  FD_SET(d_sock, &rd);
-
-  struct timeval timeout;
-  timeout.tv_sec=0;
-  timeout.tv_usec=750000;
-
-  int res=select(d_sock+1,&rd,0,0,&timeout);
-
+  int res=waitForData(d_sock, 0, 7500000); 
+  
   if(!res) {
     throw ResolverException("Timeout waiting for answer");
@@ -257 +263 @@
     goto done;
 
-  fd_set rset,wset;
-  struct timeval tval;
-
-  FD_ZERO(&rset);
-  FD_SET(d_sock, &rset);
-  wset=rset;
-  tval.tv_sec=10;
-  tval.tv_usec=0;
-
-  if(!select(d_sock+1,&rset,&wset,0,tval.tv_sec ? &tval : 0)) {
+  err=waitForRWData(d_sock, false, 10, 0); // wait for writeability
+  
+  if(!err) {
     Utility::closesocket(d_sock); // timeout
     d_sock=-1;
@@ -273 +272 @@
     throw ResolverException("Timeout connecting to server");
   }
-  
-  if(FD_ISSET(d_sock, &rset) || FD_ISSET(d_sock, &wset))
-    {
+  else if(err < 0) {
+    throw ResolverException("Error connecting: "+string(strerror(err)));
+  }
+  else {
     Utility::socklen_t len=sizeof(err);
-      if(getsockopt(d_sock, SOL_SOCKET,SO_ERROR,(char *)&err,&len)<0)
-        throw ResolverException("Error connecting: "+stringerror()); // Solaris
-
-      if(err)
-        throw ResolverException("Error connecting: "+string(strerror(err)));
-
-    }
-  else
-    throw ResolverException("nonblocking connect failed");
-
+    if(getsockopt(d_sock, SOL_SOCKET,SO_ERROR,(char *)&err,&len)<0)
+      throw ResolverException("Error connecting: "+stringerror()); // Solaris
+
+    if(err)
+      throw ResolverException("Error connecting: "+string(strerror(err)));
+  }
+  
  done:
   Utility::setBlocking( d_sock );
@@ -316 +313 @@
     throw ResolverException("Error sending question to "+ip+": "+stringerror());
 
-  fd_set rd;
-  FD_ZERO(&rd);
-  FD_SET(d_sock, &rd);
-
-  struct timeval timeout;
-  timeout.tv_sec=10;
-  timeout.tv_usec=0;
-
-  int res=select(d_sock+1,&rd,0,0,&timeout);
+  int res = waitForData(d_sock, 10, 0);
+  
   if(!res)
     throw ResolverException("Timeout waiting for answer from "+ip+" during AXFR");
@@ -408 +398 @@
     if(!d_inaxfr) {
       if(mdp->d_header.qdcount!=1)
-        throw ResolverException("resolver: received answer with wrong number of questions ("+itoa(mdp->d_header.qdcount)+")");
+        throw ResolverException("resolver: received answer with wrong number of questions ("+itoa(mdp->d_header.qdcount)+")");
       
       if(mdp->d_qname != d_domain+".")
-        throw ResolverException(string("resolver: received an answer to another question (")+mdp->d_qname+"!="+d_domain+".)");
+        throw ResolverException(string("resolver: received an answer to another question (")+mdp->d_qname+"!="+d_domain+".)");
     }
     
@@ -419 +409 @@
       rr.qname = i->first.d_label;
       if(!rr.qname.empty())
-        erase_tail(rr.qname, 1); // strip .
+        boost::erase_tail(rr.qname, 1); // strip .
       rr.qtype = i->first.d_type;
       rr.ttl = i->first.d_ttl;
       rr.content = i->first.d_content->getZoneRepresentation();
+      rr.priority = 0;
       
       uint16_t qtype=rr.qtype.getCode();
 
       if(!rr.content.empty() && (qtype==QType::MX || qtype==QType::NS || qtype==QType::CNAME))
-        erase_tail(rr.content, 1);
+        boost::erase_tail(rr.content, 1);
 
       if(rr.qtype.getCode() == QType::MX) {
-        vector<string> parts;
-        stringtok(parts, rr.content);
-        rr.priority = atoi(parts[0].c_str());
-        if(parts.size() > 1)
-          rr.content=parts[1];
+        vector<string> parts;
+        stringtok(parts, rr.content);
+        rr.priority = atoi(parts[0].c_str());
+        if(parts.size() > 1)
+          rr.content=parts[1];
       } else if(rr.qtype.getCode() == QType::SRV) {
-        rr.priority = atoi(rr.content.c_str());
-        vector<pair<string::size_type, string::size_type> > fields;
-        vstringtok(fields, rr.content, " ");
-        if(fields.size()==4)
-          rr.content=string(rr.content.c_str() + fields[1].first, fields[3].second - fields[1].first);
+        rr.priority = atoi(rr.content.c_str());
+        vector<pair<string::size_type, string::size_type> > fields;
+        vstringtok(fields, rr.content, " ");
+        if(fields.size()==4)
+          rr.content=string(rr.content.c_str() + fields[1].first, fields[3].second - fields[1].first);
       }
       ret.push_back(rr);

tags/pdns-2-9-22-x/pdns/resolver.hh

@@ -58 +58 @@
   int notify(int sock, const string &domain, const string &ip, uint16_t id);
   int resolve(const string &ip, const char *domain, int type);
-  void sendResolve(const string &ip, const char *domain, int type);
+  uint16_t sendResolve(const string &ip, const char *domain, int type);
+  bool tryGetSOASerial(string* theirDomain, uint32_t* theirSerial, uint16_t* id);
 
   int receiveResolve(struct sockaddr* fromaddr, Utility::socklen_t addrlen);
-  char* sendReceive(const string &ip, uint16_t remotePort, const char *packet, int length, unsigned int *replylen);
+  
   void getSoaSerial(const string &, const string &, uint32_t *);
   int axfrChunk(Resolver::res_t &res);