Merge pull request #665 in SNORT/snort3 from version to master

Squashed commit of the following:

commit 21e605f778e6716318853656f4d60ca2a45d2e7e
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Oct 4 19:39:32 2016 -0400

    utils: Add LibDAQ version to snort -V output

commit c5f46884c20d855c7d045a3d1025dc59124facc1
Author: Michael Altizer <mialtize@cisco.com>
Date:   Wed Oct 5 15:50:35 2016 -0400

    appid: (Re-)Fix printf format specifier warnings for peg counts

commit 17e27d89cdb4da7b88f176c1d7f3aee7430fb4b2
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Oct 4 19:22:49 2016 -0400

    utils: Minimize utils.h includes and handle the fallout

diff --git a/extra/src/inspectors/http_server/hi_main.cc b/extra/src/inspectors/http_server/hi_main.cc
index ad4e97f80dff8a7f7c12eb83200d9fcfd2f4d522..a97335d83645ccd08502ada5494331133f2df771 100644 (file)
--- a/extra/src/inspectors/http_server/hi_main.cc
+++ b/extra/src/inspectors/http_server/hi_main.cc
@@ -64,6 +64,7 @@
 #include "file_api/file_api.h"
 #include "file_api/file_flows.h"
 #include "framework/data_bus.h"
+#include "log/messages.h"
 #include "log/unified2.h"
 #include "main/snort_debug.h"
 #include "mime/decode_base.h"

diff --git a/extra/src/inspectors/http_server/http_inspect.cc b/extra/src/inspectors/http_server/http_inspect.cc
index 9f65a356fab689bda109dcb5e1f402c2f50f8b4c..59dffd126927ba5a7f14d938f96d977458db40e2 100644 (file)
--- a/extra/src/inspectors/http_server/http_inspect.cc
+++ b/extra/src/inspectors/http_server/http_inspect.cc
@@ -41,6 +41,7 @@
 #include <sys/types.h>
 
 // FIXIT-L all snort includes should use <form> instead of "form"
+#include "log/messages.h"
 #include "protocols/packet.h"
 #include "main/snort_debug.h"
 #include "decompress/file_decomp.h"

diff --git a/extra/src/loggers/alert_unixsock/alert_unixsock.cc b/extra/src/loggers/alert_unixsock/alert_unixsock.cc
index 4dea4db776bf432795642355962264170fe5defc..58517f1434af60b80e1ef4fdb1286239d568a1ec 100644 (file)
--- a/extra/src/loggers/alert_unixsock/alert_unixsock.cc
+++ b/extra/src/loggers/alert_unixsock/alert_unixsock.cc
@@ -31,6 +31,7 @@
 
 #include <string>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "framework/logger.h"

diff --git a/src/actions/act_react.cc b/src/actions/act_react.cc
index c3a3c6c303416689b660abbae9d6ad247bcf4079..dd3f3e8f3be348f69d1bc3050bdfacd68e07b65b 100644 (file)
--- a/src/actions/act_react.cc
+++ b/src/actions/act_react.cc
@@ -51,6 +51,7 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"

diff --git a/src/codecs/ip/cd_dst_opts.cc b/src/codecs/ip/cd_dst_opts.cc
index b462c232216d02a1a3b6ac740a1b537f924c6914..4029343f5153d7cc6cc8ffb66d11379e2564ceee 100644 (file)
--- a/src/codecs/ip/cd_dst_opts.cc
+++ b/src/codecs/ip/cd_dst_opts.cc
@@ -22,6 +22,7 @@
 #endif
 
 #include "framework/codec.h"
+#include "log/messages.h"
 #include "protocols/protocol_ids.h"
 #include "protocols/packet.h"
 #include "codecs/codec_module.h"

diff --git a/src/codecs/ip/cd_ipv4.cc b/src/codecs/ip/cd_ipv4.cc
index 4b7849e5d39c667cf1aa127294bbbb60cfe28d0a..0f7e5b17d3007e05c27623302259bdb4d36f5e27 100644 (file)
--- a/src/codecs/ip/cd_ipv4.cc
+++ b/src/codecs/ip/cd_ipv4.cc
@@ -39,6 +39,7 @@
 #include "codecs/codec_module.h"
 #include "protocols/ip.h"
 #include "protocols/ipv4_options.h"
+#include "log/messages.h"
 #include "log/text_log.h"
 #include "log/log_text.h"
 #include "sfip/sf_ipvar.h"

diff --git a/src/detection/detection_options.cc b/src/detection/detection_options.cc
index 65c2c851e280fb1600c37634968bcb7c33026293..e3163be5b883773f2e0e1566642a7980276575b4 100644 (file)
--- a/src/detection/detection_options.cc
+++ b/src/detection/detection_options.cc
@@ -50,6 +50,7 @@
 #include "ips_options/ips_pcre.h"
 #include "filters/detection_filter.h"
 #include "latency/packet_latency.h"
+#include "log/messages.h"
 #include "main/thread_config.h"
 #include "framework/ips_option.h"
 #include "framework/cursor.h"

diff --git a/src/detection/fp_create.cc b/src/detection/fp_create.cc
index 56500daf44a38e8ec43eec5944ab86aedcae452e..aff64df26b627b2a0f06b17f0612fc09785f840e 100644 (file)
--- a/src/detection/fp_create.cc
+++ b/src/detection/fp_create.cc
@@ -52,6 +52,7 @@
 #include "ports/rule_port_tables.h"
 #include "framework/mpse.h"
 #include "framework/ips_option.h"
+#include "log/messages.h"
 #include "managers/mpse_manager.h"
 #include "target_based/snort_protocols.h"
 

diff --git a/src/detection/fp_detect.cc b/src/detection/fp_detect.cc
index 871fcb25a094b9441adf891b7e9221b41cdadf48..a70c4cd9b66acde39d27befd6fbb8906a0198d17 100644 (file)
--- a/src/detection/fp_detect.cc
+++ b/src/detection/fp_detect.cc
@@ -56,6 +56,7 @@
 
 #include "latency/packet_latency.h"
 #include "latency/rule_latency.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "main/snort_debug.h"
 #include "framework/cursor.h"

diff --git a/src/detection/pcrm.cc b/src/detection/pcrm.cc
index 6719612e5b0bb8b3c83ffc20c58a8744d98fd0b9..3e043d98a8233cab0b2a8e105450e3fbb74b8fe3 100644 (file)
--- a/src/detection/pcrm.cc
+++ b/src/detection/pcrm.cc
@@ -40,6 +40,7 @@
 
 #include "fp_config.h"
 #include "fp_create.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
 

diff --git a/src/detection/service_map.cc b/src/detection/service_map.cc
index 5adf5d902710e36a7ec3da2b05d444dc2c93d2eb..cab80f44f8579228f5160ade303872cc3d309c1e 100644 (file)
--- a/src/detection/service_map.cc
+++ b/src/detection/service_map.cc
@@ -40,6 +40,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "hash/sfghash.h"
 #include "utils/sflsq.h"

diff --git a/src/detection/signature.cc b/src/detection/signature.cc
index 8418f90d3839e35162cae8bfc6df20dfdde9c4c1..71512f9415574e714ef45e27b90ba0c95e8bfc27 100644 (file)
--- a/src/detection/signature.cc
+++ b/src/detection/signature.cc
@@ -27,6 +27,7 @@
 #include "detection/rules.h"
 #include "detection/treenodes.h"
 #include "hash/sfghash.h"
+#include "log/messages.h"
 #include "parser/parser.h"
 #include "main/snort_config.h"
 

