From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Tue, 29 Mar 2016 20:22:38 +0000 (-0400)
Subject: Merge pull request #380 in SNORT/snort3 from ~JOCORNET/snort3:tcp_warnings_cleanup... 
X-Git-Tag: 3.0.0-233~495
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f173242e7238ad0d6b57e4e73ef591f24bb559df;p=thirdparty%2Fsnort3.git

Merge pull request #380 in SNORT/snort3 from ~JOCORNET/snort3:tcp_warnings_cleanup to master

Squashed commit of the following:

commit e4bba199e98d84b0a36d841ffea52b00318ba218
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Tue Mar 29 14:55:39 2016 -0400

    fixed unmarked override warnings in stream/tcp
---

diff --git a/src/stream/tcp/tcp_session.h b/src/stream/tcp/tcp_session.h
index c1e863800..9c59f4eac 100644
--- a/src/stream/tcp/tcp_session.h
+++ b/src/stream/tcp/tcp_session.h
@@ -57,7 +57,7 @@ public:
     void set_extra_data(Packet*, uint32_t /*flag*/) override;
     void clear_extra_data(Packet*, uint32_t /*flag*/) override;
 
-    void cleanup_session(int freeApplicationData, Packet* p = nullptr);
+    void cleanup_session(int freeApplicationData, Packet* = nullptr) override;
 
     void update_perf_base_state(char newState) override;
     TcpStreamTracker::TcpState get_talker_state(void) override;
@@ -82,13 +82,13 @@ private:
     int process_tcp_data(TcpSegmentDescriptor&);
     void process_tcp_packet(TcpSegmentDescriptor&);
     void FinishServerInit(TcpSegmentDescriptor&);
-    void swap_trackers(void);
+    void swap_trackers();
 
     void NewTcpSessionOnSyn(TcpSegmentDescriptor&);
     void NewTcpSessionOnSynAck(TcpSegmentDescriptor&);
-    void set_os_policy(void);
+    void set_os_policy() override;
 
-    void clear_session(int freeApplicationData);
+    void clear_session(int freeApplicationData) override;
 
     int process_dis(Packet*);
     void update_on_3whs_complete(TcpSegmentDescriptor&);