Ticket #304: patch-also-notify-20100610.diff

pdns/backends/bind/bindbackend2.cc

@@ -228 +228 @@
   shared_ptr<State> state = s_state;
 
   for(id_zone_map_t::const_iterator i = state->id_zone_map.begin(); i != state->id_zone_map.end() ; ++i) {
-    if(!i->second.d_masters.empty())
+    if(!i->second.d_masters.empty() && this->alsoNotify.empty() && i->second.d_also_notify.empty())
       continue;
     soadata.serial=0;
     try {
@@ -307 +307 @@
   return false;
 }
 
+void Bind2Backend::alsoNotifies(const string &domain, set<string> *ips)
+{
+  shared_ptr<State> state = s_state;
+  // combine global list with local list
+  for(set<string>::iterator i = this->alsoNotify.begin(); i != this->alsoNotify.end(); i++) {
+    (*ips).insert(*i);
+  }
+  for(id_zone_map_t::const_iterator i = state->id_zone_map.begin(); i != state->id_zone_map.end() ; ++i) {
+    if(i->second.d_name==domain) {
+      for(set<string>::iterator it = i->second.d_also_notify.begin(); it != i->second.d_also_notify.end(); it++) {
+        (*ips).insert(*it);
+      }
+      return;
+    }
+  }   
+}
 
 //! lowercase, strip trailing .
 static string canonic(string ret)
@@ -512 +528 @@
     }
       
     vector<BindDomainInfo> domains=BP.getDomains();
-    
+    this->alsoNotify = BP.getAlsoNotify();
+
     s_binddirectory=BP.getDirectory();
     //    ZP.setDirectory(d_binddirectory);
 
@@ -567 +584 @@
         bbd->d_name=i->name;
         bbd->d_filename=i->filename;
         bbd->d_masters=i->masters;
+        bbd->d_also_notify=i->alsoNotify;
         
         if(!bbd->d_loaded || !bbd->current()) {
           //      L<<Logger::Info<<d_logprefix<<" parsing '"<<i->name<<"' from file '"<<i->filename<<"'"<<endl;

pdns/backends/bind/bindbackend2.hh

@@ -84 +84 @@
   unsigned int d_id;  //!< internal id of the domain
   time_t d_lastcheck; //!< last time domain was checked for freshness
   vector<string> d_masters;     //!< IP address of the master of this domain
+  set<string> d_also_notify; //!< IP list of hosts to also notify
 
   uint32_t d_lastnotified; //!< Last serial number we notified our slaves of
 
@@ -121 +122 @@
   bool commitTransaction();
   bool abortTransaction();
 
+  void alsoNotifies(const string &domain, set<string> *ips);
+
   typedef map<string, int, CIStringCompare> name_id_map_t;
   typedef map<uint32_t, BB2DomainInfo> id_zone_map_t;
 
@@ -184 +187 @@
   static string s_binddirectory;                              //!< this is used to store the 'directory' setting of the bind configuration
   string d_logprefix;
 
+  set<string> alsoNotify; //!< this is used to store the also-notify list of interested peers.
+
   int d_transaction_id;
   string d_transaction_tmpname;
 

pdns/backends/bind/bindlexer.l

@@ -109 +109 @@
 
 file                    return FILETOK;
 options                 return OPTIONSTOK;
+also-notify             return ALSONOTIFYTOK;
 acl                     return ACLTOK;
 logging                 return LOGGINGTOK;
 directory               return DIRECTORYTOK;

pdns/backends/bind/bindparser.yy

@@ -72 +72 @@
         bind_directory=d_dir.c_str();
 }
 
+void BindParser::addAlsoNotify(const string & host)
+{
+        alsoNotify.insert(host);
+}
+
 const string &BindParser::getDirectory()
 {
         return d_dir;
@@ -101 +106 @@
 %}
 
 %token AWORD QUOTEDWORD OBRACE EBRACE SEMICOLON ZONETOK FILETOK OPTIONSTOK
-%token DIRECTORYTOK ACLTOK LOGGINGTOK CLASSTOK TYPETOK MASTERTOK
+%token DIRECTORYTOK ACLTOK LOGGINGTOK CLASSTOK TYPETOK MASTERTOK ALSONOTIFYTOK
 
 %%
 
@@ -147 +152 @@
         LOGGINGTOK OBRACE options_commands EBRACE
         ;
 
+
 acl_command:
         ACLTOK quotedname acl_block |   ACLTOK filename acl_block
         ;
@@ -168 +174 @@
         options_command SEMICOLON options_commands
         ;
 
-options_command: command | options_directory_command
+options_command: command | options_directory_command | also_notify_command
         ;
 
 options_directory_command: DIRECTORYTOK quotedname
@@ -178 +184 @@
         }
         ;
 
+also_notify_command: ALSONOTIFYTOK OBRACE also_notify_list EBRACE 
+        ;
+
+also_notify_list: 
+        |
+        also_notify SEMICOLON also_notify_list
+        ;
 
+also_notify: AWORD
+        {
+                parent->addAlsoNotify($1);
+                free($1);
+        }
+        ;
 terms: /* empty */
         |
         terms term