diff --git a/src/detection/tag.cc b/src/detection/tag.cc
index e7217c795ec81b20c7efa8f9b30e3df5bc68c54a..569ddff48af5b1eca856be32ec368c8891657190 100644 (file)
--- a/src/detection/tag.cc
+++ b/src/detection/tag.cc
@@ -29,6 +29,7 @@
 
 #include "rules.h"
 #include "treenodes.h"
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
 #include "protocols/packet.h"

diff --git a/src/events/event_queue.cc b/src/events/event_queue.cc
index 82fd27931f396b167a6dfc36ec4999abe044f136..e85b5a2b203f35d8f87dee9f370d28f3b5361342 100644 (file)
--- a/src/events/event_queue.cc
+++ b/src/events/event_queue.cc
@@ -59,6 +59,7 @@
 #include "utils/util.h"
 #include "utils/stats.h"
 #include "filters/sfthreshold.h"
+#include "log/messages.h"
 #include "parser/parser.h"
 
 typedef struct s_SNORT_EVENTQ_USER

diff --git a/src/file_api/file_cache.cc b/src/file_api/file_cache.cc
index 2ccd06fcccf0b71296d780363f62872414d51eac..ef83fc2428ef6176a67feb8bff5b3042c5bf7320 100644 (file)
--- a/src/file_api/file_cache.cc
+++ b/src/file_api/file_cache.cc
@@ -20,12 +20,13 @@
 #include "file_cache.h"
 #include "file_service.h"
 
+#include "log/messages.h"
+#include "main/snort_config.h"
 #include "sfip/sfip_t.h"
 #include "sfip/sf_ip.h"
 #include "time/packet_time.h"
 #include "utils/util.h"
 #include "utils/snort_bounds.h"
-#include "main/snort_config.h"
 
 uint64_t FileCache::num_add_fails = 0;
 

diff --git a/src/file_api/file_capture.cc b/src/file_api/file_capture.cc
index 7b2f0e9c9016814620ce35eb76df176e2329a267..09712db3b718c38512bed0177879c0cf1f4cec9d 100644 (file)
--- a/src/file_api/file_capture.cc
+++ b/src/file_api/file_capture.cc
@@ -37,14 +37,15 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "file_config.h"
-#include "file_stats.h"
-
-#include "main/snort_config.h"
 #include "hash/hashes.h"
+#include "log/messages.h"
+#include "main/snort_config.h"
 #include "utils/util.h"
 #include "utils/stats.h"
 
+#include "file_config.h"
+#include "file_stats.h"
+
 FileMemPool* FileCapture::file_mempool = nullptr;
 File_Capture_Stats file_capture_stats;
 

diff --git a/src/file_api/file_enforcer.cc b/src/file_api/file_enforcer.cc
index 9e949d0b60858998f512ead090e7b838a859dba8..049a3f96f842aaa1168c4d1739438412e6a3cd75 100644 (file)
--- a/src/file_api/file_enforcer.cc
+++ b/src/file_api/file_enforcer.cc
@@ -31,6 +31,7 @@
 #include "framework/data_bus.h"
 #include "hash/hashes.h"
 #include "hash/sfxhash.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "managers/action_manager.h"
 #include "packet_io/active.h"

diff --git a/src/file_api/file_identifier.cc b/src/file_api/file_identifier.cc
index b8966ab08d8d85d5d1d33c08cf88485698cc02ac..388a72df27238fd184136a08d3588bbbc274430a 100644 (file)
--- a/src/file_api/file_identifier.cc
+++ b/src/file_api/file_identifier.cc
@@ -33,6 +33,7 @@
 
 #include <algorithm>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "parser/parser.h"

diff --git a/src/file_api/file_mempool.cc b/src/file_api/file_mempool.cc
index 73e2d1e4cc01e50a1f5cec02674785c3788a62d1..d75577f0b90d7873b139f561e13bef00411b3145 100644 (file)
--- a/src/file_api/file_mempool.cc
+++ b/src/file_api/file_mempool.cc
@@ -25,11 +25,13 @@
  **
  */
 
+#include "file_mempool.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
 
-#include "file_mempool.h"
+#include "log/messages.h"
 #include "utils/util.h"
 
 /*This magic is used for double free detection*/

diff --git a/src/filters/detection_filter.cc b/src/filters/detection_filter.cc
index e629ed736a0a8945fb83634b43832ea258cdca8d..eee22542b0c1c651ae102a259f7c47413f044a6b 100644 (file)
--- a/src/filters/detection_filter.cc
+++ b/src/filters/detection_filter.cc
@@ -23,10 +23,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "utils/util.h"
-#include "parser/parser.h"
 #include "filters/sfthd.h"
+#include "log/messages.h"
 #include "main/thread.h"
+#include "parser/parser.h"
+#include "utils/util.h"
 
 static THREAD_LOCAL SFXHASH* detection_filter_hash = NULL;
 

diff --git a/src/helpers/process.cc b/src/helpers/process.cc
index 14598deac1fd589b115e2bdbb49a79a6ebef58b4..b1be9778cbf81834d347f044ccfabe73b08e2362 100644 (file)
--- a/src/helpers/process.cc
+++ b/src/helpers/process.cc
@@ -37,6 +37,7 @@
 
 #include <iostream>
 
+#include "log/messages.h"
 #include "main.h"
 #include "main/thread.h"
 #include "main/snort.h"

diff --git a/src/ips_options/ips_base64.cc b/src/ips_options/ips_base64.cc
index 597eaf17c43cb786a28b6d357231b89a66f30ac5..248af400d19a3632711d8339037c76da4dba73ca 100644 (file)
--- a/src/ips_options/ips_base64.cc
+++ b/src/ips_options/ips_base64.cc
@@ -28,6 +28,7 @@
 #include <ctype.h>
 #include <errno.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"

diff --git a/src/ips_options/ips_byte_extract.cc b/src/ips_options/ips_byte_extract.cc
index a22b89cde07475eb337b7af1c61df5b6d3a2fda9..516dac84513ef0b6f89480c9a068140f334d7529 100644 (file)
--- a/src/ips_options/ips_byte_extract.cc
+++ b/src/ips_options/ips_byte_extract.cc
@@ -25,6 +25,7 @@
 #endif
 
 #include "extract.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "parser/parser.h"
 #include "detection/detection_defines.h"

diff --git a/src/ips_options/ips_byte_jump.cc b/src/ips_options/ips_byte_jump.cc
index 30fd50e1e92e47137636ea2a5d60be9ce5d856ba..7fa6762b5d49fa2996bc1516d0759263afb458e4 100644 (file)
--- a/src/ips_options/ips_byte_jump.cc
+++ b/src/ips_options/ips_byte_jump.cc
@@ -75,6 +75,7 @@
 
 #include "extract.h"
 #include "ips_byte_extract.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"

diff --git a/src/ips_options/ips_byte_test.cc b/src/ips_options/ips_byte_test.cc
index 508e3f14711e3739c0dd1f85c2058e66453cddc1..7f0235f517a8610f0c91ed88a462bc413e50d80a 100644 (file)
--- a/src/ips_options/ips_byte_test.cc
+++ b/src/ips_options/ips_byte_test.cc
@@ -95,6 +95,7 @@
 
 #include "extract.h"
 #include "ips_byte_extract.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"

diff --git a/src/ips_options/ips_content.cc b/src/ips_options/ips_content.cc
index f620c3064b2e113427e401f51af62cc08c995335..d0875ec310a75eae16f0e9dc1c0ef910a6c92d32 100644 (file)
--- a/src/ips_options/ips_content.cc
+++ b/src/ips_options/ips_content.cc
@@ -28,6 +28,7 @@
 #endif
 
 #include "ips_byte_extract.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "utils/boyer_moore.h"

diff --git a/src/ips_options/ips_flags.cc b/src/ips_options/ips_flags.cc
index 4ac3ac3cca12312c6c2dd39772cf60cd9e97d56d..3df71e4dda7c58583fa1fdefc93e213148d8bb43 100644 (file)
--- a/src/ips_options/ips_flags.cc
+++ b/src/ips_options/ips_flags.cc
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"

