From 8ddad6fd674674971ef4b5c57799193dc4cd3e9e Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Tue, 26 Jan 2016 09:15:22 +0000 Subject: [PATCH] - Use arc4random instead of random in tests (because it is available, possibly as compat, anyway). git-svn-id: file:///svn/unbound/trunk@3607 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 2 ++ testcode/delayer.c | 5 ++--- testcode/streamtcp.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 78d68fd00..1c8221018 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,5 +1,7 @@ 26 January 2016: Wouter - Fix #734: chown the pidfile if it resides inside the chroot. + - Use arc4random instead of random in tests (because it is + available, possibly as compat, anyway). 25 January 2016: Wouter - Fix #738: Swig should not be invoked with CPPFLAGS. diff --git a/testcode/delayer.c b/testcode/delayer.c index 050cbd23e..5489b591e 100644 --- a/testcode/delayer.c +++ b/testcode/delayer.c @@ -1042,7 +1042,7 @@ service(const char* bind_str, int bindport, const char* serv_str, } i=0; if(bindport == 0) { - bindport = 1024 + random()%64000; + bindport = 1024 + arc4random()%64000; i = 100; } while(1) { @@ -1058,7 +1058,7 @@ service(const char* bind_str, int bindport, const char* serv_str, #endif if(i--==0) fatal_exit("cannot bind any port"); - bindport = 1024 + random()%64000; + bindport = 1024 + arc4random()%64000; } else break; } fd_set_nonblock(s); @@ -1138,7 +1138,6 @@ int main(int argc, char** argv) verbosity = 0; log_init(0, 0, 0); log_ident_set("delayer"); - srandom(time(NULL) ^ getpid()); if(argc == 1) usage(argv); while( (c=getopt(argc, argv, "b:d:f:hm:p:")) != -1) { switch(c) { diff --git a/testcode/streamtcp.c b/testcode/streamtcp.c index c5919428a..b78506beb 100644 --- a/testcode/streamtcp.c +++ b/testcode/streamtcp.c @@ -265,7 +265,7 @@ static int get_random(void) if (RAND_bytes((unsigned char*)&r, (int)sizeof(r)) == 1) { return r; } - return (int)random(); + return arc4random(); } /** send the TCP queries and print answers */ -- 2.47.2