From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Thu, 5 Sep 2019 14:48:54 +0000 (-0400)
Subject: Merge pull request #1730 in SNORT/snort3 from ~THOPETER/snort3:ab_stream_fix to master
X-Git-Tag: 3.0.0-261~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f32d9bbf6b850c8410f0de09b4924eb979464e50;p=thirdparty%2Fsnort3.git

Merge pull request #1730 in SNORT/snort3 from ~THOPETER/snort3:ab_stream_fix to master

Squashed commit of the following:

commit feed2122124b63c3e13561585d63ddcf1d841094
Author: Tom Peters <thopeter@cisco.com>
Date:   Tue Sep 3 17:41:31 2019 -0400

    stream: fix problem with accelerated blocking partial inspection
---

diff --git a/src/stream/tcp/tcp_reassembler.cc b/src/stream/tcp/tcp_reassembler.cc
index 82a35b3a9..b902eda18 100644
--- a/src/stream/tcp/tcp_reassembler.cc
+++ b/src/stream/tcp/tcp_reassembler.cc
@@ -1085,6 +1085,7 @@ int TcpReassembler::flush_on_data_policy(TcpReassemblerState& trs, Packet* p)
         if ( trs.tracker->splitter->init_partial_flush(p->flow) )
         {
             flushed += flush_stream(trs, p, trs.packet_dir, false);
+            paf_jump(&trs.tracker->paf_state, flushed);
             tcpStats.partial_flushes++;
             tcpStats.partial_flush_bytes += flushed;
             if ( trs.sos.seg_count )