Merge pull request #728 in SNORT/snort3 from alert_135_2 to master

Squashed commit of the following:

commit bbd04a472f5eb899ee3d2a90e967032948ec1c54
Author: huica <huica@cisco.com>
Date:   Mon Nov 28 16:24:53 2016 -0500

    Alert 135:2 when a 3-way handshake is completed

diff --git a/src/stream/libtcp/tcp_stream_session.cc b/src/stream/libtcp/tcp_stream_session.cc
index 2a56fa616ec35c0a5ff80bd9d30e4eb4ed1b70f5..3a1ff3577d844a88a560cd8145b124aed35535e4 100644 (file)
--- a/src/stream/libtcp/tcp_stream_session.cc
+++ b/src/stream/libtcp/tcp_stream_session.cc
@@ -57,7 +57,6 @@ void TcpStreamSession::init_new_tcp_session(TcpSegmentDescriptor& tsd)
     flow->set_expire(tsd.get_pkt(), config->session_timeout);
 
     update_perf_base_state(TcpStreamTracker::TCP_SYN_SENT);
-    tel.log_internal_event(INTERNAL_EVENT_SESSION_ADD);
 
     tcp_init = true;
     lws_init = true;

diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index 8761c2494b8cdb4c34bbb68c5217fe1ec4494263..98a79233179e78ee182be14223eaf7b07a1dbb3c 100644 (file)
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -225,6 +225,7 @@ void TcpSession::update_perf_base_state(char newState)
                     &flow->server_ip, SFS_STATE_TCP_ESTABLISHED);
 
             session_flags |= SSNFLAG_COUNTED_ESTABLISH;
+            tel.log_internal_event(INTERNAL_EVENT_SESSION_ADD);
             if ( ( session_flags & SSNFLAG_COUNTED_INITIALIZE )
                 && !( session_flags & SSNFLAG_COUNTED_CLOSING ) )
             {