Changeset 174 for trunk/pdns/pdns/communicator.cc

Timestamp:

06/21/03 11:59:08 (10 years ago)

Author:

ahu

Message:

lots of changes, mostly a crash fix

Files:

• trunk/pdns/pdns/communicator.cc (modified) (6 diffs)

trunk/pdns/pdns/communicator.cc

@@ -17 +17 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+
 #include "utility.hh"
 #include <errno.h>
@@ -32 +33 @@
 
 
-void CommunicatorClass::addSuckRequest(const string &domain, const string &master)
+void CommunicatorClass::addSuckRequest(const string &domain, const string &master, bool priority)
 {
   Lock l(&d_lock);
@@ -40 +41 @@
   sr.master = master;
 
-  d_suckdomains.push(sr);
+  if(priority) {
+    d_suckdomains.push_front(sr);
+    d_havepriosuckrequest=true;
+  }
+  else 
+    d_suckdomains.push_back(sr);
   
   d_suck_sem.post();
@@ -234 +240 @@
       (sdomains.size()>1 ? "" : "s")<<
       " checking"<<endl;
-  
+
+  Resolver resolver;
+  resolver.makeUDPSocket();
   for(vector<DomainInfo>::const_iterator i=sdomains.begin();i!=sdomains.end();++i) {
     d_slaveschanged=true;
@@ -240 +248 @@
 
     try {
-      Resolver resolver;
-      int res=resolver.getSoaSerial(i->master,i->zone, &theirserial);
+      if(d_havepriosuckrequest) {
+        d_havepriosuckrequest=false;
+        break;
+      }
+
+      resolver.sendSoaSerialRequest(i->master,i->zone);
+      string master, zone;
+      int res=resolver.getSoaSerialAnswer(master,zone,&theirserial);
+
       if(res<=0) {
         L<<Logger::Error<<"Unable to determine SOA serial for "<<i->zone<<" at "<<i->master<<endl;
@@ -427 +442 @@
               Lock l(&d_lock);
               sr=d_suckdomains.front();
-              d_suckdomains.pop();
+              d_suckdomains.pop_front();
             }
             suck(sr.domain,sr.master);