Merge pull request #649 in SNORT/snort3 from dce_includes to master

Squashed commit of the following:

commit 5bf0a396155c01562d168fad34b7cff4f54e76f8
Author: Michael Altizer <mialtize@cisco.com>
Date:   Fri Sep 30 14:01:39 2016 -0400

    dce_rpc: Clean up header inclusions

diff --git a/src/service_inspectors/dce_rpc/dce_co.cc b/src/service_inspectors/dce_rpc/dce_co.cc
index 1bae2dd262c61d9d07f81f750c872b95133aa158..14556621738b3508fa1ad9c94b7d8a4722c0ec55 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_co.cc
+++ b/src/service_inspectors/dce_rpc/dce_co.cc
@@ -20,17 +20,15 @@
 // based on work by Todd Wease
 
 #include "dce_co.h"
-#include "dce_tcp.h"
+
+#include "main/snort_debug.h"
+#include "utils/util.h"
+
 #include "dce_smb.h"
-#include "dce_tcp_module.h"
 #include "dce_smb_module.h"
-#include "dce_list.h"
-#include "dce_utils.h"
+#include "dce_tcp.h"
+#include "dce_tcp_module.h"
 #include "dce_smb_utils.h"
-#include "log/messages.h"
-#include "main/snort_debug.h"
-#include "utils/util.h"
-#include  <assert.h>
 
 THREAD_LOCAL int co_reassembled = 0;
 

diff --git a/src/service_inspectors/dce_rpc/dce_co.h b/src/service_inspectors/dce_rpc/dce_co.h
index 05e557f9c4003a4913e3f2dfcb5d3a46cd7fd762..23c95be5b95719c2b54425d79db42ab7b70ff7e4 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_co.h
+++ b/src/service_inspectors/dce_rpc/dce_co.h
@@ -24,7 +24,6 @@
 
 #include "dce_common.h"
 #include "dce_list.h"
-#include "dce_utils.h"
 
 #define DCE2_CO_BAD_MAJOR_VERSION           27
 #define DCE2_CO_BAD_MINOR_VERSION           28

diff --git a/src/service_inspectors/dce_rpc/dce_common.cc b/src/service_inspectors/dce_rpc/dce_common.cc
index 41a5b32b0965210c2937222503d5c8d332cfe3f0..a4b37290771b173922b05932fdeab307126a08f1 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_common.cc
+++ b/src/service_inspectors/dce_rpc/dce_common.cc
@@ -19,24 +19,15 @@
 // dce_common.cc author Rashmi Pitre <rrp@cisco.com>
 
 #include "dce_common.h"
-#include "dce_tcp.h"
-#include "dce_smb.h"
-#include "dce_co.h"
-#include "dce_smb_utils.h"
-#include "framework/base_api.h"
-#include "framework/module.h"
-#include "flow/flow.h"
-#include "log/messages.h"
-#include "main/snort_debug.h"
+
 #include "detection/detect.h"
 #include "ips_options/extract.h"
-#include "protocols/packet_manager.h"
-#include "events/event_queue.h"
-#include "framework/codec.h"
-#include "main/snort.h"
-#include "framework/endianness.h"
+#include "log/messages.h"
 #include "utils/safec.h"
 
+#include "dce_smb_utils.h"
+#include "dce_tcp.h"
+
 THREAD_LOCAL int dce2_detected = 0;
 THREAD_LOCAL DCE2_CStack* dce2_pkt_stack = nullptr;
 THREAD_LOCAL int dce2_inspector_instances = 0;

diff --git a/src/service_inspectors/dce_rpc/dce_common.h b/src/service_inspectors/dce_rpc/dce_common.h
index 6ec2f94c9dc151f9f7069aba5b4107fa87edd024..111cbff6962f72aa673025d294a95fd50145bd60 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_common.h
+++ b/src/service_inspectors/dce_rpc/dce_common.h
@@ -21,13 +21,12 @@
 #ifndef DCE_COMMON_H
 #define DCE_COMMON_H
 
-#include "dce_utils.h"
-#include "dce_list.h"
-#include "main/snort_types.h"
-#include "framework/module.h"
-#include "framework/inspector.h"
-#include "protocols/packet.h"
 #include "events/event_queue.h"
+#include "framework/counts.h"
+#include "framework/value.h"
+#include "protocols/packet.h"
+
+#include "dce_list.h"
 
 extern const InspectApi dce2_smb_api;
 extern const InspectApi dce2_tcp_api;

