From d8226169b8266b554c73b2804d480d10c4a9e456 Mon Sep 17 00:00:00 2001
From: Robin Sommer <robin@icir.org>
Date: Wed, 24 Jul 2013 16:34:52 -0700
Subject: [PATCH] Fixing random number generation so that it returns same
 numbers as before.

That broke a lot of tests.
---
 src/H3.h    | 16 ++++++++++++++--
 src/util.cc |  2 +-
 src/util.h  |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/H3.h b/src/H3.h
index 8ea5848816..321fda924b 100644
--- a/src/H3.h
+++ b/src/H3.h
@@ -66,17 +66,29 @@
 template <typename T, int N>
 class H3 {
 public:
-	H3(T seed = bro_random())
+	H3()
+		{
+		Init(false, 0);
+		}
+
+	H3(T seed)
+		{
+		Init(true, seed);
+		}
+
+	void Init(bool have_seed, T seed)
 		{
 		T bit_lookup[N * CHAR_BIT];
 
 		for ( size_t bit = 0; bit < N * CHAR_BIT; bit++ )
 			{
 			bit_lookup[bit] = 0;
-			seed = bro_prng(seed);
 			for ( size_t i = 0; i < sizeof(T)/2; i++ )
+				{
+				seed = have_seed ? bro_prng(seed) : bro_random();
 				// assume random() returns at least 16 random bits
 				bit_lookup[bit] = (bit_lookup[bit] << 16) | (seed & 0xFFFF);
+				}
 			}
 
 		for ( size_t byte = 0; byte < N; byte++ )
diff --git a/src/util.cc b/src/util.cc
index 6bea2eb7f1..23abbacc3f 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -829,7 +829,7 @@ bool have_random_seed()
 	return bro_rand_determistic;
 	}
 
-long int bro_prng(long int state)
+unsigned int bro_prng(unsigned int  state)
 	{
 	// Use our own simple linear congruence PRNG to make sure we are
 	// predictable across platforms.
diff --git a/src/util.h b/src/util.h
index aaad2d9403..05b3f032d0 100644
--- a/src/util.h
+++ b/src/util.h
@@ -175,7 +175,7 @@ extern bool have_random_seed();
 
 // A simple linear congruence PRNG. It takes its state as argument and
 // returns a new random value, which can serve as state for subsequent calls.
-long int bro_prng(long int state);
+unsigned int bro_prng(unsigned int state);
 
 // Replacement for the system random(), to which is normally falls back
 // except when a seed has been given. In that case, the function bro_prng.