From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Fri, 2 Nov 2018 19:28:55 +0000 (-0400)
Subject: Merge pull request #1363 in SNORT/snort3 from offload_flow_data to master
X-Git-Tag: 3.0.0-249~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e6ad8f67801ff9956618a793f9595cc857b9aad;p=thirdparty%2Fsnort3.git

Merge pull request #1363 in SNORT/snort3 from offload_flow_data to master

Squashed commit of the following:

commit add380fa46f0b167524e656050c279507350f787
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Oct 3 13:12:37 2018 -0400

    stream tcp: don't delete flow data on rst, let session close handle it
---

diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index ad8194fb7..8fcde36a6 100644
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -606,7 +606,6 @@ void TcpSession::update_session_on_rst(TcpSegmentDescriptor& tsd, bool flush)
         DetectionEngine::onload(flow);  // FIXIT-H don't allow offload above
         set_splitter(true, nullptr);
         set_splitter(false, nullptr);
-        flow->free_flow_data();
     }
 
     talker->update_on_rst_sent( );