hook up MOADNSParser to the main PowerDNS Auth server - not used a lot though

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

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 0fc7db4d3797e45d124f9abc353accb3a58d3f5e..0b9d1e6d19f5f0144b2a4f1e7c6edca1dbb8e8c0 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -19,7 +19,7 @@ bin_PROGRAMS = pdns_control
 endif
 
 
-EXTRA_PROGRAMS=pdns_recursor sdig dnspbench pdns_control qgen dnsscope dnsgram dnsreplay_mindex dnswasher dnsreplay dnsscan dnslog
+EXTRA_PROGRAMS=pdns_recursor sdig dnspbench pdns_control qgen dnsscope dnsgram dnsdemog dnsreplay_mindex dnswasher dnsreplay dnsscan dnslog
 
 pdns_server_SOURCES=dnspacket.cc nameserver.cc tcpreceiver.hh \
 qtype.cc logger.cc arguments.cc packethandler.cc tcpreceiver.cc \
@@ -32,12 +32,13 @@ dynlistener.cc dynlistener.hh  dynhandler.cc dynhandler.hh  \
 resolver.hh resolver.cc communicator.cc communicator.hh dnsproxy.cc \
 dnsproxy.hh randombackend.cc unix_utility.cc common_startup.cc \
 utility.hh iputils.hh common_startup.hh unix_semaphore.cc \
-backends/bind/bindbackend2.cc backends/bind/zoneparser2.cc \
+backends/bind/bindbackend2.cc  \
 backends/bind/bindparser.cc backends/bind/bindlexer.c \
 backends/bind/huffman.cc backends/gsql/gsqlbackend.cc \
 backends/gsql/gsqlbackend.hh backends/gsql/ssql.hh \
-sillyrecords.cc backends/bind/bindbackend.cc base64.cc \
-base64.hh
+sillyrecords.cc base64.cc \
+base64.hh zoneparser-tng.cc dnsrecords.cc dnswriter.cc \
+rcpgenerator.cc         dnsparser.cc
 
 #
 pdns_server_LDFLAGS= @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@
@@ -102,6 +103,12 @@ dnsgram_SOURCES=dnsgram.cc misc.cc unix_utility.cc qtype.cc \
        utility.hh dnsparser.hh
 
 
+dnsdemog_SOURCES=dnsdemog.cc misc.cc unix_utility.cc qtype.cc \
+       logger.cc statbag.cc  dnspcap.cc dnspcap.hh dnsparser.cc dnsrecords.cc \
+       base64.cc base64.hh dnswriter.cc dnswriter.hh rcpgenerator.cc rcpgenerator.hh \
+       utility.hh dnsparser.hh
+
+
 
 
 # INCLUDES=-I/usr/include/mysql

diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index 83a9775154b152a624b9e4664e505584bf7c479b..b40e3c0c161ecedc3c1d1914e3afd32d06eafb78 100644 (file)
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -60,6 +60,7 @@
 #include "dnsproxy.hh"
 #include "utility.hh"
 #include "common_startup.hh"
+#include "dnsrecords.hh"
 
 time_t s_starttime;
 
@@ -386,6 +387,8 @@ static void tbhandler(int num)
 //! The main function of pdns, the pdns process
 int main(int argc, char **argv)
 { 
+  reportAllTypes(); // init MOADNSParser
+
   s_programname="pdns";
   s_starttime=time(0);