Merge pull request #858 in SNORT/snort3 from freebsd to master

Squashed commit of the following:

commit f1e4d6ffe603d131d5cd4a97af3ce5af9e083ec7
Author: Michael Altizer <mialtize@cisco.com>
Date:   Thu Apr 13 14:40:35 2017 -0400

    build: Fix FreeBSD compilation issues

diff --git a/src/filters/sfrf.h b/src/filters/sfrf.h
index c88cb91c3e837a5ebd5da70e4358d1ddf366231b..6d7a40741bf7cc92a501964e810414b4fa0ebf98 100644 (file)
--- a/src/filters/sfrf.h
+++ b/src/filters/sfrf.h
@@ -24,6 +24,8 @@
 
 // Implements rate_filter feature for snort
 
+#include <ctime>
+
 #include "actions/actions.h"
 #include "main/policy.h"
 

diff --git a/src/network_inspectors/appid/appid_config.cc b/src/network_inspectors/appid/appid_config.cc
index 6f4b2ba3c44fa78625a44f92e10ee68682e20f6c..ea43c8fd2d7e7f2a7d5ab2b27cb255e653925c07 100644 (file)
--- a/src/network_inspectors/appid/appid_config.cc
+++ b/src/network_inspectors/appid/appid_config.cc
@@ -60,7 +60,7 @@ int16_t snortId_for_unsynchronized;
 int16_t snortId_for_ftp_data;
 int16_t snortId_for_http2;
 
-void map_app_names_to_snort_ids()
+static void map_app_names_to_snort_ids()
 {
     /* init globals for snortId compares */
     snortId_for_unsynchronized = snort_conf->proto_ref->add("unsynchronized");

diff --git a/src/network_inspectors/appid/client_plugins/client_detector.h b/src/network_inspectors/appid/client_plugins/client_detector.h
index 82961be9d6cf0c1631fea5422cefe2b2634d2802..2c2828bff24358d7578a331978fcb6492df2a86f 100644 (file)
--- a/src/network_inspectors/appid/client_plugins/client_detector.h
+++ b/src/network_inspectors/appid/client_plugins/client_detector.h
@@ -33,7 +33,7 @@ public:
     ClientDetector();
     virtual ~ClientDetector() { }
 
-    virtual void do_custom_init() override { };
+    virtual void do_custom_init() override { }
     virtual int validate(AppIdDiscoveryArgs&) override;
     virtual void register_appid(AppId, unsigned extractsInfo) override;
 };

diff --git a/src/network_inspectors/appid/client_plugins/client_discovery.cc b/src/network_inspectors/appid/client_plugins/client_discovery.cc
index 7b119ea359ad7e4c0dc64d1a22d6e1c907cee857..d4b8c154529c22380425b4925b2a43a4bf229c30 100644 (file)
--- a/src/network_inspectors/appid/client_plugins/client_discovery.cc
+++ b/src/network_inspectors/appid/client_plugins/client_discovery.cc
@@ -71,7 +71,9 @@ ClientDiscovery::~ClientDiscovery()
 
 ClientDiscovery& ClientDiscovery::get_instance()
 {
-    static THREAD_LOCAL ClientDiscovery* discovery_manager = new ClientDiscovery;
+    static THREAD_LOCAL ClientDiscovery* discovery_manager = nullptr;
+    if (!discovery_manager)
+        discovery_manager = new ClientDiscovery;
     return *discovery_manager;
 }
 

diff --git a/src/network_inspectors/appid/detector_plugins/detector_sip.h b/src/network_inspectors/appid/detector_plugins/detector_sip.h
index 6a66e7246342e5f54b6828e4bcf00d977cb7e57a..c597e3aacf513c310529cb5c9cceff009a56fd6e 100644 (file)
--- a/src/network_inspectors/appid/detector_plugins/detector_sip.h
+++ b/src/network_inspectors/appid/detector_plugins/detector_sip.h
@@ -89,7 +89,9 @@ public:
     ~SipEventHandler() { }
     static SipEventHandler& get_instance()
     {
-        static THREAD_LOCAL SipEventHandler* seh = new SipEventHandler;
+        static THREAD_LOCAL SipEventHandler* seh = nullptr;
+        if (!seh)
+            seh = new SipEventHandler;
         return *seh;
     }
 

diff --git a/src/network_inspectors/appid/detector_plugins/http_url_patterns.cc b/src/network_inspectors/appid/detector_plugins/http_url_patterns.cc
index 46c56c691fb90a08f02cb2a035f1cf27900d0014..47c3d4a4a40d8c80b93105bba627f8ee623899dc 100644 (file)
--- a/src/network_inspectors/appid/detector_plugins/http_url_patterns.cc
+++ b/src/network_inspectors/appid/detector_plugins/http_url_patterns.cc
@@ -298,7 +298,7 @@ static void add_host_url_pattern(HostUrlDetectorPattern* detector, HostUrlPatter
     }
 }
 
