Changeset 723

Timestamp:

04/18/06 14:49:46 (7 years ago)

Author:

ahu

Message:

fix duplicate return of sockets to the pool, improve tcp timeout message

Files:

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

trunk/pdns/pdns/pdns_recursor.cc

@@ -255 +255 @@
   void returnSocket(socks_t::iterator& i)
   {
+    if(i==d_socks.end()) {
+      throw AhuException("Trying to return a socket not in the pool");
+    }
     g_fdm->removeReadFD(i->first);
     ::close(i->first);
@@ -1044 +1047 @@
 void handleUDPServerResponse(int fd, boost::any& var)
 {
-  PacketID& pid=any_cast<PacketID&>(var);
+  PacketID pid=any_cast<PacketID>(var);
   int len;
   char data[1500];
@@ -1051 +1054 @@
 
   len=recvfrom(fd, data, sizeof(data), 0, (sockaddr *)&fromaddr, &addrlen);
-  g_udpclientsocks.returnSocket(fd);
+
 
   if(len < (int)sizeof(dnsheader)) {
@@ -1063 +1066 @@
     }
     string empty;
+    g_udpclientsocks.returnSocket(fd);
     MT->sendEvent(pid, &empty); // this denotes error
     return;
@@ -1097 +1101 @@
     L<<Logger::Warning<<"Ignoring question on outgoing socket from "<< sockAddrToString((struct sockaddr_in*) &fromaddr, addrlen)  <<endl;
 }
-
-#if 0
-// this code sweeps all running tcp connections for timeouts, it didn't survive move to multiplexer
-      vector<TCPConnection> sweeped;
-
-      for(vector<TCPConnection>::iterator i=g_tcpconnections.begin();i!=g_tcpconnections.end();++i) {
-        if(i->state==TCPConnection::DONE || g_now.tv_sec < i->startTime + tcpTimeout) {  // don't timeout when we are working on the question!
-          sweeped.push_back(*i);
-          if(i->state!=TCPConnection::DONE) { // we don't listen for data when we are processing the question
-            FD_SET(i->fd, &readfds);
-            fdmax=max(fdmax,i->fd);
-          }
-        }
-        else {
-          if(g_logCommonErrors)
-            L<<Logger::Error<<"TCP timeout from client "<<inet_ntoa(i->remote.sin_addr)<<endl;
-          i->closeAndCleanup();
-        }
-      }
-      sweeped.swap(g_tcpconnections);
-#endif
 
 FDMultiplexer* getMultiplexer()
@@ -1307 +1290 @@
           TCPConnection conn=any_cast<TCPConnection>(i->second);
           if(conn.state != TCPConnection::DONE) {
+            if(g_logCommonErrors)
+              L<<Logger::Warning<<"Timeout from remote TCP client "<<sockAddrToString(&conn.remote,sizeof(conn.remote))<<endl;
             g_fdm->removeReadFD(i->first);
             conn.closeAndCleanup();
@@ -1321 +1306 @@
       gettimeofday(&g_now, 0);
       g_fdm->run(&g_now);
-
 
       if(listenOnTCP) {