From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Fri, 25 Mar 2016 15:37:16 +0000 (-0400)
Subject: Merge pull request #368 in SNORT/snort3 from cmake_build_patch to master
X-Git-Tag: 3.0.0-233~507
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=606c80f065d8eb035718ba280b702ff1ea8afa3f;p=thirdparty%2Fsnort3.git

Merge pull request #368 in SNORT/snort3 from cmake_build_patch to master

Squashed commit of the following:

commit ac1701b9cb4eadb234fbbc4bccfc03b90f8fd8b9
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date:   Fri Mar 25 11:32:20 2016 -0400

    #endif missing around data definition only included in DEBUG build
---

diff --git a/src/stream/libtcp/tcp_state_machine.cc b/src/stream/libtcp/tcp_state_machine.cc
index f8ee0e21d..dd05f7129 100644
--- a/src/stream/libtcp/tcp_state_machine.cc
+++ b/src/stream/libtcp/tcp_state_machine.cc
@@ -16,7 +16,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //--------------------------------------------------------------------------
 
-// tcp_state_machine.cc author davis mcpherson <davmcphe@@cisco.com>
+// tcp_state_machine.cc author davis mcpherson <davmcphe@cisco.com>
 // Created on: Jul 29, 2015
 
 #include "tcp_stream_tracker.h"
diff --git a/src/stream/libtcp/tcp_stream_session.cc b/src/stream/libtcp/tcp_stream_session.cc
index 4b500e5dd..7efb1cca4 100644
--- a/src/stream/libtcp/tcp_stream_session.cc
+++ b/src/stream/libtcp/tcp_stream_session.cc
@@ -16,9 +16,11 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //--------------------------------------------------------------------------
 
-// tcp_stream_session.cc author davis mcpherson <davmcphe@@cisco.com>
+// tcp_stream_session.cc author davis mcpherson <davmcphe@cisco.com>
 // Created on: Feb 18, 2016
 
+#include "log/messages.h"
+#include "main/snort_debug.h"
 #include "sfip/sf_ip.h"
 
 #include "tcp_stream_session.h"
@@ -30,6 +32,7 @@ const char* const flush_policy_names[] =
     "on-ack",
     "on-data"
 };
+#endif
 
 TcpStreamSession::TcpStreamSession(Flow* flow) : Session(flow)
 {
@@ -510,5 +513,3 @@ void TcpStreamSession::clear_session(int)
 {
 }
 
-#endif
-
diff --git a/src/stream/libtcp/tcp_stream_session.h b/src/stream/libtcp/tcp_stream_session.h
index 4f0c9359f..99bc5f29c 100644
--- a/src/stream/libtcp/tcp_stream_session.h
+++ b/src/stream/libtcp/tcp_stream_session.h
@@ -32,12 +32,6 @@
 #include "stream/tcp/tcp_event_logger.h"
 #include "tcp_stream_tracker.h"
 
-#if 0
-#include "tcp_state_machine.h"
-#include "stream_tcp.h"
-#include "tcp_defs.h"
-#endif
-
 #ifdef DEBUG
 extern const char* const flush_policy_names[];
 #endif
@@ -56,13 +50,6 @@ public:
     void cleanup(void) override;
     void set_splitter(bool, StreamSplitter*) override;
     StreamSplitter* get_splitter(bool) override;
-    void reset(void);
-    void start_proxy(void);
-    static void set_memcap(class Memcap&);
-    static void sinit(void);
-    static void sterm(void);
-    void print(void);
-
     bool is_sequenced(uint8_t /*dir*/) override;
     bool are_packets_missing(uint8_t /*dir*/) override;
     uint8_t get_reassembly_direction(void) override;
@@ -72,19 +59,13 @@ public:
     bool check_alerted(Packet*, uint32_t gid, uint32_t sid) override;
     int update_alert(Packet*, uint32_t /*gid*/, uint32_t /*sid*/,
         uint32_t /*event_id*/, uint32_t /*event_second*/) override;
-#if 0
-    void restart(Packet*) override;
-    int process(Packet*) override;
-    void flush_client(Packet*) override;
-    void flush_server(Packet*) override;
-    void flush_talker(Packet*) override;
-    void flush_listener(Packet*) override;
-
-    void set_extra_data(Packet*, uint32_t /*flag*/) override;
-    void clear_extra_data(Packet*, uint32_t /*flag*/) override;
-
-#endif
 
+    void reset(void);
+    void start_proxy(void);
+    static void set_memcap(class Memcap&);
+    static void sinit(void);
+    static void sterm(void);
+    void print(void);
     void SetPacketHeaderFoo(const Packet* p);
     void GetPacketHeaderFoo(DAQ_PktHdr_t* pkth, uint32_t dir);
     void SwapPacketHeaderFoo(void);