Changeset 631 for trunk/pdns/pdns/pdns_recursor.cc

Timestamp:

03/27/06 00:16:00 (7 years ago)

Author:

ahu

Message:

trim some build dependencies, make rec_control/pdns_recursor grok /var/run as place for the controlsocket,
add tcp-questions in all the right places, add callback so 'rec_control quit' gets a response before the program quits

Files:

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

trunk/pdns/pdns/pdns_recursor.cc

@@ -32 +32 @@
 #include "mtasker.hh"
 #include <utility>
-#include "dnspacket.hh"
 #include "statbag.hh"
 #include "arguments.hh"
@@ -48 +47 @@
 #include "zoneparser-tng.hh"
 #include "rec_channel.hh"
+#include "logger.hh"
 
 using namespace boost;
@@ -375 +375 @@
 void makeControlChannelSocket()
 {
-  s_rcc.listen("pdns_recursor.controlsocket");
+  s_rcc.listen(::arg()["socket-dir"]+"/pdns_recursor.controlsocket");
 }
 
@@ -498 +498 @@
 #endif
 
-uint64_t counter, qcounter;
+uint64_t counter;
 bool statsWanted;
 
@@ -519 +519 @@
 void doStats(void)
 {
-  if(qcounter) {
-    L<<Logger::Error<<"stats: "<<qcounter<<" questions, "<<RC.size()<<" cache entries, "<<SyncRes::s_negcache.size()<<" negative entries, "
+  if(g_stats.qcounter) {
+    L<<Logger::Error<<"stats: "<<g_stats.qcounter<<" questions, "<<RC.size()<<" cache entries, "<<SyncRes::s_negcache.size()<<" negative entries, "
      <<(int)((RC.cacheHits*100.0)/(RC.cacheHits+RC.cacheMisses))<<"% cache hits"<<endl;
     L<<Logger::Error<<"stats: throttle map: "<<SyncRes::s_throttle.size()<<", ns speeds: "
@@ -834 +834 @@
         string msg=s_rcc.recv(&remote);
         RecursorControlParser rcp;
-        s_rcc.send(rcp.getAnswer(msg), &remote);
+        RecursorControlParser::func_t* command;
+        string answer=rcp.getAnswer(msg, &command);
+        s_rcc.send(answer, &remote);
+        command();
       }
 
@@ -877 +880 @@
               L<<Logger::Error<<"Ignoring answer on server socket!"<<endl;
             else {
-              ++qcounter;
+              ++g_stats.qcounter;
               dc->setSocket(*i);
               dc->d_tcp=false;
@@ -1027 +1030 @@
                 L<<Logger::Error<<"Ignoring answer on server socket!"<<endl;
               else {
-                ++qcounter;
+                ++g_stats.qcounter;
+                ++g_stats.tcpqcounter;
                 MT->makeThread(startDoResolve, dc, "tcp");
               }