Merge pull request #1090 in SNORT/snort3 from mtfw2 to master

Squashed commit of the following:

commit 8329330304223bc7fa3b495b24ab1fb881e633ce
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Jan 2 13:16:16 2018 -0500

    sfdaq: Export can_whitelist() and modify_flow_opaque()

commit 38fe764e2c29b02da1c97033fd8ccd5e31bf07b1
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Jan 2 13:15:45 2018 -0500

    file_api: Move VerdictName array out of file_api.h

diff --git a/src/file_api/file_api.h b/src/file_api/file_api.h
index aa1ec565225753bfa0995e612b03e3e02a3f5446..58eeeaec4fe95daa66368fce192566849c342fa2 100644 (file)
--- a/src/file_api/file_api.h
+++ b/src/file_api/file_api.h
@@ -59,9 +59,6 @@ enum FileVerdict
     FILE_VERDICT_MAX
 };
 
-const std::string VerdictName[] =
-{"Unknown", "Log", "Stop", "Block", "Reset", "Pending", "Stop Capture", "INVALID"};
-
 enum FilePosition
 {
     SNORT_FILE_POSITION_UNKNOWN,

diff --git a/src/file_api/file_log.cc b/src/file_api/file_log.cc
index 291bf32f795d0c195bdc125e82cd5eb6bd1a9b2d..687d32b1608ded724838d4fecc4bed3626e64258 100644 (file)
--- a/src/file_api/file_log.cc
+++ b/src/file_api/file_log.cc
@@ -49,6 +49,9 @@ struct FileLogStats
 
 static THREAD_LOCAL FileLogStats fl_stats;
 
+static const std::string VerdictName[] =
+{"Unknown", "Log", "Stop", "Block", "Reset", "Pending", "Stop Capture", "INVALID"};
+
 static const PegInfo fl_pegs[] =
 {
     { CountType::SUM, "total_events", "total file events" },

diff --git a/src/packet_io/sfdaq.h b/src/packet_io/sfdaq.h
index 1a746ac47efe9c263cea522991f49cdbfe860d53..5e31b23ceff77e280a9423a27b82405635b5e3fa 100644 (file)
--- a/src/packet_io/sfdaq.h
+++ b/src/packet_io/sfdaq.h
@@ -57,14 +57,14 @@ public:
     bool can_replace();
     bool can_retry();
     bool can_start_unprivileged();
-    bool can_whitelist();
+    SO_PUBLIC bool can_whitelist();
 
     int acquire(int max, DAQ_Analysis_Func_t);
     int inject(const DAQ_PktHdr_t*, int rev, const uint8_t* buf, uint32_t len);
     bool break_loop(int error);
 
     SO_PUBLIC int query_flow(const DAQ_PktHdr_t*, DAQ_QueryFlow_t*);
-    int modify_flow_opaque(const DAQ_PktHdr_t*, uint32_t opaque);
+    SO_PUBLIC int modify_flow_opaque(const DAQ_PktHdr_t*, uint32_t opaque);
     int modify_flow_pkt_trace(const DAQ_PktHdr_t*, DAQ_Verdict,
         uint8_t* buff, uint32_t buff_len);
     int add_expected(const Packet* ctrlPkt, const SfIp* cliIP, uint16_t cliPort,