From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Mon, 8 May 2017 16:31:12 +0000 (-0400)
Subject: Merge pull request #884 in SNORT/snort3 from stream_syncup_seq_oow to master
X-Git-Tag: 3.0.0-233~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f05bed4fa777f3b930ad82a39ccb1157ba170605;p=thirdparty%2Fsnort3.git

Merge pull request #884 in SNORT/snort3 from stream_syncup_seq_oow to master

Squashed commit of the following:

commit 7afb572ad351984b7d3e3b94e01128f7abc6e414
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Fri May 5 15:40:55 2017 -0400

    coding style and format fixups, not functional changes
---

diff --git a/src/network_inspectors/appid/appid_session.cc b/src/network_inspectors/appid/appid_session.cc
index 66ea42cd0..800e0a4f1 100644
--- a/src/network_inspectors/appid/appid_session.cc
+++ b/src/network_inspectors/appid/appid_session.cc
@@ -417,8 +417,8 @@ void AppIdSession::update_encrypted_app_id(AppId serviceAppId)
     {
     case APP_ID_HTTP:
         if (misc_app_id == APP_ID_NSIIOPS || misc_app_id == APP_ID_DDM_SSL
-            || misc_app_id == APP_ID_MSFT_GC_SSL || misc_app_id ==
-            APP_ID_SF_APPLIANCE_MGMT)
+            || misc_app_id == APP_ID_MSFT_GC_SSL
+            || misc_app_id == APP_ID_SF_APPLIANCE_MGMT)
         {
             break;
         }
diff --git a/src/stream/stream_splitter.cc b/src/stream/stream_splitter.cc
index 295c726de..7cc74ac03 100644
--- a/src/stream/stream_splitter.cc
+++ b/src/stream/stream_splitter.cc
@@ -98,8 +98,7 @@ static inline int CheckFlushCoercion(  // FIXIT-M this should be part of a new s
     if ( !flush_factor )
         return 0;
 
-    if (
-        p->dsize &&
+    if ( p->dsize &&
         (p->dsize < fm->last_size) &&
         (fm->last_count >= flush_factor) )
     {
diff --git a/src/stream/tcp/tcp_tracker.cc b/src/stream/tcp/tcp_tracker.cc
index cb1d36633..5a868c018 100644
--- a/src/stream/tcp/tcp_tracker.cc
+++ b/src/stream/tcp/tcp_tracker.cc
@@ -298,7 +298,7 @@ void TcpTracker::init_on_data_seg_sent(TcpSegmentDescriptor& tsd)
     reassembler->set_seglist_base_seq(tsd.get_seg_ack());
 
     ts_last_packet = tsd.get_pkt()->pkth->ts.tv_sec;
-    tf_flags |= normalizer->get_tcp_timestamp(tsd, 0);
+    tf_flags |= normalizer->get_tcp_timestamp(tsd, false);
     ts_last = tsd.get_ts();
     if (ts_last == 0)
         tf_flags |= TF_TSTAMP_ZERO;