make sdig compile again, slight change to mtasker which might make things compile...

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

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index ba4c11c10140e2d29d3522776a9f1e1d7e6afffe..08c4dafb881c8a0a5b275f1a3da44e2d0ae083ad 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -44,7 +44,7 @@ pdns_server_INCLUDES=
 
 sdig_SOURCES=sdig.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnswriter.hh \
        misc.cc misc.hh rcpgenerator.cc rcpgenerator.hh base64.cc base64.hh unix_utility.cc \
-       logger.cc statbag.cc
+       logger.cc statbag.cc qtype.cc
 
 dnspbench_SOURCES=dnspbench.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnswriter.hh \
        misc.cc misc.hh rcpgenerator.cc rcpgenerator.hh base64.cc base64.hh unix_utility.cc logger.cc \

diff --git a/pdns/docs/Makefile b/pdns/docs/Makefile
index 3b7ca4acb13995c69fe842beafeb8e81ef722d7a..b32e6957bb4e8771da00ca2d694a738dcc187c57 100644 (file)
--- a/pdns/docs/Makefile
+++ b/pdns/docs/Makefile
@@ -16,9 +16,11 @@ html.tar.gz: html/index.html
 
 %.txt: %-expanded.sgml
        docbook2txt $<
+       mv pdns-expanded.txt pdns.txt
 
 %.pdf: %-expanded.sgml
        docbook2pdf $<
+       mv pdns-expanded.pdf pdns.pdf
 
 publish:
        rsync --copy-links --delete -avrze ssh ./html pdns.txt pdns.pdf \

diff --git a/pdns/docs/pdns.sgml b/pdns/docs/pdns.sgml
index eeb18969dc55384b9931ce9cfcd0b87b4e5eb956..d27240ca5b25a1ddd9f215492f5e1b2a2b1440ca 100644 (file)
--- a/pdns/docs/pdns.sgml
+++ b/pdns/docs/pdns.sgml
@@ -132,10 +132,15 @@
          <itemizedlist>
            <listitem>
              <para>
-               Commits C540, C541, C542, C543, C545, C547 and C548, C574 all speed up the recursor by a large factor, 
+               Commits C535, C540, C541, C542, C543, C544, C545, C547 and C548, C574 all speed up the recursor by a large factor, 
                without altering the DNS algorithm.
              </para>
            </listitem>
+           <listitem>
+             <para>
+               Cache was pruned every minute, which was too often. Now once every 5 minutes, c574.
+             </para>
+           </listitem>
            <listitem>
              <para>
                c549 and c550 work around gcc bug <ulink url="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24704">24704</ulink>
@@ -152,6 +157,12 @@
                PowerDNS would no longer allow a '/' in domain names, fixed by c537, reported in t48.
              </para>
            </listitem>
+           <listitem>
+             <para>
+               Parameters to <command>pdns_control notify-host</command> were not checked, leading to
+               possible crashes. Reported in t24, fixed in c565.
+             </para>
+           </listitem>
            <listitem>
              <para>
                On some compilers, processing of NAPTR records could cause the server to crash. Reported by Bernd Froemel 
@@ -219,7 +230,13 @@
            </listitem>
            <listitem>
              <para>
-               <command>dnsscope</command> compiles again, c551, c564 (FreeBSD 64-bit time_t).
+               <command>dnsscope</command> compiles again, c551, c564 (FreeBSD 64-bit time_t). 
+             </para>
+           </listitem>
+           <listitem>
+             <para>
+               <command>dnsreplay_mindex</command> compiles again, fixed by c572. Its performance, and the performance of the recursor
+               was improved by c559.
              </para>
            </listitem>
            <listitem>

diff --git a/pdns/mtasker.cc b/pdns/mtasker.cc
index 06d5f21d0de0f4f838bc5f70dbcc532e14c64f69..16f719daddb0f2e92a087aae4f3b0dd8a90eff9f 100644 (file)
--- a/pdns/mtasker.cc
+++ b/pdns/mtasker.cc
@@ -282,8 +282,8 @@ template<class Key, class Val>bool MTasker<Key,Val>::schedule()
   if(!d_waiters.empty()) {
     time_t now=time(0);
 
-    typedef typename waiters_t::template nth_index<1>::type waiters_by_ttd_index_t;
-    waiters_by_ttd_index_t& ttdindex=d_waiters.get<1>();
+    typedef typename waiters_t::template index<KeyTag>::type waiters_by_ttd_index_t;
+    waiters_by_ttd_index_t& ttdindex=d_waiters.get<KeyTag>();
 
     for(typename waiters_by_ttd_index_t::iterator i=ttdindex.begin(); i != ttdindex.end(); ) {
       if(i->ttd && i->ttd < now) {

diff --git a/pdns/mtasker.hh b/pdns/mtasker.hh
index dbc899acd9791c5b5d342a72926ad66274e5a639..746ac4da8661444a6d26455df668eba314968e59 100644 (file)
--- a/pdns/mtasker.hh
+++ b/pdns/mtasker.hh
@@ -57,12 +57,12 @@ private:
   };
 
   //  typedef std::map<EventKey,Waiter> waiters_t;
-  
+  struct KeyTag {};
   typedef multi_index_container<
     Waiter,
     indexed_by <
                 ordered_unique<member<Waiter,EventKey,&Waiter::key> >,
-                ordered_non_unique<member<Waiter,time_t,&Waiter::ttd> >
+                ordered_non_unique<tag<KeyTag>, member<Waiter,time_t,&Waiter::ttd> >
                >
   > waiters_t;