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 66ea42cd095f89702886c26e8955606ee55b188f..800e0a4f1b67bd3ad063eec5349fb5c2ef6d4d77 100644 (file)
--- 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 295c726de8e084a34f2e3120328070ecd3379104..7cc74ac03b6e24f0f2a31a3dacae6c2ac59ecb4e 100644 (file)
--- 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 cb1d36633b702c884e55547776428ab1c3d45839..5a868c0181082f4d4f28341cb3b8d73dd1dfef51 100644 (file)
--- 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;