upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Use arc4random instead of random in tests (because it is

Browse source 
available, possibly as compat, anyway).


git-svn-id: file:///svn/unbound/trunk@3607 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2016-01-26 09:15:22 +00:00
parent cee936b715
commit 8ddad6fd67
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Changelog
View file

@ -1,5 +1,7 @@
26 January 2016: Wouter 26 January 2016: Wouter
- Fix #734: chown the pidfile if it resides inside the chroot. - 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 25 January 2016: Wouter
- Fix #738: Swig should not be invoked with CPPFLAGS. - Fix #738: Swig should not be invoked with CPPFLAGS.

5
testcode/delayer.c
View file

@ -1042,7 +1042,7 @@ service(const char* bind_str, int bindport, const char* serv_str,
} }
i=0; i=0;
if(bindport == 0) { if(bindport == 0) {
bindport = 1024 + random()%64000; bindport = 1024 + arc4random()%64000;
i = 100; i = 100;
} }
while(1) { while(1) {
@ -1058,7 +1058,7 @@ service(const char* bind_str, int bindport, const char* serv_str,
#endif #endif
if(i--==0) if(i--==0)
fatal_exit("cannot bind any port"); fatal_exit("cannot bind any port");
bindport = 1024 + random()%64000; bindport = 1024 + arc4random()%64000;
} else break; } else break;
} }
fd_set_nonblock(s); fd_set_nonblock(s);
@ -1138,7 +1138,6 @@ int main(int argc, char** argv)
verbosity = 0; verbosity = 0;
log_init(0, 0, 0); log_init(0, 0, 0);
log_ident_set("delayer"); log_ident_set("delayer");
srandom(time(NULL) ^ getpid());
if(argc == 1) usage(argv); if(argc == 1) usage(argv);
while( (c=getopt(argc, argv, "b:d:f:hm:p:")) != -1) { while( (c=getopt(argc, argv, "b:d:f:hm:p:")) != -1) {
switch(c) { switch(c) {

2
testcode/streamtcp.c
View file

@ -265,7 +265,7 @@ static int get_random(void)
if (RAND_bytes((unsigned char*)&r, (int)sizeof(r)) == 1) { if (RAND_bytes((unsigned char*)&r, (int)sizeof(r)) == 1) {
return r; return r;
} }
return (int)random(); return arc4random();
} }
/** send the TCP queries and print answers */ /** send the TCP queries and print answers */