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 5abc535349d50dbd147689ae52c8579ba7cdebe9..f4c3c9679cbb5625400f130b757e5cc76430da1c 100644 (file)
--- 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;
+         }
     }
 }