From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Tue, 18 Apr 2006 13:07:17 +0000 (+0000)
Subject: remove sample code from kqueuemplexer, fix huge fd leak in pdns_recursor,
X-Git-Tag: rec-3-0~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a5e6212d6fa4e63cd73c075ca75844b73717529;p=pdns

remove sample code from kqueuemplexer, fix huge fd leak in pdns_recursor,
remove debugging output


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@724 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/kqueuemplexer.cc b/pdns/kqueuemplexer.cc
index 80b68094b..65f481f09 100644
--- a/pdns/kqueuemplexer.cc
+++ b/pdns/kqueuemplexer.cc
@@ -58,7 +58,6 @@ KqueueFDMultiplexer::KqueueFDMultiplexer() : d_kevents(new struct kevent[s_maxev
 
 void KqueueFDMultiplexer::addFD(callbackmap_t& cbmap, int fd, callbackfunc_t toDo, const boost::any& parameter)
 {
-  cerr<<"called\n";
   accountingAddFD(cbmap, fd, toDo, parameter);
 
   struct kevent kqevent;
@@ -119,6 +118,7 @@ int KqueueFDMultiplexer::run(struct timeval* now)
   return 0;
 }
 
+#if 0
 void acceptData(int fd, boost::any& parameter)
 {
   cout<<"Have data on fd "<<fd<<endl;
@@ -129,7 +129,6 @@ void acceptData(int fd, boost::any& parameter)
   cout<<"Received "<<packet.size()<<" bytes!\n";
 }
 
-#if 0
 int main()
 {
   Socket s(InterNetwork, Datagram);
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 2abed7b6e..70b5d700b 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1054,10 +1054,9 @@ void handleUDPServerResponse(int fd, boost::any& var)
 
   len=recvfrom(fd, data, sizeof(data), 0, (sockaddr *)&fromaddr, &addrlen);
 
-
   if(len < (int)sizeof(dnsheader)) {
     if(len < 0)
-      cerr<<"Error on fd "<<fd<<": "<<stringerror()<<"\n";
+      ; //       cerr<<"Error on fd "<<fd<<": "<<stringerror()<<"\n";
     else {
       g_stats.serverParseError++; 
       if(g_logCommonErrors)
@@ -1096,6 +1095,8 @@ void handleUDPServerResponse(int fd, boost::any& var)
 	}
       }
     }
+    else 
+      g_udpclientsocks.returnSocket(fd);
   }
   else
     L<<Logger::Warning<<"Ignoring question on outgoing socket from "<< sockAddrToString((struct sockaddr_in*) &fromaddr, addrlen)  <<endl;