diff --git a/src/ips_options/ips_flow.cc b/src/ips_options/ips_flow.cc
index 988268b068f2e7dd2103aafdb0345a30477d1852..144027c42164a59ed1ae1618966e4f27d54844b2 100644 (file)
--- a/src/ips_options/ips_flow.cc
+++ b/src/ips_options/ips_flow.cc
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "detection/treenodes.h"

diff --git a/src/ips_options/ips_flowbits.cc b/src/ips_options/ips_flowbits.cc
index 45fff509845eb2ccfcb658129c00eed310bdd870..89f774fb9b7e35fb513d16d60a9278f1a69cae9a 100644 (file)
--- a/src/ips_options/ips_flowbits.cc
+++ b/src/ips_options/ips_flowbits.cc
@@ -49,6 +49,7 @@
 #include <string>
 #include <forward_list>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "detection/treenodes.h"

diff --git a/src/ips_options/ips_fragbits.cc b/src/ips_options/ips_fragbits.cc
index 19d350b35ca653c002308c8239d1f790b49b244c..30b1de75bc86d71d9a0766474c4643edd2759b66 100644 (file)
--- a/src/ips_options/ips_fragbits.cc
+++ b/src/ips_options/ips_fragbits.cc
@@ -53,6 +53,7 @@
 #include <ctype.h>
 #include <string.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"

diff --git a/src/ips_options/ips_hash.cc b/src/ips_options/ips_hash.cc
index ca765989099cda7c1a96221b8f882dcd6d40cb1f..8145b24c944aaf0cabe4af65d3641b5f74203657 100644 (file)
--- a/src/ips_options/ips_hash.cc
+++ b/src/ips_options/ips_hash.cc
@@ -25,6 +25,7 @@
 #include <string>
 
 #include "ips_byte_extract.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "parser/parser.h"
 #include "parser/parse_utils.h"

diff --git a/src/ips_options/ips_ip_proto.cc b/src/ips_options/ips_ip_proto.cc
index f40fa758761616c151e8222fe1dc600b43109237..9a5c2168c36a0cfd524e72990305c6ff6dac17d2 100644 (file)
--- a/src/ips_options/ips_ip_proto.cc
+++ b/src/ips_options/ips_ip_proto.cc
@@ -27,6 +27,7 @@
 #include <errno.h>
 #include <netdb.h>
 
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
 #include "parser/parser.h"

diff --git a/src/ips_options/ips_isdataat.cc b/src/ips_options/ips_isdataat.cc
index 5e35028df6043f9da1d8f4312f98c0d4104c2858..b07442f5f260b9b7ea4bd63f47fe9fd1991bdd7c 100644 (file)
--- a/src/ips_options/ips_isdataat.cc
+++ b/src/ips_options/ips_isdataat.cc
@@ -43,6 +43,7 @@
 #include <errno.h>
 
 #include "ips_byte_extract.h"
+#include "log/messages.h"
 #include "protocols/packet.h"
 #include "parser/parser.h"
 #include "parser/mstring.h"

diff --git a/src/ips_options/ips_metadata.cc b/src/ips_options/ips_metadata.cc
index a66f5253f39fa268cfd809f0787a180f810155eb..9524101f4b604a8bc5b6e8d5027932d134bbc244 100644 (file)
--- a/src/ips_options/ips_metadata.cc
+++ b/src/ips_options/ips_metadata.cc
@@ -24,6 +24,7 @@
 #include <string>
 #include <vector>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"

diff --git a/src/ips_options/ips_pcre.cc b/src/ips_options/ips_pcre.cc
index 5cbf22c639a752fc1de80b408eef3177fd97409f..5ca3b2ac7f2aa6c5d6aee7fb5c6bf766c5baff04 100644 (file)
--- a/src/ips_options/ips_pcre.cc
+++ b/src/ips_options/ips_pcre.cc
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <pcre.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"

diff --git a/src/ips_options/ips_regex.cc b/src/ips_options/ips_regex.cc
index c5f765a69e3b81a6b3054e0b51292423878ac6b9..cacc7383f929ac4b8ae24e6c7ca3955df78cb865 100644 (file)
--- a/src/ips_options/ips_regex.cc
+++ b/src/ips_options/ips_regex.cc
@@ -34,6 +34,7 @@
 #include "detection/detection_defines.h"
 #include "detection/pattern_match_data.h"
 #include "hash/sfhashfcn.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "main/thread.h"
 #include "parser/parser.h"

diff --git a/src/ips_options/ips_replace.cc b/src/ips_options/ips_replace.cc
index 54f7c7ba5b2fe7e2090b807f8fb5cc6a3809a4dd..affce34dc0e6a9c3a7deda5e21d56f68d1fa30eb 100644 (file)
--- a/src/ips_options/ips_replace.cc
+++ b/src/ips_options/ips_replace.cc
@@ -25,6 +25,7 @@
 #include <assert.h>
 #include <string>
 
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"

diff --git a/src/ips_options/ips_sd_pattern.cc b/src/ips_options/ips_sd_pattern.cc
index e1d889bc64e1ff549d0ceb2899345c97728e3c1c..33575598ef28fd686982cd88005df36e3b925660 100644 (file)
--- a/src/ips_options/ips_sd_pattern.cc
+++ b/src/ips_options/ips_sd_pattern.cc
@@ -33,12 +33,13 @@
 #include "detection/detection_defines.h"
 #include "detection/pattern_match_data.h"
 #include "hash/sfhashfcn.h"
+#include "log/messages.h"
+#include "log/obfuscator.h"
 #include "main/snort_config.h"
 #include "main/thread.h"
 #include "parser/parser.h"
 #include "profiler/profiler.h"
 #include "sd_credit_card.h"
-#include "log/obfuscator.h"
 
 #define s_name "sd_pattern"
 #define s_help "rule option for detecting sensitive data"

diff --git a/src/ips_options/ips_session.cc b/src/ips_options/ips_session.cc
index 0bbabfd00fa39681a0b4263a4e6f12cc68807a59..97ad6878ea574266055a4e78c056287f6fd80afd 100644 (file)
--- a/src/ips_options/ips_session.cc
+++ b/src/ips_options/ips_session.cc
@@ -54,6 +54,7 @@
 
 #include <string>
 
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "protocols/packet.h"
 #include "main/snort_debug.h"

diff --git a/src/latency/packet_latency.cc b/src/latency/packet_latency.cc
index 671ce55fbbe9760224e4b676de20f3d9ff778f1e..f8d8bfbec5880286d4701fa4946bebe4ef1013eb 100644 (file)
--- a/src/latency/packet_latency.cc
+++ b/src/latency/packet_latency.cc
@@ -24,6 +24,7 @@
 #include <sstream>
 #include <vector>
 
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "main/thread.h"
 #include "protocols/packet.h"

diff --git a/src/log/log.cc b/src/log/log.cc
index 1662415146ca67e3aba15277e85c813cff92271c..0fce4c62e46e048b253615658d81b3bb13d2ccd1 100644 (file)
--- a/src/log/log.cc
+++ b/src/log/log.cc
@@ -33,11 +33,13 @@
 #include <string>
 #include <mutex>
 
-#include "log_text.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
 #include "protocols/tcp.h"
 
