From 9e5fce1f246cfd794bb853619b05c5e17b9e6c19 Mon Sep 17 00:00:00 2001 From: "Russ Combs (rucombs)" Date: Wed, 25 Apr 2018 06:42:18 -0400 Subject: [PATCH] Merge pull request #1201 in SNORT/snort3 from fixed_ip4_id to master Squashed commit of the following: commit 67252ea2a66b113a98f2c2c3239ef21d0713d30c Author: Steven Baigal (sbaigal) Date: Tue Apr 24 14:41:38 2018 -0400 ip: replaced REG_TEST with -H option for ipv4 codec fixed seed --- src/codecs/ip/cd_ipv4.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/codecs/ip/cd_ipv4.cc b/src/codecs/ip/cd_ipv4.cc index 99900c686..4754f5ce7 100644 --- a/src/codecs/ip/cd_ipv4.cc +++ b/src/codecs/ip/cd_ipv4.cc @@ -736,9 +736,8 @@ static void ipv4_codec_tinit() std::random_device rd; // for a good seed auto id = rd(); -#ifdef REG_TEST - id = 1; -#endif + if (SnortConfig::static_hash()) + id = 1; thread_rand = new std::mt19937(id); } -- 2.47.3