Changeset 1256

Timestamp:

08/08/08 15:54:36 (19 months ago)

Author:

ahu

Message:

hook up dns urandom for auth server too

Location:

trunk/pdns/pdns

Files:

• Makefile.am (modified) (4 diffs)
• common_startup.cc (modified) (1 diff)
• misc.hh (modified) (1 diff)
• pdns_recursor.cc (modified) (2 diffs)
• randomhelper.cc (added)
• receiver.cc (modified) (1 diff)

trunk/pdns/pdns/Makefile.am

@@ -1 @@
-AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@
+AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ # -I/usr/include/lua5.1
 AM_CPPFLAGS=-Ibackends/bind @THREADFLAGS@
 
@@ -41 +41 @@
 rcpgenerator.cc dnsparser.cc dns_random.hh aes/aescpp.h \
 aes/aescrypt.c aes/aes.h aes/aeskey.c aes/aes_modes.c aes/aesopt.h \
-aes/aestab.c aes/aestab.h aes/brg_endian.h aes/brg_types.h aes/dns_random.cc
+aes/aestab.c aes/aestab.h aes/brg_endian.h aes/brg_types.h aes/dns_random.cc \
+randomhelper.cc
 
 #
@@ -121 +122 @@
 base64.cc base64.hh zoneparser-tng.cc zoneparser-tng.hh rec_channel.cc rec_channel.hh \
 rec_channel_rec.cc selectmplexer.cc epollmplexer.cc sillyrecords.cc htimer.cc htimer.hh \
-aes/dns_random.cc aes/aescrypt.c aes/aeskey.c aes/aestab.c aes/aes_modes.c
+aes/dns_random.cc aes/aescrypt.c aes/aeskey.c aes/aestab.c aes/aes_modes.c \
+lua-pdns-recursor.cc lua-pdns-recursor.hh randomhelper.cc
 
 if NEDMALLOC
@@ -129 +131 @@
 #../modules/gmysqlbackend/smysql.cc 
 
-pdns_recursor_LDFLAGS=
+pdns_recursor_LDFLAGS=  # -llua5.1 
 pdns_recursor_LDADD=
 

trunk/pdns/pdns/common_startup.cc

@@ -126 +126 @@
 
   ::arg().set("max-cache-entries", "Maximum number of cache entries")="1000000";
+  ::arg().set("entropy-source", "If set, read entropy from this file")="/dev/urandom";
 }
 

trunk/pdns/pdns/misc.hh

@@ -384 +384 @@
 
 string stripDot(const string& dom);
-
+void seedRandom(const string& source);
 #endif

trunk/pdns/pdns/pdns_recursor.cc

@@ -1656 +1656 @@
 }
 
-void seedRandom(const string& source);
+
 
 int serviceMain(int argc, char*argv[])
@@ -1911 +1911 @@
 #endif
 
-void seedRandom(const string& source)
-{
-  L<<Logger::Warning<<"Reading random entropy from '"<<source<<"'"<<endl;
-
-  int fd=open(source.c_str(), O_RDONLY);
-  if(fd < 0) {
-    L<<Logger::Error<<"Unable to open source of random '"<<source<<"': "<<stringerror()<<endl;
-    exit(EXIT_FAILURE);
-  }
-  char seed[16];
-  int ret;
-  int pos=0;
-  while(pos!=sizeof(seed)) {
-    ret = read(fd, seed+pos, sizeof(seed)-pos);
-    if(ret < 0) { 
-      L<<Logger::Error<<"Unable to read random seed from "<<source<<": "<<stringerror()<<endl;
-      close(fd);
-      exit(EXIT_FAILURE);
-    }
-    if(!ret) {
-      L<<Logger::Error<<"Unable to read random seed from "<<source<<": end of file"<<endl;
-      close(fd);
-      exit(EXIT_FAILURE);
-    }
-    pos+=ret;
-  }
-  close(fd);
-  dns_random_init(seed);
-}
 
 int main(int argc, char **argv) 

trunk/pdns/pdns/receiver.cc

@@ -459 +459 @@
     // we really need to do work - either standalone or as an instance
     
+    seedRandom(::arg()["entropy-source"]);
+    
     loadModules();
     BackendMakers().launch(::arg()["launch"]); // vrooooom!