From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Tue, 30 Jul 2019 23:02:05 +0000 (-0400)
Subject: Merge pull request #1683 in SNORT/snort3 from ~RUCOMBS/snort3:stream_order to master
X-Git-Tag: 3.0.0-259~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11e00101b7fad6007479d93327acec82c796db40;p=thirdparty%2Fsnort3.git

Merge pull request #1683 in SNORT/snort3 from ~RUCOMBS/snort3:stream_order to master

Squashed commit of the following:

commit 38f074eb0b674fc12887f3b866881885ea4159b9
Author: russ <rucombs@cisco.com>
Date:   Sun Jul 21 12:31:36 2019 -0400

    stream_tcp: fix 3-1-2 ordering markup
---

diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index 5abc53534..f4c3c9679 100644
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -362,9 +362,15 @@ void TcpSession::update_stream_order(TcpSegmentDescriptor& tsd, bool aligned)
         }
         break;
     default:
-        if ( !(flow->get_session_flags() & SSNFLAG_STREAM_ORDER_BAD) )
-            flow->set_session_flags(SSNFLAG_STREAM_ORDER_BAD);
-        tsd.get_pkt()->packet_flags |= PKT_STREAM_ORDER_BAD;
+        if ( aligned )
+            tsd.get_pkt()->packet_flags |= PKT_STREAM_ORDER_OK;
+
+        else
+        {
+            if ( !(flow->get_session_flags() & SSNFLAG_STREAM_ORDER_BAD) )
+                flow->set_session_flags(SSNFLAG_STREAM_ORDER_BAD);
+            tsd.get_pkt()->packet_flags |= PKT_STREAM_ORDER_BAD;
+         }
     }
 }