Merge pull request #1373 in SNORT/snort3 from flow_warning to master

Squashed commit of the following:

commit 06eebd9f653948a26740b895048611b7f40aaabf
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Sep 27 11:14:51 2018 -0400

    TextLog: removed unused TextLog_Tell function

commit 77b9eb1f3784b69528c3b197c768cd81f5a18be5
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Sep 27 10:03:05 2018 -0400

    stream: fixed build warning

commit 95315eae2d16bf8c4f195d30fe68352cc79cacec
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Sep 27 10:01:09 2018 -0400

    Flow: fixed build warning

diff --git a/src/flow/flow.h b/src/flow/flow.h
index f811359c8704f643c82906d0f4bc705de8fea065..bfdc24f79d852429fbf8f281cf83374af2e20260 100644 (file)
--- a/src/flow/flow.h
+++ b/src/flow/flow.h
@@ -353,10 +353,10 @@ public:  // FIXIT-M privatize if possible
 
     uint8_t response_count;
 
-private:
     uint8_t offloads_pending;
     bool disable_inspect;
 
+private:
     void clean();
 };
 

diff --git a/src/log/text_log.cc b/src/log/text_log.cc
index b37c48df1f56cee537882f43cc78d15a5d7b67d8..174f8e16353b1e93f27bd378ffe05060cf64b4f9 100644 (file)
--- a/src/log/text_log.cc
+++ b/src/log/text_log.cc
@@ -96,11 +96,6 @@ static size_t TextLog_Size(FILE* file)
     return err ? 0 : sbuf.st_size;
 }
 
-int TextLog_Tell(TextLog* const txt)
-{
-    return txt->pos;
-}
-
 namespace snort
 {
 int TextLog_Avail(TextLog* const txt)

diff --git a/src/log/text_log.h b/src/log/text_log.h
index 94ba3dfad6a5c428d92c22f67e80f4d31a47ed37..59c0acaf0c318e06d95b14310014f16d2fc7b4e9 100644 (file)
--- a/src/log/text_log.h
+++ b/src/log/text_log.h
@@ -58,7 +58,6 @@ SO_PUBLIC bool TextLog_Write(TextLog* const, const char*, int len);
 SO_PUBLIC bool TextLog_Print(TextLog* const, const char* format, ...);
 
 SO_PUBLIC bool TextLog_Flush(TextLog* const);
-SO_PUBLIC int TextLog_Tell(TextLog* const);
 SO_PUBLIC int TextLog_Avail(TextLog* const);
 SO_PUBLIC void TextLog_Reset(TextLog* const);
 } // namespace snort

diff --git a/src/stream/tcp/tcp_reassembler.cc b/src/stream/tcp/tcp_reassembler.cc
index a79d4f80f796e3f8e66e1e413f921778330c98f4..a6312fe397ae5ef829ce405fbb68be17f18d457e 100644 (file)
--- a/src/stream/tcp/tcp_reassembler.cc
+++ b/src/stream/tcp/tcp_reassembler.cc
@@ -40,7 +40,7 @@ using namespace snort;
 
 static THREAD_LOCAL Packet* last_pdu = nullptr;
 
-void purge_alerts_callback_ackd(IpsContext* c)
+static void purge_alerts_callback_ackd(IpsContext* c)
 {
     TcpSession* session = (TcpSession*)c->packet->flow->session;
 
@@ -50,7 +50,7 @@ void purge_alerts_callback_ackd(IpsContext* c)
         session->server.reassembler.purge_alerts();
 }
 
-void purge_alerts_callback_ips(IpsContext* c)
+static void purge_alerts_callback_ips(IpsContext* c)
 {
     TcpSession* session = (TcpSession*)c->packet->flow->session;