diff --git a/src/service_inspectors/dce_rpc/dce_list.cc b/src/service_inspectors/dce_rpc/dce_list.cc
index a7aaff805a7503ca60ea79999b1121db85fa99e5..b7adaaee136ffca7834a66d684ec72e471a375f7 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_list.cc
+++ b/src/service_inspectors/dce_rpc/dce_list.cc
@@ -26,10 +26,9 @@
  ****************************************************************************/
 
 #include "dce_list.h"
-#include "dce_utils.h"
 
-#include "utils/util.h"
 #include "main/snort_debug.h"
+#include "utils/util.h"
 
 /********************************************************************
  * Private function prototyes

diff --git a/src/service_inspectors/dce_rpc/dce_smb.cc b/src/service_inspectors/dce_rpc/dce_smb.cc
index 4c6f3127c598f9584e6e0f92941f9298873bd18b..4d2522c46d7af81415e0f6f39f8af5154accb8bf 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb.cc
@@ -19,17 +19,18 @@
 // dce_smb.cc author Rashmi Pitre <rrp@cisco.com>
 
 #include "dce_smb.h"
-#include "dce_smb2.h"
+
+#include "detection/detect.h"
+#include "file_api/file_service.h"
+#include "protocols/packet.h"
+#include "utils/util.h"
+
+#include "dce_smb_module.h"
 #include "dce_smb_utils.h"
 #include "dce_smb_paf.h"
-#include "dce_smb_module.h"
 #include "dce_smb_commands.h"
 #include "dce_smb_transaction.h"
-#include "dce_list.h"
-#include "main/snort_debug.h"
-#include "file_api/file_service.h"
-#include "utils/util.h"
-#include "detection/detect.h"
+#include "dce_smb2.h"
 
 THREAD_LOCAL int dce2_smb_inspector_instances = 0;
 
@@ -2232,7 +2233,7 @@ static void DCE2_Smb1Process(DCE2_SmbSsnData* ssd)
 }
 
 // This is the main entry point for SMB processing
-void DCE2_SmbProcess(DCE2_SmbSsnData* ssd)
+static void DCE2_SmbProcess(DCE2_SmbSsnData* ssd)
 {
     if (DCE2_GcIsLegacyMode((dce2SmbProtoConf*)ssd->sd.config))
     {

diff --git a/src/service_inspectors/dce_rpc/dce_smb.h b/src/service_inspectors/dce_rpc/dce_smb.h
index 6c22ab3b02e5b5b20188c53c969e42991da76cb7..53802955f4c69c925e425b41876d961abe327a4d 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb.h
+++ b/src/service_inspectors/dce_rpc/dce_smb.h
@@ -22,11 +22,11 @@
 #ifndef DCE_SMB_H
 #define DCE_SMB_H
 
-#include "dce_common.h"
-#include "dce_co.h"
-#include "protocols/packet.h"
-#include "profiler/profiler.h"
 #include "framework/counts.h"
+#include "protocols/packet.h"
+#include "profiler/profiler_defs.h"
+
+#include "dce_co.h"
 
 #define DCE2_SMB_NAME "dce_smb"
 #define DCE2_SMB_HELP "dce over smb inspection"

diff --git a/src/service_inspectors/dce_rpc/dce_smb2.cc b/src/service_inspectors/dce_rpc/dce_smb2.cc
index 51e1a344ae66eb9bd146fbb21ba9ced8fc406f44..0aff359b3719cff967100b37e87dbd403fc9036b 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb2.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb2.cc
@@ -20,13 +20,13 @@
 // Author(s):  Hui Cao <huica@cisco.com>
 
 #include "dce_smb2.h"
-#include "dce_list.h"
-#include "dce_smb_module.h"
-#include "dce_smb_utils.h"
+
 #include "detection/detection_util.h"
-#include "main/snort_debug.h"
 #include "file_api/file_flows.h"
 
+#include "dce_smb_module.h"
+#include "dce_smb_utils.h"
+
 #define   UNKNOWN_FILE_SIZE                  ~0
 
 // FIXIT-L port fileCache related code along with

diff --git a/src/service_inspectors/dce_rpc/dce_smb2.h b/src/service_inspectors/dce_rpc/dce_smb2.h
index 70e63fff385a79ad9888995919b36f73803c4785..2848fbcf3e567f8bf931bd546b9d4e952ff3f225 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb2.h
+++ b/src/service_inspectors/dce_rpc/dce_smb2.h
@@ -23,7 +23,6 @@
 #define _DCE_SMB2_H_
 
 #include "dce_smb.h"
-#include "dce_utils.h"
 
 #define SMB2_FLAGS_ASYNC_COMMAND  0x00000002
 

diff --git a/src/service_inspectors/dce_rpc/dce_smb_commands.cc b/src/service_inspectors/dce_rpc/dce_smb_commands.cc
index be047ad7e7cada3e742e5eec02ab9df36f5b60dd..b76167b805b9904f637e9bc0f355f6b79572784c 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb_commands.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb_commands.cc
@@ -22,12 +22,12 @@
 // Smb commands processing
 
 #include "dce_smb_commands.h"
-#include "dce_smb_transaction_utils.h"
-#include "dce_smb_module.h"
 
 #include "main/snort_debug.h"
 #include "utils/util.h"
-#include "detection/detect.h"
+
+#include "dce_smb_module.h"
+#include "dce_smb_transaction_utils.h"
 
 #define SMB_DIALECT_NT_LM_012       "NT LM 0.12"  // NT LAN Manager
 

diff --git a/src/service_inspectors/dce_rpc/dce_smb_module.cc b/src/service_inspectors/dce_rpc/dce_smb_module.cc
index 848cb95bf6d5675bb51c351814915d3ce62c3dc3..cb37b49703365358a42c557d820e335686204f58 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb_module.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb_module.cc
@@ -19,12 +19,11 @@
 // dce_smb_module.cc author Rashmi Pitre <rrp@cisco.com>
 
 #include "dce_smb_module.h"
-#include "dce_smb.h"
-#include "dce_common.h"
-#include "dce_co.h"
 
 #include "main/snort_config.h"
 
+#include "dce_smb.h"
+
 using namespace std;
 
 static const PegInfo dce2_smb_pegs[] =

diff --git a/src/service_inspectors/dce_rpc/dce_smb_paf.cc b/src/service_inspectors/dce_rpc/dce_smb_paf.cc
index fdf4416298c2927fbf19e6214091b7bee22cb1e4..c604ce06f14039be9cd64770d174f2ffc87a92d2 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb_paf.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb_paf.cc
@@ -20,10 +20,10 @@
 // based on work by Todd Wease
 
 #include "dce_smb_paf.h"
-#include "dce_smb.h"
-#include "dce_common.h"
+
 #include "main/snort_debug.h"
-#include "protocols/packet.h"
+
+#include "dce_smb.h"
 
 /*********************************************************************
  * Function: DCE2_PafSmbIsValidNetbiosHdr()

diff --git a/src/service_inspectors/dce_rpc/dce_smb_paf.h b/src/service_inspectors/dce_rpc/dce_smb_paf.h
index ba5f16f7215e397d38f9f2720dfc66a2aae6aa09..2cfa435c2bd247db0d211c0d05f1b4f9606120f2 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb_paf.h
+++ b/src/service_inspectors/dce_rpc/dce_smb_paf.h
@@ -22,7 +22,6 @@
 #ifndef DCE_SMB_PAF_H
 #define DCE_SMB_PAF_H
 
-#include "main/snort_types.h"
 #include "stream/stream_splitter.h"
 
 #define DCE2_SMB_PAF_SHIFT(x64, x8) { x64 <<= 8; x64 |= (uint64_t)x8; }

diff --git a/src/service_inspectors/dce_rpc/dce_smb_transaction.cc b/src/service_inspectors/dce_rpc/dce_smb_transaction.cc
index 1b012d464ebbabf1e2c9ec2ec00846c520e1537f..bb76165b24b3b0e09b45fa03789d207febe5cf17 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb_transaction.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb_transaction.cc
@@ -22,13 +22,10 @@
 // Smb transaction commands processing
 
 #include "dce_smb_transaction.h"
-#include "dce_smb_transaction_utils.h"
-#include "dce_smb_utils.h"
-#include "dce_smb_module.h"
 
 #include "main/snort_debug.h"
-#include "utils/util.h"
-#include "detection/detect.h"
+
+#include "dce_smb_transaction_utils.h"
 
 #define DCE2_SMB_TRANS__NONE    0x00
 #define DCE2_SMB_TRANS__DATA    0x01

diff --git a/src/service_inspectors/dce_rpc/dce_smb_transaction_utils.cc b/src/service_inspectors/dce_rpc/dce_smb_transaction_utils.cc
index 1079da4ff032fb55743c0e7a43dc541ddf46f060..cd4dcf5b96a734b44b3e702fda8753dc8a2a7541 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb_transaction_utils.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb_transaction_utils.cc
@@ -21,13 +21,9 @@
 
 // Smb transaction commands utils
 
-#include "dce_smb.h"
-#include "dce_utils.h"
-#include "dce_smb_module.h"
+#include "dce_smb_transaction_utils.h"
 
 #include "main/snort_debug.h"
-#include "utils/util.h"
-#include "detection/detect.h"
 
 #define TRANS_NM_PIPE_0       (0)
 #define TRANS_NM_PIPE_1       (TRANS_NM_PIPE_0+7)

diff --git a/src/service_inspectors/dce_rpc/dce_smb_utils.cc b/src/service_inspectors/dce_rpc/dce_smb_utils.cc
index bb3d2444109fb725f265f8497e3a3f37b82955ef..93aaa608a6f4c6eb04df8f8510e29ac776712eaf 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb_utils.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb_utils.cc
@@ -19,16 +19,13 @@
 // dce_smb_utils.cc author Maya Dagon <mdagon@cisco.com>
 // based on work by Todd Wease
 
-#include "dce_smb.h"
 #include "dce_smb_utils.h"
-#include "dce_smb_module.h"
-#include "dce_list.h"
-#include "main/snort_debug.h"
-#include "utils/util.h"
-#include "detection/detect.h"
-#include "file_api/file_api.h"
-#include "file_api/file_flows.h"
+
 #include "detection/detection_util.h"
+#include "file_api/file_flows.h"
+#include "utils/util.h"
+
+#include "dce_smb_module.h"
 
 /********************************************************************
  * Private function prototypes

diff --git a/src/service_inspectors/dce_rpc/dce_tcp.cc b/src/service_inspectors/dce_rpc/dce_tcp.cc
index 45c7828d37c0af8e0e7568a9538982acd48a79c6..1e54c2fb9678fbd58c21a54c03e25352cae7a233 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_tcp.cc
+++ b/src/service_inspectors/dce_rpc/dce_tcp.cc
@@ -20,15 +20,13 @@
 // based on work by Todd Wease
 
 #include "dce_tcp.h"
-#include "dce_tcp_paf.h"
-#include "dce_tcp_module.h"
-#include "dce_co.h"
-#include "main/snort_debug.h"
+
 #include "detection/detect.h"
-#include "log/messages.h"
-#include "protocols/packet_manager.h"
 #include "utils/util.h"
 
+#include "dce_tcp_module.h"
+#include "dce_tcp_paf.h"
+
 Dce2TcpFlowData::Dce2TcpFlowData() : FlowData(flow_id)
 {
 }

diff --git a/src/service_inspectors/dce_rpc/dce_tcp.h b/src/service_inspectors/dce_rpc/dce_tcp.h
index a4b9159e25b441bf68b39c81f3f6483781a521f5..036ac7c38ca1fff81db6ea6f790def18a0e4ee79 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_tcp.h
+++ b/src/service_inspectors/dce_rpc/dce_tcp.h
@@ -22,10 +22,9 @@
 #ifndef DCE_TCP_H
 #define DCE_TCP_H
 
+#include "profiler/profiler_defs.h"
+
 #include "dce_co.h"
-#include "protocols/packet.h"
-#include "profiler/profiler.h"
-#include "framework/counts.h"
 
 #define DCE2_TCP_NAME "dce_tcp"
 #define DCE2_TCP_HELP "dce over tcp inspection"

diff --git a/src/service_inspectors/dce_rpc/dce_tcp_module.cc b/src/service_inspectors/dce_rpc/dce_tcp_module.cc
index 30f82d57b2c92e285405cb040d9b8e2faffb0a8c..f892185b54f760b0ec3c66acee9c35d142e9f901 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_tcp_module.cc
+++ b/src/service_inspectors/dce_rpc/dce_tcp_module.cc
@@ -19,10 +19,10 @@
 // dce_tcp_module.cc author Rashmi Pitre <rrp@cisco.com>
 
 #include "dce_tcp_module.h"
+
+#include "log/messages.h"
+
 #include "dce_tcp.h"
-#include "dce_common.h"
-#include "main/snort_config.h"
-#include "dce_co.h"
 
 using namespace std;
 

diff --git a/src/service_inspectors/dce_rpc/dce_tcp_paf.cc b/src/service_inspectors/dce_rpc/dce_tcp_paf.cc
index 24f098a5f8c81191bd04137958c20522cc4d6681..e2c045406bbaa5ca5128b790679320388b2e94c7 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_tcp_paf.cc
+++ b/src/service_inspectors/dce_rpc/dce_tcp_paf.cc
@@ -20,10 +20,11 @@
 // based on work by Todd Wease
 
 #include "dce_tcp_paf.h"
-#include "dce_tcp.h"
-#include "dce_common.h"
+
 #include "main/snort_debug.h"
 
+#include "dce_tcp.h"
+
 /*********************************************************************
  * Function: dce2_tcp_paf()
  *

diff --git a/src/service_inspectors/dce_rpc/dce_tcp_paf.h b/src/service_inspectors/dce_rpc/dce_tcp_paf.h
index 9f6c775afbae241893004dc49c3a06af3403d802..315833b9afafa9084094dd3ff1d8c185d04218aa 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_tcp_paf.h
+++ b/src/service_inspectors/dce_rpc/dce_tcp_paf.h
@@ -23,7 +23,6 @@
 #define DCE_TCP_PAF_H
 
 #include "dce_common.h"
-#include "main/snort_types.h"
 #include "stream/stream_splitter.h"
 
 #define DCE2_DEBUG__PAF_START_MSG_TCP  "DCE/RPC over TCP PAF ====================================="

diff --git a/src/service_inspectors/dce_rpc/dce_udp.cc b/src/service_inspectors/dce_rpc/dce_udp.cc
index 984561e04f1587dabec4b1710b3538425f78573a..284e3c176224e7515daf00397e4f7495ab503d9a 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_udp.cc
+++ b/src/service_inspectors/dce_rpc/dce_udp.cc
@@ -20,12 +20,10 @@
 // based on work by Todd Wease
 
 #include "dce_udp.h"
-#include "dce_udp_module.h"
-#include "main/snort_debug.h"
+
 #include "detection/detect.h"
-#include "log/messages.h"
-#include "protocols/packet_manager.h"
-#include "utils/util.h"
+
+#include "dce_udp_module.h"
 
 THREAD_LOCAL int dce2_udp_inspector_instances = 0;
 
@@ -40,7 +38,7 @@ THREAD_LOCAL ProfileStats dce2_udp_pstat_cl_acts;
 THREAD_LOCAL ProfileStats dce2_udp_pstat_cl_frag;
 THREAD_LOCAL ProfileStats dce2_udp_pstat_cl_reass;
 
-void DCE2_ClCleanTracker(DCE2_ClTracker* clt)
+static void DCE2_ClCleanTracker(DCE2_ClTracker* clt)
 {
     if (clt == nullptr)
         return;

diff --git a/src/service_inspectors/dce_rpc/dce_udp.h b/src/service_inspectors/dce_rpc/dce_udp.h
index c084c16dd5b84b149893fa075e61950386211c2b..bfefeafa1713145ba5471aef506e867b5e0dc4b7 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_udp.h
+++ b/src/service_inspectors/dce_rpc/dce_udp.h
@@ -22,11 +22,9 @@
 #ifndef DCE_UDP_H
 #define DCE_UDP_H
 
+#include "profiler/profiler_defs.h"
+
 #include "dce_common.h"
-#include "dce_list.h"
-#include "protocols/packet.h"
-#include "profiler/profiler.h"
-#include "framework/counts.h"
 
 #define DCE2_UDP_NAME "dce_udp"
 #define DCE2_UDP_HELP "dce over udp inspection"

diff --git a/src/service_inspectors/dce_rpc/dce_udp_module.cc b/src/service_inspectors/dce_rpc/dce_udp_module.cc
index a21ad4a52bc9e727235e0195512bc41d4ed1527d..7e56fe4e1703560c0b983819a926721573abefc4 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_udp_module.cc
+++ b/src/service_inspectors/dce_rpc/dce_udp_module.cc
@@ -19,9 +19,10 @@
 // dce_udp_module.cc author Maya Dagon <mdagon@cisco.com>
 
 #include "dce_udp_module.h"
+
+#include "log/messages.h"
+
 #include "dce_udp.h"
-#include "dce_common.h"
-#include "main/snort_config.h"
 
 using namespace std;
 

diff --git a/src/service_inspectors/dce_rpc/dce_utils.cc b/src/service_inspectors/dce_rpc/dce_utils.cc
index 2dc5f2be4a8086789e124c7078ca22e7562eed48..e971dd65cabab7432c5ef379cfc820bec9f77f57 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_utils.cc
+++ b/src/service_inspectors/dce_rpc/dce_utils.cc
@@ -18,6 +18,7 @@
 //--------------------------------------------------------------------------
 
 #include "dce_utils.h"
+
 #include "main/snort_debug.h"
 #include "utils/util.h"
 #include "utils/safec.h"

diff --git a/src/service_inspectors/dce_rpc/dce_utils.h b/src/service_inspectors/dce_rpc/dce_utils.h
index 92d0bc374daea1fc4df914df4bea7703275c0ce4..13b698c9a7b0e05b491ad46a002ce45618bca21d 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_utils.h
+++ b/src/service_inspectors/dce_rpc/dce_utils.h
@@ -21,8 +21,8 @@
 #define DCE_UTILS_H
 
 #include <ctype.h>
+#include <string.h>
 #include "main/snort_types.h"
-#include "utils/util.h"
 
 /********************************************************************
  * Macros

diff --git a/src/service_inspectors/dce_rpc/ips_dce_iface.cc b/src/service_inspectors/dce_rpc/ips_dce_iface.cc
index 72aca4631c753579676e2adb0d12f272d1c647fe..c947531d8f9cd28bbb5cd6cde077d5dd7f555c71 100644 (file)
--- a/src/service_inspectors/dce_rpc/ips_dce_iface.cc
+++ b/src/service_inspectors/dce_rpc/ips_dce_iface.cc
@@ -19,21 +19,18 @@
 // ips_dce_iface.cc author Maya Dagon <mdagon@cisco.com>
 // based on work by Todd Wease
 
-#include "dce_utils.h"
-#include "dce_common.h"
 #include <cerrno>
 
-#include "framework/ips_option.h"
-#include "framework/module.h"
-#include "framework/parameter.h"
-#include "framework/range.h"
-#include "detection/detect.h"
 #include "detection/detection_defines.h"
 #include "detection/pattern_match_data.h"
-#include "hash/sfhashfcn.h"
+#include "framework/module.h"
+#include "framework/ips_option.h"
+#include "framework/range.h"
 #include "profiler/profiler.h"
 #include "target_based/snort_protocols.h"
-#include "main/snort_debug.h"
+#include "utils/util.h"
+
+#include "dce_common.h"
 
 //-------------------------------------------------------------------------
 // dcerpc2 interface rule options

diff --git a/src/service_inspectors/dce_rpc/ips_dce_opnum.cc b/src/service_inspectors/dce_rpc/ips_dce_opnum.cc
index a8e7950e77d73b417cbe944200646e1b48a6f866..f97563db4c1b4a7acde04dac872e33ea425fdd37 100644 (file)
--- a/src/service_inspectors/dce_rpc/ips_dce_opnum.cc
+++ b/src/service_inspectors/dce_rpc/ips_dce_opnum.cc
@@ -19,18 +19,13 @@
 // ips_dce_opnum.cc author Maya Dagon <mdagon@cisco.com>
 // based on work by Todd Wease
 
-#include "dce_utils.h"
-#include "dce_common.h"
-
+#include "detection/detection_defines.h"
 #include "framework/ips_option.h"
 #include "framework/module.h"
-#include "framework/parameter.h"
-#include "detection/detection_defines.h"
-#include "hash/sfhashfcn.h"
 #include "profiler/profiler.h"
-#include "protocols/packet.h"
 #include "utils/util.h"
-#include "log/messages.h"
+
+#include "dce_common.h"
 
 //-------------------------------------------------------------------------
 // dcerpc2 opnum rule options

diff --git a/src/service_inspectors/dce_rpc/ips_dce_stub_data.cc b/src/service_inspectors/dce_rpc/ips_dce_stub_data.cc
index 3edcb32c537185c3b6ae638b4667cdc677bb7665..c1ed87261d9b65c9764481b14d98ab26b7b7c05b 100644 (file)
--- a/src/service_inspectors/dce_rpc/ips_dce_stub_data.cc
+++ b/src/service_inspectors/dce_rpc/ips_dce_stub_data.cc
@@ -19,16 +19,14 @@
 // ips_dce_stub_data.cc author Maya Dagon <mdagon@cisco.com>
 // based on work by Todd Wease
 
-#include "dce_common.h"
-
 #include "detection/detection_defines.h"
 #include "framework/cursor.h"
 #include "framework/ips_option.h"
 #include "framework/module.h"
-#include "hash/sfhashfcn.h"
-#include "protocols/packet.h"
 #include "profiler/profiler.h"
 
+#include "dce_common.h"
+
 #define s_name "dce_stub_data"
 #define s_help \
     "sets the cursor to dcerpc stub data"