From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Tue, 13 Nov 2018 15:30:34 +0000 (-0500)
Subject: Merge pull request #1426 in SNORT/snort3 from ~SBAIGAL/snort3:stream_peg to master
X-Git-Tag: 3.0.0-250~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24e5ba6e90e660c175f82e15e0ccd978040c9f83;p=thirdparty%2Fsnort3.git

Merge pull request #1426 in SNORT/snort3 from ~SBAIGAL/snort3:stream_peg to master

Squashed commit of the following:

commit 596cb6a1f4c2ca9a90869206806b7869003b69fb
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Fri Nov 9 13:17:42 2018 -0500

    stream: fixed stream_base flow peg count sum_stats bug
---

diff --git a/src/stream/base/stream_base.cc b/src/stream/base/stream_base.cc
index 35f08c639..98adf10dd 100644
--- a/src/stream/base/stream_base.cc
+++ b/src/stream/base/stream_base.cc
@@ -100,6 +100,7 @@ void base_sum()
 
     sum_stats((PegCount*)&g_stats, (PegCount*)&stream_base_stats,
         array_size(base_pegs)-1);
+    base_reset();
 }
 
 void base_stats()