From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Mon, 26 Mar 2018 14:36:17 +0000 (-0400)
Subject: Merge pull request #1157 in SNORT/snort3 from stream_tcp_bad_ack to master
X-Git-Tag: 3.0.0-245~67
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e73ae27941de2c0a5540a8a67eca2eacc34ca498;p=thirdparty%2Fsnort3.git

Merge pull request #1157 in SNORT/snort3 from stream_tcp_bad_ack to master

Squashed commit of the following:

commit 2265c3ef6dca3e1cc6584effb29dae447d7f41d0
Author: Steven Baigal <sbaigal@cisco.com>
Date:   Thu Mar 22 14:30:59 2018 -0400

    tcp: allow data  handlding for packet with invalid ack
---

diff --git a/src/stream/tcp/tcp_state_syn_recv.cc b/src/stream/tcp/tcp_state_syn_recv.cc
index 6df8fe3be..30a9ed355 100644
--- a/src/stream/tcp/tcp_state_syn_recv.cc
+++ b/src/stream/tcp/tcp_state_syn_recv.cc
@@ -131,9 +131,9 @@ bool TcpStateSynRecv::data_seg_recv(TcpSegmentDescriptor& tsd, TcpStreamTracker&
         trk.session->set_pkt_action_flag(trk.normalizer->handle_paws(tsd) );
         trk.session->update_perf_base_state(TcpStreamTracker::TCP_ESTABLISHED);
         trk.set_tcp_state(TcpStreamTracker::TCP_ESTABLISHED);
-        if ( tsd.get_seg_len() > 0 )
-            trk.session->handle_data_segment(tsd);
     }
+    if ( tsd.get_seg_len() > 0 )
+        trk.session->handle_data_segment(tsd);
     return true;
 }