-void destroy_host_url_patterns(HostUrlPatterns** pattern_list)
+static void destroy_host_url_patterns(HostUrlPatterns** pattern_list)
 {
     if (!(*pattern_list))
         return;
@@ -362,7 +362,7 @@ int HttpPatternMatchers::add_mlmp_pattern(void* matcher,
     return mlmpAddPattern((tMlmpTree*)matcher, patterns, detector);
 }
 
-void destroy_host_url_matcher(tMlmpTree** host_url_matcher)
+static void destroy_host_url_matcher(tMlmpTree** host_url_matcher)
 {
     if (host_url_matcher && *host_url_matcher)
     {
@@ -371,7 +371,7 @@ void destroy_host_url_matcher(tMlmpTree** host_url_matcher)
     }
 }
 
-int match_query_elements(
+static int match_query_elements(
     tMlpPattern* packetData,
     tMlpPattern* userPattern,
     char* appVersion,
@@ -420,7 +420,9 @@ int match_query_elements(
 
 HttpPatternMatchers* HttpPatternMatchers::get_instance()
 {
-    static THREAD_LOCAL HttpPatternMatchers* http_matchers = new HttpPatternMatchers;
+    static THREAD_LOCAL HttpPatternMatchers* http_matchers = nullptr;
+    if (!http_matchers)
+        http_matchers = new HttpPatternMatchers;
     return http_matchers;
 }
 

diff --git a/src/network_inspectors/appid/service_plugins/service_discovery.cc b/src/network_inspectors/appid/service_plugins/service_discovery.cc
index a879197a0e8a9c5467299ac7bf2b6df04b4ce215..1a49f326284aec35c9616277969bd4c0d6fb7a71 100644 (file)
--- a/src/network_inspectors/appid/service_plugins/service_discovery.cc
+++ b/src/network_inspectors/appid/service_plugins/service_discovery.cc
@@ -90,7 +90,9 @@ ServiceDiscovery::~ServiceDiscovery()
 
 ServiceDiscovery& ServiceDiscovery::get_instance()
 {
-    static THREAD_LOCAL ServiceDiscovery* discovery_manager = new ServiceDiscovery;
+    static THREAD_LOCAL ServiceDiscovery* discovery_manager = nullptr;
+    if (!discovery_manager)
+        discovery_manager = new ServiceDiscovery;
     return *discovery_manager;
 }
 

diff --git a/src/network_inspectors/perf_monitor/csv_formatter.h b/src/network_inspectors/perf_monitor/csv_formatter.h
index 91e4a201b80c2829bcc8a16d1b387c36483cbcd1..c02ed905f832691fbf8197cb57c63b26a8bc2aa4 100644 (file)
--- a/src/network_inspectors/perf_monitor/csv_formatter.h
+++ b/src/network_inspectors/perf_monitor/csv_formatter.h
@@ -21,6 +21,8 @@
 #ifndef CSV_FORMATTER_H
 #define CSV_FORMATTER_H
 
+#include <ctime>
+
 #include "perf_formatter.h"
 
 class CSVFormatter : public PerfFormatter

diff --git a/src/network_inspectors/perf_monitor/perf_formatter.h b/src/network_inspectors/perf_monitor/perf_formatter.h
index ad7704e71337c8568e366a1b3b8f06ba204072c2..e30bf740fa40b71ac03e458a3ef136031c8d3280 100644 (file)
--- a/src/network_inspectors/perf_monitor/perf_formatter.h
+++ b/src/network_inspectors/perf_monitor/perf_formatter.h
@@ -43,6 +43,7 @@
 // ouput open.
 //
 
+#include <ctime>
 #include <string>
 #include <vector>
 

diff --git a/src/network_inspectors/perf_monitor/perf_tracker.h b/src/network_inspectors/perf_monitor/perf_tracker.h
index e4d3f925a6845b81e4f853dc1184a44595428b49..67b41bd7f4a708ce2f842e68aaaac3d29bde86b1 100644 (file)
--- a/src/network_inspectors/perf_monitor/perf_tracker.h
+++ b/src/network_inspectors/perf_monitor/perf_tracker.h
@@ -38,6 +38,7 @@
 //
 
 #include <cstdio>
+#include <ctime>
 
 #include "perf_formatter.h"
 #include "perf_monitor.h"