Changeset 987

Timestamp:

03/24/07 22:34:32 (6 years ago)

Author:

ahu

Message:

fix one source of crashes and deadlocks in the BIND backend

Location:

trunk/pdns/pdns

Files:

• backends/bind/bindbackend2.cc (modified) (6 diffs)
• backends/bind/bindbackend2.hh (modified) (1 diff)
• distributor.hh (modified) (3 diffs)
• utility.hh (modified) (1 diff)

trunk/pdns/pdns/backends/bind/bindbackend2.cc

@@ -384 +384 @@
 string Bind2Backend::DLReloadNowHandler(const vector<string>&parts, Utility::pid_t ppid)
 {
+  shared_ptr<State> state = s_state;
   ostringstream ret;
 
   for(vector<string>::const_iterator i=parts.begin()+1;i<parts.end();++i) {
-    if(s_state->name_id_map.count(*i)) {
-      shared_ptr<State> state=s_state;
+    if(state->name_id_map.count(*i)) {
       BB2DomainInfo& bbd=state->id_zone_map[state->name_id_map[*i]];
       
@@ -406 +406 @@
 {
   ostringstream ret;
+  shared_ptr<State> state = s_state;;
+      
   if(parts.size() > 1) {
     for(vector<string>::const_iterator i=parts.begin()+1;i<parts.end();++i) {
-      shared_ptr<State> state = s_state;;
       if(state->name_id_map.count(*i)) {
         BB2DomainInfo& bbd=state->id_zone_map[state->name_id_map[*i]];  // XXX s_name_id_map needs trick as well
@@ -418 +419 @@
   }
   else
-    for(id_zone_map_t::iterator i=us->s_state->id_zone_map.begin(); i!=us->s_state->id_zone_map.end(); ++i) 
+    for(id_zone_map_t::iterator i=state->id_zone_map.begin(); i!=state->id_zone_map.end(); ++i) 
       ret<< i->second.d_name << ": "<< (i->second.d_loaded ? "": "[rejected]") <<"\t"<<i->second.d_status<<"\n";      
 
@@ -430 +431 @@
 string Bind2Backend::DLListRejectsHandler(const vector<string>&parts, Utility::pid_t ppid)
 {
+  shared_ptr<State> state = s_state;
+
   ostringstream ret;
-  for(id_zone_map_t::iterator j=us->s_state->id_zone_map.begin(); j!=us->s_state->id_zone_map.end(); ++j) 
+  for(id_zone_map_t::iterator j = state->id_zone_map.begin(); j != state->id_zone_map.end(); ++j) 
     if(!j->second.d_loaded)
       ret<<j->second.d_name<<"\t"<<j->second.d_status<<endl;
@@ -487 +490 @@
       throw;
     }
-
-
       
     vector<BindDomainInfo> domains=BP.getDomains();
@@ -646 +647 @@
 {
   bbd->d_loaded=0; // block further access
-  bbd->d_records->clear(); // empty the vector of Bind2DNSRecords
+  bbd->d_records = shared_ptr<vector<Bind2DNSRecord> > (new vector<Bind2DNSRecord>);
 }
 

trunk/pdns/pdns/backends/bind/bindbackend2.hh

@@ -112 +112 @@
   bool abortTransaction();
 
+  typedef map<string, int> name_id_map_t;
   typedef map<uint32_t, BB2DomainInfo> id_zone_map_t;
-  typedef map<string,int> name_id_map_t;
 
   struct State 

trunk/pdns/pdns/distributor.hh

@@ -80 +80 @@
   }
 
-
-
-
   struct QuestionData
   {
@@ -91 +88 @@
   };
 
-
   typedef pair<QuestionData, AnswerData> tuple_t;
   
@@ -179 +175 @@
       pthread_mutex_unlock(&us->q_lock);
       Answer *a;      
-
 
 #ifndef SMTPREDIR

trunk/pdns/pdns/utility.hh

@@ -118 +118 @@
   //! Retrieves the semaphore value.
   int getValue( Semaphore::sem_value_t *sval );
-
 };