Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-09 01:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Deprecate bro_prng(), replace with zeek::prng()

Browse source 
The type used for storing the state of the RNG is changed from
`unsigned int` to `long int` since the former has a minimal range
of [0, 65,535] while the RNG function itself has a range of
[1, 2147483646].  A `long int` must be capable of
[−2147483647, +2147483647] and is also the return type of `random()`,
which is what zeek::prng() aims to roughly parity.
This commit is contained in:
Jon Siwek 2020-07-22 09:13:34 -07:00
parent 887b53b7f3
commit 6bbb0a6b48
3 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/util.cc
View file

@ -1066,7 +1066,7 @@ static bool write_random_seeds(const char* write_file, uint32_t seed,
}
static bool bro_rand_determistic = false;
static unsigned int bro_rand_state = 0;
static long int bro_rand_state = 0;
static bool first_seed_saved = false;
static unsigned int first_seed = 0;
@ -1183,10 +1183,12 @@ bool have_random_seed()
return bro_rand_determistic;
}
unsigned int bro_prng(unsigned int state)
long int zeek::prng(long int state)
{
// Use our own simple linear congruence PRNG to make sure we are
// predictable across platforms. (Lehmer RNG, Schrage's method)
// Note: the choice of "long int" storage type for the state is mostly
// for parity with the possible return values of random().
constexpr uint32_t m = 2147483647;
constexpr uint32_t a = 16807;
constexpr uint32_t q = m / a;
@ -1204,12 +1206,17 @@ unsigned int bro_prng(unsigned int state)
return res;
}
unsigned int bro_prng(unsigned int state)
{
return zeek::prng(state);
}
long int bro_random()
{
if ( ! bro_rand_determistic )
return random(); // Use system PRNG.
bro_rand_state = bro_prng(bro_rand_state);
bro_rand_state = zeek::prng(bro_rand_state);
return bro_rand_state;
}