Changeset 234

Timestamp:

02/08/04 11:43:50 (9 years ago)

Author:

ahu

Message:

dynlistener now cleans up after itself
does slightly better error messages
added --version-string
improved pdns_recursor stats logging

Location:

trunk/pdns/pdns

Files:

• common_startup.cc (modified) (2 diffs)
• docs/pdns.sgml (modified) (2 diffs)
• dynlistener.cc (modified) (4 diffs)
• dynlistener.hh (modified) (3 diffs)
• mtasker.cc (modified) (1 diff)
• mtasker.hh (modified) (1 diff)
• packethandler.cc (modified) (2 diffs)
• pdns_recursor.cc (modified) (1 diff)

trunk/pdns/pdns/common_startup.cc

@@ -58 +58 @@
   arg().setCmd("no-config","Don't parse configuration file");
   
+  arg().set("version-string","PowerDNS version in packets - full, anonymous, powerdns or custom")="full"; 
   arg().set("control-console","Debugging switch - don't use")="no"; // but I know you will!
   arg().set("fancy-records","Process URL and MBOXFW records")="no";
@@ -238 +239 @@
      newuid=Utility::makeUidNumeric(arg()["setuid"]); 
 #ifndef WIN32
+   gethostbyname("a.root-servers.net"); // this forces all lookup libraries to be loaded
    if(!arg()["chroot"].empty()) {  
      if(chroot(arg()["chroot"].c_str())<0) {

trunk/pdns/pdns/docs/pdns.sgml

@@ -12 +12 @@
     </author>
     
-    <PubDate>v2.1 $Date: 2004/02/01 18:20:16 $</PubDate>
+    <PubDate>v2.1 $Date: 2004/02/08 10:43:50 $</PubDate>
     
     <Abstract>
@@ -5440 +5440 @@
                 Where we send hosts to that need to be url redirected. See <xref linkend="fancy-records">.
               </para></listitem></varlistentry>
+          <varlistentry><term>version-string=anonymous|powerdns|full|custom</term>
+            <listitem><para>
+              When queried for its version over DNS (<command>dig chaos txt version.bind @pdns.ip.address</command>), PowerDNS normally
+              resonds truthfully. With this setting you can overrule what will be returned. Set the <command>version-string</command>
+              to 'full' to get the default behaviour, to 'powerdns' to just make it state 'served by PowerDNS - http://www.powerdns.com'. 
+              The 'anonymous' setting will return a ServFail, much like Microsoft nameservers do.  You can set this response
+              to a custom value as well.
+              </para></listitem></varlistentry>
+
           <varlistentry><term>webserver | --webserver=yes | --webserver=no</term>
             <listitem><para>

trunk/pdns/pdns/dynlistener.cc

@@ -17 +17 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-// $Id: dynlistener.cc,v 1.9 2004/02/01 18:20:16 ahu Exp $ 
+// $Id: dynlistener.cc,v 1.10 2004/02/08 10:43:50 ahu Exp $ 
 /* (C) Copyright 2002 PowerDNS.COM BV */
 #include <cstring>
@@ -53 +53 @@
 extern StatBag S;
 
+DynListener::~DynListener()
+{
+  if(!d_socketname.empty())
+    unlink(d_socketname.c_str());
+}
+
 DynListener::DynListener(const string &pname)
 {
   d_restfunc=0;
-  string programname=pname;
+  string programname(pname);
 
   if(!programname.empty()) {
@@ -82 +88 @@
     
     socketname+=programname+".controlsocket";
-    unlink(socketname.c_str());
+    int err=unlink(socketname.c_str());
+    if(err < 0 && errno!=ENOENT) {
+      L<<Logger::Critical<<"Unable to remove (previous) controlsocket: "<<strerror(errno)<<endl;
+      exit(1);
+    }
     memset(&local,0,sizeof(local));
     local.sun_family=AF_UNIX;
@@ -91 +101 @@
       exit(1);
     }
- 
+    d_socketname=socketname;
     if(!arg()["setgid"].empty()) {
       if(chown(socketname.c_str(),static_cast<uid_t>(-1),Utility::makeGidNumeric(arg()["setgid"]))<0)

trunk/pdns/pdns/dynlistener.hh

@@ -43 +43 @@
 public:
   DynListener(const string &pname="");
+  ~DynListener();
   void go();
   void theListener();
@@ -53 +54 @@
   void registerRestFunc(g_funk_t *gf);
 private:
+  DynListener(const DynListener &);
+  DynListener& operator=(const DynListener &); 
   void sendLine(const string &line);
   string getLine();
@@ -70 +73 @@
   pid_t d_ppid;
   
-
+  string d_socketname;
   g_funkdb_t d_funcdb;
   g_funk_t* d_restfunc;

trunk/pdns/pdns/mtasker.cc

@@ -284 +284 @@
 }
 
+//! returns the number of processes running
+/** Call this to perhaps limit activities if too many threads are running
+    \return number of processes running
+ */
+template<class Key, class Val>unsigned int MTasker<Key,Val>::numProcesses()
+{
+  return d_threads.size();
+}
+
+
 //! gives access to the list of Events threads are waiting for
 /** The kernel can call this to get a list of Events threads are waiting for. This is very useful

trunk/pdns/pdns/mtasker.hh

@@ -80 +80 @@
   bool schedule();
   bool noProcesses();
+  unsigned int numProcesses();
   int getTid(); 
 private:

trunk/pdns/pdns/packethandler.cc

@@ -155 +155 @@
 
   if (p->qclass == 3 && p->qtype.getName() == "HINFO") {
-    rr.content = "PowerDNS $Id: packethandler.cc,v 1.23 2004/02/01 18:20:16 ahu Exp $";
+    rr.content = "PowerDNS $Id: packethandler.cc,v 1.24 2004/02/08 10:43:50 ahu Exp $";
     rr.ttl = 5;
     rr.qname=target;
@@ -170 +170 @@
 {
   DNSResourceRecord rr;
+  
+  // modes: anonymous, powerdns only, full, spoofed
+  const string mode=arg()["version-string"];
   if(p->qtype.getCode()==QType::TXT && target=="version.bind") {// TXT
-    rr.content="Served by POWERDNS "VERSION" $Id: packethandler.cc,v 1.23 2004/02/01 18:20:16 ahu Exp $";
+    if(mode.empty() || mode=="full") 
+      rr.content="Served by POWERDNS "VERSION" $Id: packethandler.cc,v 1.24 2004/02/08 10:43:50 ahu Exp $";
+    else if(mode=="anonymous") {
+      r->setRcode(RCode::ServFail);
+      return 1;
+    }
+    else if(mode=="powerdns")
+      rr.content="Served by PowerDNS - http://www.powerdns.com";
+    else 
+      rr.content=mode;
+
     rr.ttl=5;
     rr.qname=target;

trunk/pdns/pdns/pdns_recursor.cc

@@ -338 +338 @@
     L<<Logger::Error<<", "<<(int)(SyncRes::s_throttledqueries*100.0/(SyncRes::s_outqueries+SyncRes::s_throttledqueries))<<"% throttled, "
      <<SyncRes::s_nodelegated<<" no-delegation drops"<<endl;
+    L<<Logger::Error<<"queries running: "<<MT->numProcesses()<<endl;
     
   }