Changeset 1028

Timestamp:

04/14/07 14:53:28 (1 year ago)

Author:

ahu

Message:

recursor compile fixes, plus make dnswasher a bit more helpful

Files:

• trunk/pdns/pdns/Makefile-recursor (modified) (1 diff)
• trunk/pdns/pdns/dist-recursor (modified) (1 diff)
• trunk/pdns/pdns/dnswasher.cc (modified) (1 diff)
• trunk/pdns/pdns/pdns_recursor.cc (modified) (1 diff)
• trunk/pdns/pdns/rec_control.cc (modified) (1 diff)

trunk/pdns/pdns/Makefile-recursor

@@ -14 +14 @@
-arguments.o lwres.o pdns_recursor.o recursor_cache.o dnsparser.o \
-dnswriter.o dnsrecords.o rcpgenerator.o base64.o zoneparser-tng.o \
-
+ sillyrecords.o
-
-REC_CONTROL_OBJECTS=rec_channel.o rec_control.o arguments.o 

trunk/pdns/pdns/dist-recursor

@@ -14 +14 @@
-selectmplexer.cc epollmplexer.cc kqueuemplexer.cc portsmplexer.cc pdns_hw.cc \
-win32_mtasker.cc win32_rec_channel.cc win32_logger.cc ntservice.cc \
-
+ sillyrecords.cc
-
-cd docs

trunk/pdns/pdns/dnswasher.cc

@@ -47 +47 @@
-try
-{
+  if(argc!=3) {
+    cerr<<"Syntax: dnswasher infile outfile\n";
+    exit(1);
+  }
-  PcapPacketReader pr(argv[1]);
-  PcapPacketWriter pw(argv[2], pr);

trunk/pdns/pdns/pdns_recursor.cc

@@ -813 +813 @@
-  return tmp;
-}
-
-#include <sys/syscall.h>
-#include <unistd.h>
-#include <asm/unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#if 0
-extern "C" {
-ssize_t recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen)
-{
-#ifdef __NR_socketcall
-        return syscall(__NR_socketcall, 12, &s);
-#else
-        return syscall(__NR_recvfrom, s, buf, len, flags, from, fromlen);
-#endif
-}
-}
-#endif
-
-void handleNewUDPQuestion(int fd, boost::any& var)

trunk/pdns/pdns/rec_control.cc

@@ -20 +20 @@
-#include "ahuexception.hh"
-#include "arguments.hh"
+#include "config.h"
-
-using namespace std;