From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Fri, 27 Apr 2018 14:11:19 +0000 (-0400)
Subject: Merge pull request #1202 in SNORT/snort3 from freebsd_unit_test_fixes to master
X-Git-Tag: 3.0.0-245~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0228d6dcca5bcefa502e159045288332c41eafeb;p=thirdparty%2Fsnort3.git

Merge pull request #1202 in SNORT/snort3 from freebsd_unit_test_fixes to master

Squashed commit of the following:

commit f8b702f6deb629b05dd9c8c330a907d4cec57b9b
Author: shaslad <shaslad@cisco.com>
Date:   Mon Apr 23 16:27:16 2018 -0400

    build: Fix building unit tests on FreeBSD
---

diff --git a/src/connectors/tcp_connector/test/tcp_connector_test.cc b/src/connectors/tcp_connector/test/tcp_connector_test.cc
index 932e67cc0..b6f950031 100644
--- a/src/connectors/tcp_connector/test/tcp_connector_test.cc
+++ b/src/connectors/tcp_connector/test/tcp_connector_test.cc
@@ -38,12 +38,6 @@
 
 using namespace snort;
 
-#if defined(__APPLE__)
-#define __THROW
-#define __SOCKADDR_ARG          struct sockaddr*
-#define __CONST_SOCKADDR_ARG    const struct sockaddr*
-#endif
-
 extern const BaseApi* tcp_connector;
 ConnectorApi* tcpc_api = nullptr;
 
@@ -86,7 +80,7 @@ void Debug::print(const char*, int, uint64_t, const char*, ...) { }
 void ErrorMessage(const char*, ...) { }
 void LogMessage(const char*, ...) { }
 
-int connect (int, __CONST_SOCKADDR_ARG, socklen_t) { return s_connect_return; }
+int connect (int, const struct sockaddr*, socklen_t) { return s_connect_return; } 
 ssize_t send (int, const void*, size_t n, int)
 {
     if ( n == sizeof(TcpConnectorMsgHdr) )
@@ -140,10 +134,11 @@ ssize_t recv (int, void *buf, size_t n, int)
     else
         return 0;
 }
-int socket (int, int, int) __THROW { return s_socket_return; }
-int bind (int, __CONST_SOCKADDR_ARG, socklen_t) __THROW { return s_bind_return; }
-int listen (int, int) __THROW { return s_listen_return; }
-int accept (int, __SOCKADDR_ARG, socklen_t *__restrict) { return s_accept_return; }
+
+int socket (int, int, int) { return s_socket_return; } 
+int bind (int, const struct sockaddr*, socklen_t) { return s_bind_return; } 
+int listen (int, int) { return s_listen_return; } 
+int accept (int, struct sockaddr*, socklen_t*) { return s_accept_return; } 
 int close (int) { return 0; }
 
 static void set_normal_status()
diff --git a/src/decompress/file_decomp.cc b/src/decompress/file_decomp.cc
index 1e25d7236..57c12d494 100644
--- a/src/decompress/file_decomp.cc
+++ b/src/decompress/file_decomp.cc
@@ -239,7 +239,6 @@ fd_status_t File_Decomp_Init(fd_session_t* SessionPtr)
         return( File_Decomp_Error );
 
     SessionPtr->State = STATE_READY;
-    SessionPtr->File_Type = FILE_TYPE_NONE;
     SessionPtr->Decomp_Type = FILE_COMPRESSION_TYPE_NONE;
 
     for ( Sig=0; Signature_Map[Sig].Sig != nullptr; Sig++ )
@@ -277,6 +276,7 @@ fd_session_t* File_Decomp_New()
     New_Session->Next_In = nullptr;
     New_Session->Avail_Out = 0;
     New_Session->Next_Out = nullptr;
+    New_Session->File_Type = FILE_TYPE_NONE;
 
     return New_Session;
 }
@@ -429,6 +429,7 @@ TEST_CASE("File_Decomp_New", "[file_decomp]")
     REQUIRE(p_s->Avail_Out == 0);
     REQUIRE(p_s->Next_In == nullptr);
     REQUIRE(p_s->Next_Out == nullptr);
+    REQUIRE(p_s->File_Type == FILE_TYPE_NONE);
     File_Decomp_Free(p_s);
 }
 
diff --git a/src/network_inspectors/appid/test/appid_mock_inspector.h b/src/network_inspectors/appid/test/appid_mock_inspector.h
index eab1054ae..0f1c03183 100644
--- a/src/network_inspectors/appid/test/appid_mock_inspector.h
+++ b/src/network_inspectors/appid/test/appid_mock_inspector.h
@@ -36,7 +36,7 @@ class StreamSplitter* Inspector::get_splitter(bool) { return nullptr; }
 Module::Module(char const*, char const*) {}
 bool Module::set(const char*, Value&, SnortConfig*) { return true; }
 void Module::sum_stats(bool) {}
-void Module::show_interval_stats(std::vector<unsigned int, std::allocator<unsigned int> >&, _IO_FILE*) {}
+void Module::show_interval_stats(std::vector<unsigned int, std::allocator<unsigned int> >&, FILE*) {}
 void Module::show_stats() {}
 void Module::reset_stats() {}
 PegCount Module::get_global_count(char const*) const { return 0; }