@@ -199 +218 @@
         zone_commands zone_command SEMICOLON
         ;
 
-zone_command: command | zone_file_command | zone_type_command | zone_masters_command
+zone_command: command | zone_file_command | zone_type_command | zone_masters_command | zone_also_notify_command
         ;
 
 zone_masters_command: MASTERTOK OBRACE masters EBRACE
         ;
 
+zone_also_notify_command: ALSONOTIFYTOK OBRACE zone_also_notify_list EBRACE
+        ;
+
+zone_also_notify_list:
+        |
+        zone_also_notify SEMICOLON zone_also_notify_list
+        ;
+
+zone_also_notify: AWORD
+        {
+                s_di.alsoNotify.insert($1);
+                free($1);
+        }
+        ;
+
 masters: /* empty */
         | 
         masters master SEMICOLON 
@@ -243 +277 @@
         ;
 
 filename: AWORD
-        ;
- No newline at end of file
+        ;

pdns/backends/bind/bindparser.hh

@@ -21 +21 @@
 #include <string>
 #include <map>
 #include <vector>
+#include <set>
 
 using namespace std;
 
@@ -34 +35 @@
   {
     name=filename=type="";
     masters.clear();
+    alsoNotify.clear();
     d_dev=0;
     d_ino=0;
   }
@@ -41 +43 @@
   string viewName;
   string filename;
   vector<string> masters;
+  set<string> alsoNotify;
   string type;
     
   dev_t d_dev;
@@ -78 +81 @@
   const string &getDirectory();
   const vector<BindDomainInfo>& getDomains();
   void setVerbose(bool verbose);
+  void addAlsoNotify(const string &host);
+  set<string> & getAlsoNotify() { return this->alsoNotify; } 
 private:
   string d_dir;
   bool d_verbose;
   typedef map<string,string> zonedomain_t;
-
+  set<string> alsoNotify;
   vector<BindDomainInfo> d_zonedomains;
 };
 

pdns/ueberbackend.cc

@@ -284 +284 @@
   PC.insert(q.qname, q.qtype, PacketCache::QUERYCACHE, rr.serialize(), queryttl, q.zoneId);
 }
 
+void UeberBackend::alsoNotifies(const string &domain, set<string> *ips)
+{
+  for ( vector< DNSBackend * >::iterator i = backends.begin(); i != backends.end(); ++i )
+    (*i)->alsoNotifies(domain,ips);
+}
 
 UeberBackend::~UeberBackend()
 {

pdns/ueberbackend.hh

@@ -124 +124 @@
   void getUnfreshSlaveInfos(vector<DomainInfo>* domains);
   void getUpdatedMasters(vector<DomainInfo>* domains);
   bool getDomainInfo(const string &domain, DomainInfo &di);
+  void alsoNotifies(const string &domain, set<string> *ips); 
   void rediscover(string* status=0);
   void reload();
 private:

pdns/common_startup.cc

@@ -80 +80 @@
   ::arg().set("launch","Which backends to launch and order to query them in")="";
   ::arg().setSwitch("disable-axfr","Disable zonetransfers but do allow TCP queries")="no";
   ::arg().set("allow-axfr-ips","Allow zonetransfers only to these subnets")="0.0.0.0/0";
+  ::arg().set("also-notify","Global setting for also-notify domains")="";
   ::arg().set("slave-cycle-interval","Reschedule failed SOA serial checks once every .. seconds")="60";
 
   ::arg().set("tcp-control-address","If set, PowerDNS can be controlled over TCP on this address")="";

pdns/communicator.cc

@@ -163 +163 @@
     for(vector<string>::const_iterator k=nsips.begin();k!=nsips.end();++k)
       ips.insert(*k);
   }
-  
+ 
+  // inject also-notify from backends and global config
+
+  set<string>alsoNotify;
+  B->alsoNotifies(domain, &alsoNotify);
+
+  for(vector<string>::const_iterator k=d_an.begin();k!=d_an.end();k++)
+     alsoNotify.insert(*k);
+
+  for(set<string>::const_iterator k=alsoNotify.begin();k!=alsoNotify.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)
@@ -425 +428 @@
     signal(SIGPIPE,SIG_IGN);
 #endif // WIN32
     L<<Logger::Error<<"Master/slave communicator launching"<<endl;
+   
+    // parse d_an
+    if (!::arg()["also-notify"].empty()) {
+            vector<string> parts;
+            stringtok( parts, ::arg()["also-notify"], ", \t" ); 
+            for( vector<string>::const_iterator i = parts.begin(); i != parts.end(); ++i ) 
+              d_an.push_back( *i ); // add to also-notify list
+    }
+
     PacketHandler P;
     d_tickinterval=::arg().asNum("slave-cycle-interval");
     makeNotifySocket();

pdns/communicator.hh

@@ -165 +165 @@
   Semaphore d_any_sem;
   time_t d_tickinterval;
   NotificationQueue d_nq;
+  vector<string> d_an; // also notify list 
   bool d_masterschanged, d_slaveschanged;
 };