+#include "log_text.h"
+#include "messages.h"
+
 #define DEFAULT_DAEMON_ALERT_FILE  "alert"
 
 /* Input is packet and an nine-byte (including NULL) character array.  Results

diff --git a/src/log/log_text.cc b/src/log/log_text.cc
index 69755e3961fa9a9fb2192050930546cb6726c965..db28829fc6f6179e6da616d8ad8869be6d7aaa4b 100644 (file)
--- a/src/log/log_text.cc
+++ b/src/log/log_text.cc
@@ -44,6 +44,7 @@ extern "C" {
 #include "detection/treenodes.h"
 #include "detection/signature.h"
 #include "detection/detection_util.h"
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
 #include "packet_io/sfdaq.h"

diff --git a/src/loggers/alert_sf_socket.cc b/src/loggers/alert_sf_socket.cc
index b07d1180b9c41b4184f7bd69f4c06cc284f14f49..549302722c6cc7ae77f7fa2a8c350b0dcdefd00d 100644 (file)
--- a/src/loggers/alert_sf_socket.cc
+++ b/src/loggers/alert_sf_socket.cc
@@ -38,6 +38,7 @@
 #include "main/snort_debug.h"
 #include "framework/logger.h"
 #include "framework/module.h"
+#include "log/messages.h"
 #include "managers/event_manager.h"
 #include "detection/rules.h"
 #include "detection/treenodes.h"

diff --git a/src/loggers/alert_syslog.cc b/src/loggers/alert_syslog.cc
index 99430be059db5cb56fbb7235a6f9b8079c5ee16e..24a43e54345cbb4bb34d4a1cfa0d194b685044e7 100644 (file)
--- a/src/loggers/alert_syslog.cc
+++ b/src/loggers/alert_syslog.cc
@@ -28,6 +28,7 @@
 
 #include <string>
 
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
 #include "framework/logger.h"

diff --git a/src/loggers/log_pcap.cc b/src/loggers/log_pcap.cc
index 7165d63d3f276224b889b165a3d58333d53c265e..e6fd0e09d8f180a21e7b1aef35bbd96de5d6f206 100644 (file)
--- a/src/loggers/log_pcap.cc
+++ b/src/loggers/log_pcap.cc
@@ -37,6 +37,7 @@ extern "C" {
 
 #include <string>
 
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
 #include "framework/logger.h"

diff --git a/src/loggers/unified2.cc b/src/loggers/unified2.cc
index 680e70d09ae54788ea9d50d195af7b85b81e145b..ed2a169083d97a1c6bec66c54721f91d109c3e40 100644 (file)
--- a/src/loggers/unified2.cc
+++ b/src/loggers/unified2.cc
@@ -52,6 +52,7 @@
 #include "detection/detect.h"
 #include "parser/parser.h"
 #include "events/event.h"
+#include "log/messages.h"
 #include "log/obfuscator.h"
 #include "packet_io/active.h"
 #include "packet_io/sfdaq.h"

diff --git a/src/main.cc b/src/main.cc
index 1564debe441d107afa91d987b4d6ce4fda22ed3a..96d2eaf4a5dd6ad4f0829e44ed7faf8ca3d7dc22 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -40,6 +40,7 @@
 #include <string>
 #include <thread>
 
+#include "log/messages.h"
 #include "main/analyzer.h"
 #include "main/shell.h"
 #include "main/snort.h"

diff --git a/src/main/modules.cc b/src/main/modules.cc
index ab31db77bee7672b11c68690b852e9c0f8415fb1..e35ef0e87b30a51ca7778186bbda3f3b986a77b1 100644 (file)
--- a/src/main/modules.cc
+++ b/src/main/modules.cc
@@ -41,6 +41,7 @@
 #include "host_tracker/host_tracker_module.h"
 #include "host_tracker/host_cache_module.h"
 #include "latency/latency_module.h"
+#include "log/messages.h"
 #include "managers/module_manager.h"
 #include "managers/plugin_manager.h"
 #include "memory/memory_module.h"

diff --git a/src/main/snort.cc b/src/main/snort.cc
index 85910103dc4e791982b958214db6339bba723d21..896d487633646d50f6989ccf972b615f24652a79 100644 (file)
--- a/src/main/snort.cc
+++ b/src/main/snort.cc
@@ -52,6 +52,7 @@
 #include "ips_options/ips_flowbits.h"
 #include "latency/packet_latency.h"
 #include "latency/rule_latency.h"
+#include "log/messages.h"
 #include "managers/action_manager.h"
 #include "managers/codec_manager.h"
 #include "managers/inspector_manager.h"

diff --git a/src/main/snort_config.cc b/src/main/snort_config.cc
index ab8a51d3506b23ef96d6c23c0346d115b1b614d2..0d81edf8e083c510c3272d16efb752ab45e5e303 100644 (file)
--- a/src/main/snort_config.cc
+++ b/src/main/snort_config.cc
@@ -32,6 +32,7 @@
 #include "helpers/process.h"
 #include "ips_options/ips_pcre.h"
 #include "latency/latency_config.h"
+#include "log/messages.h"
 #include "managers/inspector_manager.h"
 #include "managers/ips_manager.h"
 #include "managers/module_manager.h"

diff --git a/src/main/snort_debug.cc b/src/main/snort_debug.cc
index 962984faab630f1eba166352da3dea7518a0e7df..b0e6ba6ceb8a6128cdf09e5fc214e93831f0aa61 100644 (file)
--- a/src/main/snort_debug.cc
+++ b/src/main/snort_debug.cc
@@ -25,6 +25,8 @@
 #include <syslog.h>
 #include <stdlib.h>
 
+#include "log/messages.h"
+
 #include "snort_types.h"
 #include "snort_config.h"
 

diff --git a/src/main/snort_module.cc b/src/main/snort_module.cc
index baad5c562f510f93b3a17c103de186f82d6f16b1..05361f7b588bcb8efb57cdc72f28eb6239d1050e 100644 (file)
--- a/src/main/snort_module.cc
+++ b/src/main/snort_module.cc
@@ -38,6 +38,7 @@
 #include "framework/base_api.h"
 #include "framework/module.h"
 #include "framework/parameter.h"
+#include "log/messages.h"
 #include "managers/module_manager.h"
 #include "managers/plugin_manager.h"
 #include "packet_io/sfdaq_config.h"

diff --git a/src/main/thread_config.cc b/src/main/thread_config.cc
index 96a396ac93645bff173889324e189480aab0cf00..01861b0fce738099e51395d5cc418376340b4881 100644 (file)
--- a/src/main/thread_config.cc
+++ b/src/main/thread_config.cc
@@ -21,6 +21,7 @@
 
 #include <hwloc.h>
 
+#include "log/messages.h"
 #include "utils/util.h"
 
 #ifdef UNIT_TEST

diff --git a/src/managers/connector_manager.cc b/src/managers/connector_manager.cc
index 0a5c1b7d8045e71ebb96a08dd523cee80ac06754..79794fc0e91c9cfafe7ed5abf84b1703fed2dfc6 100644 (file)
--- a/src/managers/connector_manager.cc
+++ b/src/managers/connector_manager.cc
@@ -25,6 +25,7 @@
 #include <utility>
 
 #include "framework/connector.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "main/snort_debug.h"
 #include "module_manager.h"

diff --git a/src/managers/module_manager.cc b/src/managers/module_manager.cc
index 547ad8eb418b2987594d8960e637606e6ac77f79..df9b4c988408642c7f71df49cf0edf09a14613ef 100644 (file)
--- a/src/managers/module_manager.cc
+++ b/src/managers/module_manager.cc
@@ -29,6 +29,7 @@
 #include <lua.hpp>
 
 #include "plugin_manager.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "main/modules.h"
 #include "main/shell.h"

diff --git a/src/mime/file_mime_process.cc b/src/mime/file_mime_process.cc
index 3cb267fc2783a54ac34e1f77f738710f6034e2d6..80fed9a430fe96120371f6b75f951aefbef36726 100644 (file)
--- a/src/mime/file_mime_process.cc
+++ b/src/mime/file_mime_process.cc
@@ -31,6 +31,7 @@
 #include "file_api/file_api.h"
 #include "file_api/file_flows.h"
 #include "framework/data_bus.h"
+#include "log/messages.h"
 #include "protocols/packet.h"
 #include "search_engines/search_tool.h"
 #include "utils/util.h"

diff --git a/src/network_inspectors/appid/appid_inspector.cc b/src/network_inspectors/appid/appid_inspector.cc
index 5027af236d4e15c6f84ea96821e67c70caca3fa9..84eaf8ad1edf38e155e7918460df2b54e49d2c7d 100644 (file)
--- a/src/network_inspectors/appid/appid_inspector.cc
+++ b/src/network_inspectors/appid/appid_inspector.cc
@@ -25,6 +25,7 @@
 #include "config.h"
 #endif
 
+#include "log/messages.h"
 #include "main/thread.h"
 #include "profiler/profiler.h"
 #include "appid_stats.h"
@@ -48,11 +49,11 @@ THREAD_LOCAL LuaDetectorManager* lua_detector_mgr;
 static void dump_appid_stats()
 {
     LogMessage("Application Identification Preprocessor:\n");
-    LogMessage("   Total packets received : %lu\n", appid_stats.packets);
-    LogMessage("  Total packets processed : %lu\n", appid_stats.processed_packets);
+    LogMessage("   Total packets received : %" PRIu64 "\n", appid_stats.packets);
+    LogMessage("  Total packets processed : %" PRIu64 "\n", appid_stats.processed_packets);
     if (thirdparty_appid_module)
         thirdparty_appid_module->print_stats();
-    LogMessage("    Total packets ignored : %lu\n", appid_stats.ignored_packets);
+    LogMessage("    Total packets ignored : %" PRIu64 "\n", appid_stats.ignored_packets);
     AppIdServiceStateDumpStats();
 }
 

diff --git a/src/network_inspectors/arp_spoof/arp_spoof.cc b/src/network_inspectors/arp_spoof/arp_spoof.cc
index 4981a5f057f2d01f85d18bd777404f00456f0ddd..eabee88631289836a8b601960cfd6bd2a50f5d4a 100644 (file)
--- a/src/network_inspectors/arp_spoof/arp_spoof.cc
+++ b/src/network_inspectors/arp_spoof/arp_spoof.cc
@@ -78,6 +78,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "detection/detect.h"

diff --git a/src/network_inspectors/binder/bind_module.cc b/src/network_inspectors/binder/bind_module.cc
index 591b44e6f0f5c90a2ebbbd3e918ae1abe885126c..8da71ddc5c31885fe2fd29b49c883de938996f6a 100644 (file)
--- a/src/network_inspectors/binder/bind_module.cc
+++ b/src/network_inspectors/binder/bind_module.cc
@@ -28,6 +28,7 @@
 #include "binding.h"
 #include "protocols/packet.h"
 #include "parser/parse_ip.h"
+#include "log/messages.h"
 #include "main/policy.h"
 #include "main/snort_config.h"
 #include "main/shell.h"

diff --git a/src/network_inspectors/normalize/normalize.cc b/src/network_inspectors/normalize/normalize.cc
index 748f9de2575d7fd66d65cb43b0f83059401c2157..097f8563906ac1f955e345434e7a67627ff4ef56 100644 (file)
--- a/src/network_inspectors/normalize/normalize.cc
+++ b/src/network_inspectors/normalize/normalize.cc
@@ -25,6 +25,7 @@
 #include "packet_io/sfdaq.h"
 #include "parser/parser.h"
 #include "profiler/profiler.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "framework/inspector.h"

diff --git a/src/network_inspectors/perf_monitor/flow_ip_tracker.cc b/src/network_inspectors/perf_monitor/flow_ip_tracker.cc
index b427247281e1c5f03bf78cde19a11e2f86ec8c29..91e6e9410c571c049e2eb59c364db6392ddbfb25 100644 (file)
--- a/src/network_inspectors/perf_monitor/flow_ip_tracker.cc
+++ b/src/network_inspectors/perf_monitor/flow_ip_tracker.cc
@@ -21,6 +21,7 @@
 #include "flow_ip_tracker.h"
 #include "perf_module.h"
 
+#include "log/messages.h"
 #include "sfip/sf_ip.h"
 #include "utils/util.h"
 

diff --git a/src/network_inspectors/perf_monitor/perf_monitor.cc b/src/network_inspectors/perf_monitor/perf_monitor.cc
index 93918f4a22426a712ed9a2d59aadec8b46d91043..6d1bcda23a0df36a35893c74a79744f9e7062931 100644 (file)
--- a/src/network_inspectors/perf_monitor/perf_monitor.cc
+++ b/src/network_inspectors/perf_monitor/perf_monitor.cc
@@ -38,6 +38,7 @@
 #include "perf_monitor.h"
 #include "perf_module.h"
 
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"

diff --git a/src/network_inspectors/port_scan/port_scan.cc b/src/network_inspectors/port_scan/port_scan.cc
index 28e0b793dff6d4219675d3873f2a5f22848529e7..862f5c7cc9aa9ee87313b18ffe0fe7b832cb530a 100644 (file)
--- a/src/network_inspectors/port_scan/port_scan.cc
+++ b/src/network_inspectors/port_scan/port_scan.cc
@@ -53,6 +53,7 @@
 #include "ps_module.h"
 
 #include "ipobj.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "managers/inspector_manager.h"
 #include "protocols/packet_manager.h"

diff --git a/src/network_inspectors/port_scan/ps_detect.cc b/src/network_inspectors/port_scan/ps_detect.cc
index 1f20ece735aa530aa3bbd242589516883e1a0cb7..367ea9cbbb0a9b0523326044769de550011a9479 100644 (file)
--- a/src/network_inspectors/port_scan/ps_detect.cc
+++ b/src/network_inspectors/port_scan/ps_detect.cc
@@ -43,6 +43,7 @@
 #include <sys/types.h>
 
 #include "ipobj.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "protocols/packet.h"
 #include "time/packet_time.h"

diff --git a/src/network_inspectors/reputation/reputation_inspect.cc b/src/network_inspectors/reputation/reputation_inspect.cc
index 6214911437270091bb4f05151f3ec8a1fcf349d4..228b877016fa361dc022cde4353c14f78a20a6ef 100644 (file)
--- a/src/network_inspectors/reputation/reputation_inspect.cc
+++ b/src/network_inspectors/reputation/reputation_inspect.cc
@@ -36,6 +36,7 @@
 #include "protocols/packet.h"
 #include "sfip/sf_ip.h"
 #include "events/event_queue.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "profiler/profiler.h"

diff --git a/src/network_inspectors/reputation/reputation_module.cc b/src/network_inspectors/reputation/reputation_module.cc
index 7077d1799ec6327036e927d7f70039710f56b583..403f2c6bf808f30d3aae4cd2cf9cd8be8aa1a25b 100644 (file)
--- a/src/network_inspectors/reputation/reputation_module.cc
+++ b/src/network_inspectors/reputation/reputation_module.cc
@@ -20,10 +20,12 @@
 
 #include "reputation_module.h"
 
-#include "utils/util.h"
 #include <assert.h>
 #include <sstream>
 
+#include "log/messages.h"
+#include "utils/util.h"
+
 #include "reputation_parse.h"
 
 using namespace std;

diff --git a/src/network_inspectors/reputation/reputation_parse.cc b/src/network_inspectors/reputation/reputation_parse.cc
index b52a313c29d40036f28c6ef8903af36c0cefc7cb..bfca10cf9611ca56241dbd071c465babb0ac3921 100644 (file)
--- a/src/network_inspectors/reputation/reputation_parse.cc
+++ b/src/network_inspectors/reputation/reputation_parse.cc
@@ -22,9 +22,11 @@
 
 #include <assert.h>
 #include <limits>
+
+#include "log/messages.h"
+#include "main/snort_debug.h"
 #include "parser/config_file.h"
 #include "utils/util.h"
-#include "main/snort_debug.h"
 
 using namespace std;
 

diff --git a/src/packet_io/active.cc b/src/packet_io/active.cc
index 43011ee29f04c257ee8646f1a877687dd0297e7e..e2ac7537bdfde45b41506842083dfe4ee7ef2e08 100644 (file)
--- a/src/packet_io/active.cc
+++ b/src/packet_io/active.cc
@@ -25,6 +25,7 @@
 
 #include "active.h"
 
+#include "log/messages.h"
 #include "managers/action_manager.h"
 #include "packet_io/sfdaq.h"
 #include "protocols/tcp.h"

diff --git a/src/packet_io/intf.cc b/src/packet_io/intf.cc
index eb255b608e689e53ac60182f4d9812a93e0f5722..11ed388a3a570c138b3c30c65eeb4a152e6b854a 100644 (file)
--- a/src/packet_io/intf.cc
+++ b/src/packet_io/intf.cc
@@ -22,6 +22,7 @@
 #include <pcap.h>
 #include <stdio.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "utils/util.h"

diff --git a/src/packet_io/sfdaq.cc b/src/packet_io/sfdaq.cc
index 55b12bdb305967e68fe23da2fb51949454e7dc5e..5d257475b2acec14aa91de817452a3902ea9bec9 100644 (file)
--- a/src/packet_io/sfdaq.cc
+++ b/src/packet_io/sfdaq.cc
@@ -35,12 +35,14 @@ extern "C" {
 #include <sfbpf_dlt.h>
 }
 
-#include "sfdaq_config.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "parser/parser.h"
 #include "protocols/vlan.h"
 #include "utils/util.h"
 
+#include "sfdaq_config.h"
+
 using namespace std;
 
 #ifdef DEFAULT_DAQ

diff --git a/src/packet_io/sfdaq_module.cc b/src/packet_io/sfdaq_module.cc
index fe1e57d8bade15a6d36bf3a5afad1833b6ecf374..c49c89943c2e95538e44a7024c548d63fb9069f6 100644 (file)
--- a/src/packet_io/sfdaq_module.cc
+++ b/src/packet_io/sfdaq_module.cc
@@ -24,9 +24,11 @@
 
 #include "sfdaq_module.h"
 
-#include "sfdaq_config.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 
+#include "sfdaq_config.h"
+
 #ifdef UNIT_TEST
 #include "catch/catch.hpp"
 #endif

diff --git a/src/packet_io/trough.cc b/src/packet_io/trough.cc
index 46b5ad6cbe8b6ee8674736a7855f8e1ede6a37df..f81bd54b136501419bb98c9863b962b88a79e011 100644 (file)
--- a/src/packet_io/trough.cc
+++ b/src/packet_io/trough.cc
@@ -25,8 +25,9 @@
 #include <algorithm>
 #include <fstream>
 
-#include "main/snort_config.h"
 #include "helpers/directory.h"
+#include "log/messages.h"
+#include "main/snort_config.h"
 
 std::vector<struct Trough::PcapReadObject> Trough::pcap_object_list;
 std::vector<std::string> Trough::pcap_queue;

diff --git a/src/parser/cmd_line.cc b/src/parser/cmd_line.cc
index b0a8f11e5ea441544ec99d704e3b9e4f18fb8108..802e1f3fc7c5a5fa57bab72328ae85e131a05394 100644 (file)
--- a/src/parser/cmd_line.cc
+++ b/src/parser/cmd_line.cc
@@ -25,6 +25,7 @@
 
 #include <string>
 
+#include "log/messages.h"
 #include "main/help.h"
 #include "main/snort_module.h"
 #include "main/snort_config.h"

diff --git a/src/parser/config_file.cc b/src/parser/config_file.cc
index 6a22883b8751864b93154c9f5dfc7e118f6143e8..aa92bdf1963d498e847957c509d4ae596fc94df3 100644 (file)
--- a/src/parser/config_file.cc
+++ b/src/parser/config_file.cc
@@ -42,6 +42,7 @@
 #include "mstring.h"
 
 #include "detection/detect.h"
+#include "log/messages.h"
 #include "main/snort.h"
 #include "main/snort_config.h"
 #include "main/snort_types.h"

diff --git a/src/parser/parse_conf.cc b/src/parser/parse_conf.cc
index df585b58826cbbc5e6dba4cae7f799a11ad1107d..451e122566874dce7f1cdee9f6c598d38433baf9 100644 (file)
--- a/src/parser/parse_conf.cc
+++ b/src/parser/parse_conf.cc
@@ -64,6 +64,7 @@
 #include "packet_io/active.h"
 #include "file_api/file_config.h"
 #include "framework/ips_option.h"
+#include "log/messages.h"
 #include "managers/action_manager.h"
 #include "actions/actions.h"
 #include "target_based/snort_protocols.h"

diff --git a/src/parser/parse_ip.cc b/src/parser/parse_ip.cc
index 124d7bc3e566546620933f5f42a99d1aec06b0aa..cdf31a027614f2230c7c392bf70b71889d56b3ae 100644 (file)
--- a/src/parser/parse_ip.cc
+++ b/src/parser/parse_ip.cc
@@ -31,6 +31,7 @@
 #include <sys/types.h>
 
 #include "parser.h"
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "sfip/sf_vartable.h"
 #include "sfip/sf_ipvar.h"

diff --git a/src/parser/parse_rule.cc b/src/parser/parse_rule.cc
index c93c5e00e9b70e5bf1ab48193b2f77dd30f3d8e5..5db2c8106de743fee6865f21595ae403a310a6a9 100644 (file)
--- a/src/parser/parse_rule.cc
+++ b/src/parser/parse_rule.cc
@@ -71,6 +71,7 @@
 #include "packet_io/active.h"
 #include "file_api/file_config.h"
 #include "framework/ips_option.h"
+#include "log/messages.h"
 #include "managers/ips_manager.h"
 #include "managers/so_manager.h"
 #include "target_based/snort_protocols.h"

diff --git a/src/parser/parse_utils.cc b/src/parser/parse_utils.cc
index 865dd1394fca8e5d3363c04ab4a0b89dec3e4d0e..dc171c682832e37343ebbbc53c2bad072ccd294e 100644 (file)
--- a/src/parser/parse_utils.cc
+++ b/src/parser/parse_utils.cc
@@ -25,6 +25,7 @@
 #include <string.h>
 
 #include "parser.h"
+#include "log/messages.h"
 #include "utils/util.h"
 
 using namespace std;

diff --git a/src/parser/parser.cc b/src/parser/parser.cc
index 23db408033368c50defcc963445bd3ade16d4a61..ac8cd6cdf00d240c6c4cd790caaa9b2a0ec12083 100644 (file)
--- a/src/parser/parser.cc
+++ b/src/parser/parser.cc
@@ -76,6 +76,7 @@
 #include "packet_io/active.h"
 #include "file_api/file_config.h"
 #include "actions/actions.h"
+#include "log/messages.h"
 #include "managers/event_manager.h"
 #include "managers/module_manager.h"
 #include "target_based/snort_protocols.h"

diff --git a/src/parser/vars.cc b/src/parser/vars.cc
index c10d162d90181eca8a870d0724d05ae851252283..4b25dab0b0c2b7fada435594bb144b062f49c54b 100644 (file)
--- a/src/parser/vars.cc
+++ b/src/parser/vars.cc
@@ -42,6 +42,7 @@
 #include "cmd_line.h"
 #include "parse_ports.h"
 
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
 #include "detection/rules.h"

diff --git a/src/ports/port_object.cc b/src/ports/port_object.cc
index a7fb2d9dd4aef29feb404e3aeb24acd44ea9ccd2..feeb821138b46fbbecf5f2e90efa169a22e465df 100644 (file)
--- a/src/ports/port_object.cc
+++ b/src/ports/port_object.cc
@@ -28,6 +28,7 @@
 
 #include "port_item.h"
 #include "port_utils.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "main/snort_debug.h"

diff --git a/src/ports/port_object2.cc b/src/ports/port_object2.cc
index 4c0921d7771ee17b670f34b96a047a86e7a139d0..979169754f285c9afc09ae067306ce5d00e1c7fd 100644 (file)
--- a/src/ports/port_object2.cc
+++ b/src/ports/port_object2.cc
@@ -35,6 +35,7 @@
 #include "port_table.h"
 #include "port_utils.h"
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "main/snort_debug.h"

diff --git a/src/ports/port_table.cc b/src/ports/port_table.cc
index 2d088895f3d11cf541e93446e60c4698cec96c21..170e619fe0277cefa69e3bbcc4422d1df28729f4 100644 (file)
--- a/src/ports/port_table.cc
+++ b/src/ports/port_table.cc
@@ -35,6 +35,7 @@
 #include "port_object2.h"
 #include "port_utils.h"
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "main/snort_debug.h"

diff --git a/src/ports/rule_port_tables.cc b/src/ports/rule_port_tables.cc
index 65893b9cf10def43a88bb487b9fe025cc5be0820..9eda7a30f747146e644831e69b04573d5d80baa8 100644 (file)
--- a/src/ports/rule_port_tables.cc
+++ b/src/ports/rule_port_tables.cc
@@ -21,6 +21,7 @@
 
 #include "port_object.h"
 #include "port_table.h"
+#include "log/messages.h"
 #include "parser/parser.h"
 #include "utils/util.h"
 

diff --git a/src/search_engines/acsmx2.cc b/src/search_engines/acsmx2.cc
index 88e4a9d6300f68d42733827499a6e42e7548f9d7..ba300003bbfa6da53f5e63bc036549e4fe7f50e4 100644 (file)
--- a/src/search_engines/acsmx2.cc
+++ b/src/search_engines/acsmx2.cc
@@ -130,6 +130,7 @@
 #include "main/snort_config.h"
 #endif
 
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "main/snort_types.h"
 #include "utils/stats.h"

diff --git a/src/search_engines/bnfa_search.cc b/src/search_engines/bnfa_search.cc
index 763283b9be04bd93402ece9927bc25b168d04d91..0cdac331c8e5f1944fd1a5d74ec7e327cd58cd33 100644 (file)
--- a/src/search_engines/bnfa_search.cc
+++ b/src/search_engines/bnfa_search.cc
@@ -154,6 +154,7 @@
 #include <list>
 
 #include "search_common.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "utils/stats.h"

diff --git a/src/service_inspectors/back_orifice/back_orifice.cc b/src/service_inspectors/back_orifice/back_orifice.cc
index e3eaf93ce557406e710cc794f809f55c3159fe70..4b25f7a9fe3117e0545c3168ad932a142ff48967 100644 (file)
--- a/src/service_inspectors/back_orifice/back_orifice.cc
+++ b/src/service_inspectors/back_orifice/back_orifice.cc
@@ -115,6 +115,7 @@
 #include <ctype.h>
 #include <string.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"

diff --git a/src/service_inspectors/dce_rpc/dce_smb_module.cc b/src/service_inspectors/dce_rpc/dce_smb_module.cc
index cb37b49703365358a42c557d820e335686204f58..e15d41f4b8ba7546097370cac35acdba4faa4e5d 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb_module.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb_module.cc
@@ -20,6 +20,7 @@
 
 #include "dce_smb_module.h"
 
+#include "log/messages.h"
 #include "main/snort_config.h"
 
 #include "dce_smb.h"

diff --git a/src/service_inspectors/dnp3/dnp3_module.cc b/src/service_inspectors/dnp3/dnp3_module.cc
index e11362e75461e20ea3fb313f44e0fcb776ab1538..b49643b87c9469a3cfb8a120e3d97501ab41f21c 100644 (file)
--- a/src/service_inspectors/dnp3/dnp3_module.cc
+++ b/src/service_inspectors/dnp3/dnp3_module.cc
@@ -20,6 +20,7 @@
 
 #include "dnp3_module.h"
 #include "dnp3.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 
 using namespace std;

diff --git a/src/service_inspectors/ftp_telnet/ftp_parse.cc b/src/service_inspectors/ftp_telnet/ftp_parse.cc
index 402ae2ea9e840e1c61ae58f2f1971ba50331f6d5..8fa9519e21df261977fc55ab4eb7b51742d8b88c 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp_parse.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_parse.cc
@@ -33,6 +33,7 @@
 #include "ftp_cmd_lookup.h"
 #include "ftpp_return_codes.h"
 
+#include "log/messages.h"
 #include "sfip/sf_ip.h"
 #include "utils/util.h"
 

diff --git a/src/service_inspectors/imap/imap_module.cc b/src/service_inspectors/imap/imap_module.cc
index f30aa984aa114595506b15bc9c9c7119eae7d479..5c5a3d86bc6cccff01370f8eb82326aa103d7c3d 100644 (file)
--- a/src/service_inspectors/imap/imap_module.cc
+++ b/src/service_inspectors/imap/imap_module.cc
@@ -19,8 +19,11 @@
 // imap_module.cc author Bhagyashree Bantwal <bbantwal@cisco.com>
 
 #include "imap_module.h"
+
 #include <assert.h>
 #include <sstream>
+
+#include "log/messages.h"
 #include "main/snort_config.h"
 
 using namespace std;

diff --git a/src/service_inspectors/pop/pop_module.cc b/src/service_inspectors/pop/pop_module.cc
index f180b7156b3bba90372ad67c7c4db25fdd134667..9cc434dbfef397a9c2e79ae4ce65197994c1c71a 100644 (file)
--- a/src/service_inspectors/pop/pop_module.cc
+++ b/src/service_inspectors/pop/pop_module.cc
@@ -19,8 +19,11 @@
 // pop_module.cc author Bhagyashree Bantwal <bbantwal@cisco.com>
 
 #include "pop_module.h"
+
 #include <assert.h>
 #include <sstream>
+
+#include "log/messages.h"
 #include "main/snort_config.h"
 
 using namespace std;

diff --git a/src/service_inspectors/rpc_decode/rpc_decode.cc b/src/service_inspectors/rpc_decode/rpc_decode.cc
index 0d03ed6380a022707413d1a0a82688b39e3510eb..bb65d15c43da38f75c5ddeb8a70d1af7c55a6b54 100644 (file)
--- a/src/service_inspectors/rpc_decode/rpc_decode.cc
+++ b/src/service_inspectors/rpc_decode/rpc_decode.cc
@@ -44,6 +44,7 @@
 #include <ctype.h>
 
 #include "parser/parser.h"
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "detection/detect.h"
 #include "log/log.h"

diff --git a/src/service_inspectors/sip/sip.cc b/src/service_inspectors/sip/sip.cc
index f181b6c9003e86c5730eeb53fc938b82e7fc6e6a..3a9c09ece3946b87635cb73d6607a1c26754d06c 100644 (file)
--- a/src/service_inspectors/sip/sip.cc
+++ b/src/service_inspectors/sip/sip.cc
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"

diff --git a/src/service_inspectors/sip/sip_config.cc b/src/service_inspectors/sip/sip_config.cc
index f184944324234e85dce5b5f0d37bbe7413bc4e4c..f42be8e3dea44fa4657c98adf5a60549b66a2a63 100644 (file)
--- a/src/service_inspectors/sip/sip_config.cc
+++ b/src/service_inspectors/sip/sip_config.cc
@@ -21,9 +21,10 @@
 
 #include "sip_config.h"
 
-#include "utils/util.h"
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "parser/parser.h"
+#include "utils/util.h"
 
 #define SIP_SEPERATORS       "()<>@,;:\\/[]?={}\" "
 

diff --git a/src/service_inspectors/smtp/smtp.cc b/src/service_inspectors/smtp/smtp.cc
index f0d132480693cc500482764c84fec1c21a34f829..902260ec68faad7c917a82f206bafdc2b4d1c56e 100644 (file)
--- a/src/service_inspectors/smtp/smtp.cc
+++ b/src/service_inspectors/smtp/smtp.cc
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "profiler/profiler.h"

diff --git a/src/service_inspectors/smtp/smtp_module.cc b/src/service_inspectors/smtp/smtp_module.cc
index 4d4bd544876e0a871cd70306ee10ce4242ff13a9..898e930c1eb28631fffe80b7112bbc0533e37dbe 100644 (file)
--- a/src/service_inspectors/smtp/smtp_module.cc
+++ b/src/service_inspectors/smtp/smtp_module.cc
@@ -19,8 +19,11 @@
 // smtp_module.cc author Bhagyashree Bantwal <bbantwal@cisco.com>
 
 #include "smtp_module.h"
+
 #include <assert.h>
 #include <sstream>
+
+#include "log/messages.h"
 #include "main/snort_config.h"
 
 using namespace std;

diff --git a/src/stream/ip/ip_defrag.cc b/src/stream/ip/ip_defrag.cc
index e19b52eeb4951f93017d46b029c747eecaac983b..cc7cdc2855e5da0e4ef1d30fef2b14cece0e3dec 100644 (file)
--- a/src/stream/ip/ip_defrag.cc
+++ b/src/stream/ip/ip_defrag.cc
@@ -87,6 +87,7 @@
 #include "protocols/layer.h"
 #include "protocols/ipv4_options.h"
 #include "protocols/packet_manager.h"
+#include "log/messages.h"
 #include "main/snort.h"
 #include "main/snort_debug.h"
 #include "profiler/profiler.h"

diff --git a/src/stream/tcp/tcp_stream_config.cc b/src/stream/tcp/tcp_stream_config.cc
index b76b4ef62ac323ba580ed49fb3b72a513ebd7c3a..7c77b854a6d1cef332cc2124d71e11c57bc088c1 100644 (file)
--- a/src/stream/tcp/tcp_stream_config.cc
+++ b/src/stream/tcp/tcp_stream_config.cc
@@ -19,6 +19,7 @@
 // tcp_stream_config.cc author davis mcpherson <davmcphe@@cisco.com>
 // Created on: Oct 22, 2015
 
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "tcp_stream_config.h"
 

diff --git a/src/target_based/sftarget_reader.cc b/src/target_based/sftarget_reader.cc
index 368c13164f98b9d85e6736714672145099a5aad3..c42334d99f11f0526169993ddd0116ecea01a689 100644 (file)
--- a/src/target_based/sftarget_reader.cc
+++ b/src/target_based/sftarget_reader.cc
@@ -41,13 +41,14 @@
 #include "sftarget_hostentry.h"
 #include "sftarget_data.h"
 
+#include "hash/sfxhash.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "main/snort_debug.h"
 #include "parser/parser.h"
-#include "hash/sfxhash.h"
+#include "utils/stats.h"
 #include "utils/util.h"
 #include "utils/util_net.h"
-#include "utils/stats.h"
 #include "sfip/sf_ip.h"
 #include "sfrt/sfrt.h"
 

diff --git a/src/target_based/snort_protocols.cc b/src/target_based/snort_protocols.cc
index 1a7b1cb04bfb9085e9c4546db982a4ee4d32bccb..03171e89f6bdfcf0dd1effa73d9656cbbd8e2108 100644 (file)
--- a/src/target_based/snort_protocols.cc
+++ b/src/target_based/snort_protocols.cc
@@ -26,9 +26,10 @@
 #include <vector>
 
 #include "hash/sfghash.h"
+#include "log/messages.h"
 #include "main/snort_debug.h"
-#include "utils/util.h"
 #include "stream/stream.h"
+#include "utils/util.h"
 
 #include "sftarget_reader.h"
 #include "sftarget_hostentry.h"

diff --git a/src/utils/stats.cc b/src/utils/stats.cc
index 32e43df7e4d472f02e9445a0c7bc1683c80c1e71..75a1862b589fdeef9c3f4adbd750ba51dc86e486 100644 (file)
--- a/src/utils/stats.cc
+++ b/src/utils/stats.cc
@@ -24,6 +24,7 @@
 #endif
 
 #include "util.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "helpers/process.h"
 #include "packet_io/sfdaq.h"

diff --git a/src/utils/util.cc b/src/utils/util.cc
index 9f09a00af76ac89fee382389e0912b036ea70fda..a13361fb76f70f1c456b925580565c1af462199f 100644 (file)
--- a/src/utils/util.cc
+++ b/src/utils/util.cc
@@ -24,28 +24,16 @@
 #include "config.h"
 #endif
 
-#include <assert.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <fnmatch.h>
 #include <grp.h>
-#include <limits.h>
 #include <luajit.h>
 #include <netdb.h>
 #include <openssl/crypto.h>
 #include <pcap.h>
 #include <pcre.h>
 #include <pwd.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <string.h>
-#include <syslog.h>
-#include <time.h>
-#include <unistd.h>
+#include <sys/file.h>
 #include <zlib.h>
 
-
 #ifdef HAVE_LZMA
 #include <lzma.h>
 #endif
@@ -54,21 +42,18 @@
 #include <hs_compile.h>
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/resource.h>
+extern "C" {
+#include <daq.h>
+}
+
+#include <fstream>
+#include <sstream>
 
-#include "sflsq.h"
+#include "log/messages.h"
+#include "main/build.h"
 #include "main/snort_config.h"
 #include "main/snort_debug.h"
-#include "main/snort_types.h"
-#include "main/build.h"
-#include "parser/parser.h"
 #include "packet_io/sfdaq.h"
-#include "packet_io/active.h"
-#include "ips_options/ips_pcre.h"
-#include "time/packet_time.h"
-#include "time/timersub.h"
 
 #ifdef PATH_MAX
 #define PATH_MAX_UTIL PATH_MAX
@@ -126,6 +111,7 @@ int DisplayBanner()
     LogMessage("           Copyright (C) 2014-2016 Cisco and/or its affiliates."
                            " All rights reserved.\n");
     LogMessage("           Copyright (C) 1998-2013 Sourcefire, Inc., et al.\n");
+    LogMessage("           Using DAQ version %s\n", daq_version_string());
 #ifdef HAVE_PCAP_LIB_VERSION
     LogMessage("           Using %s\n", pcap_lib_version());
 #endif

diff --git a/src/utils/util.h b/src/utils/util.h
index 10265c471d489f6ad042911271632b9615e21e06..52bb09b6e3cbfdbf43c100e389eac979143ada4f 100644 (file)
--- a/src/utils/util.h
+++ b/src/utils/util.h
@@ -30,15 +30,10 @@
 #include "config.h"
 #endif
 
-#include <sys/time.h>
-#include <sys/types.h>
-#include <stdlib.h>
 #include <errno.h>
-#include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-#include <fstream>
-#include <sstream>
+#include <unistd.h>
 
 #if defined(__linux__)
 #include <sys/syscall.h>
@@ -47,7 +42,6 @@
 #include <string>
 
 #include "main/snort_types.h"
-#include "log/messages.h"
 
 #define SNORT_SNPRINTF_SUCCESS 0
 #define SNORT_SNPRINTF_TRUNCATION 1