Changeset 1455

Timestamp:

12/21/09 14:33:48 (3 years ago)

Author:

ahu

Message:

bring rcpgenerator into the world of namespaces.hh, plus remove some debugging form slavecommunicator.cc

Location:

trunk/pdns/pdns

Files:

• rcpgenerator.cc (modified) (2 diffs)
• slavecommunicator.cc (modified) (3 diffs)

trunk/pdns/pdns/rcpgenerator.cc

@@ -24 +24 @@
 #include <iostream>
 #include "base64.hh"
-using namespace boost;
+#include "namespaces.hh"
 
 RecordTextReader::RecordTextReader(const string& str, const string& zone) : d_string(str), d_zone(zone), d_pos(0), d_end(str.size())
@@ -78 +78 @@
   tm.tm_year-=1900;
   tm.tm_mon-=1;
-  
   val=(uint32_t)timegm(&tm);
 }

trunk/pdns/pdns/slavecommunicator.cc

@@ -151 +151 @@
   {
     d_serials[i.id]=serial;
-    //cerr<<"Got a serial of "<<serial<<" for "<<i.zone<<endl;
   }
   
@@ -193 +192 @@
   }
   L<<Logger::Warning<<"Received serial number updates for "<<ssr.d_serials.size()<<" zones"<<endl;
-  int suckRequests=0;
+
   BOOST_FOREACH(DomainInfo& di, sdomains) {
     if(!ssr.d_serials.count(di.id)) 
@@ -210 +209 @@
       L<<Logger::Warning<<"Domain "<< di.zone<<" is stale, master serial "<<theirserial<<", our serial "<< ourserial <<endl;
       addSuckRequest(di.zone, *di.masters.begin());
-      suckRequests++;
-    }
-  }
-  L<<Logger::Warning<<"Attempted "<<suckRequests<<" zone transfers"<<endl;
+    }
+  }
 }