Changeset 1640

Timestamp:

06/18/10 20:57:02 (3 years ago)

Author:

ahu

Message:

perform better accounting of TCP client numbers on DNS errors - spotted by Simon Bedford and Laurent Papier.

Files:

• trunk/pdns/pdns/pdns_recursor.cc (modified) (4 diffs)

trunk/pdns/pdns/pdns_recursor.cc

@@ -595 +595 @@
         // no need to remove us from FDM, we weren't there
         TCPConnection::closeAndCleanup(dc->d_socket, dc->d_remote);
+        dc->d_socket = -1;
       }
       else {
@@ -632 +633 @@
 
     delete dc;
+    dc=0;
   }
   catch(AhuException &ae) {
     L<<Logger::Error<<"startDoResolve problem: "<<ae.reason<<endl;
+    if(dc && dc->d_tcp && dc->d_socket >= 0) 
+      TCPConnection::closeAndCleanup(dc->d_socket, dc->d_remote);
+    delete dc;
   }
   catch(MOADNSException& e) {
+    if(dc && dc->d_tcp && dc->d_socket >= 0) 
+      TCPConnection::closeAndCleanup(dc->d_socket, dc->d_remote);
+      
     L<<Logger::Error<<"DNS parser error: "<<dc->d_mdp.d_qname<<", "<<e.what()<<endl;
+    delete dc;
   }
   catch(std::exception& e) {
     L<<Logger::Error<<"STL error: "<<e.what()<<endl;
+    if(dc && dc->d_tcp && dc->d_socket >= 0) 
+      TCPConnection::closeAndCleanup(dc->d_socket, dc->d_remote);
+    delete dc;
   }
   catch(...) {
@@ -1524 +1536 @@
     vector<string> ips;
     stringtok(ips, ::arg()["allow-from"], ", ");
+    
     L<<Logger::Warning<<"Only allowing queries from: ";
     for(vector<string>::const_iterator i = ips.begin(); i!= ips.end(); ++i) {
@@ -1593 +1606 @@
     ips.push_back("0.0.0.0");
     ips.push_back("::");
+
     L<<Logger::Warning<<"Will not send queries to: ";
     for(vector<string>::const_iterator i = ips.begin(); i!= ips.end(); ++i) {