From: Tom Peters <thopeter@cisco.com>
Date: Tue, 28 Oct 2014 18:34:16 +0000 (-0400)
Subject: 219 change, consolidated name definition, includes with path
X-Git-Tag: 3.0.0-233~1288^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a6f734b6f1e3a1caa40aa3b052d8edf80d152b1;p=thirdparty%2Fsnort3.git

219 change, consolidated name definition, includes with path
---

diff --git a/src/service_inspectors/nhttp_inspect/nhttp_api.cc b/src/service_inspectors/nhttp_inspect/nhttp_api.cc
index 19f2d67bf..3656cff4f 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_api.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_api.cc
@@ -21,13 +21,14 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "snort.h"
+#include "main/snort.h"
 #include "target_based/sftarget_protocol_reference.h"
+
 #include "nhttp_enum.h"
 #include "nhttp_inspect.h"
 #include "nhttp_api.h"
 
-const char* NHttpApi::nhttp_my_name = "new_http_inspect";
+const char* NHttpApi::nhttp_my_name = NHTTP_NAME;
 const char* NHttpApi::nhttp_help = "the new HTTP inspector!";
 
 Inspector* NHttpApi::nhttp_ctor(Module* mod)
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_enum.h b/src/service_inspectors/nhttp_inspect/nhttp_enum.h
index 0371639f0..b39910ef3 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_enum.h
+++ b/src/service_inspectors/nhttp_inspect/nhttp_enum.h
@@ -27,7 +27,7 @@ namespace NHttpEnums {
 
 static const int MAXOCTETS = 63780;
 static const int DATABLOCKSIZE = 16384;
-static const uint32_t NHTTP_GID = 119;
+static const uint32_t NHTTP_GID = 219;
 
 // Field status codes for when no valid value is present in length or integer value. Positive values are actual length
 // or field value.
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_field.cc b/src/service_inspectors/nhttp_inspect/nhttp_field.cc
index 4c36318af..0e3fb22ac 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_field.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_field.cc
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#include "snort.h"
+#include "main/snort.h"
 #include "nhttp_enum.h"
 #include "nhttp_field.h"
 
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_head_norm.cc b/src/service_inspectors/nhttp_inspect/nhttp_head_norm.cc
index 501cd3951..4bf87d1a1 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_head_norm.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_head_norm.cc
@@ -22,8 +22,8 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "snort.h"
-#include "snort_types.h"
+#include "main/snort.h"
+#include "main/snort_types.h"
 
 #include "nhttp_enum.h"
 #include "nhttp_str_to_code.h"
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_inspect.h b/src/service_inspectors/nhttp_inspect/nhttp_inspect.h
index a864681a9..93aadf8c6 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_inspect.h
+++ b/src/service_inspectors/nhttp_inspect/nhttp_inspect.h
@@ -26,7 +26,7 @@
 //-------------------------------------------------------------------------
 
 #include "framework/inspector.h"
-#include "snort.h"
+#include "main/snort.h"
 #include "nhttp_stream_splitter.h"
 
 class NHttpApi;
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_module.cc b/src/service_inspectors/nhttp_inspect/nhttp_module.cc
index e6294bd4b..05fcfef5b 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_module.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_module.cc
@@ -20,7 +20,9 @@
 
 #include <string.h>
 #include <sys/types.h>
-#include "snort.h"
+
+#include "main/snort.h"
+
 #include "nhttp_module.h"
 
 const Parameter NHttpModule::nhttp_params[] =
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_module.h b/src/service_inspectors/nhttp_inspect/nhttp_module.h
index a4dcad22b..e4a324102 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_module.h
+++ b/src/service_inspectors/nhttp_inspect/nhttp_module.h
@@ -22,14 +22,16 @@
 #define NHTTP_MODULE_H
 
 #include "framework/module.h"
+
 #include "nhttp_enum.h"
 
+#define NHTTP_NAME "new_http_inspect"
 #define NHTTP_HELP "new HTTP inspector"
 
 class NHttpModule : public Module
 {
 public:
-    NHttpModule() : Module("new_http_inspect", NHTTP_HELP, nhttp_params) {};
+    NHttpModule() : Module(NHTTP_NAME, NHTTP_HELP, nhttp_params) {};
     bool begin(const char*, int, SnortConfig*) override;
     bool end(const char*, int, SnortConfig*) override { return true; };
     bool set(const char*, Value&, SnortConfig*) override;
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_msg_body.cc b/src/service_inspectors/nhttp_inspect/nhttp_msg_body.cc
index 9225cafe5..ac8cc9d1d 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_msg_body.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_msg_body.cc
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#include "snort.h"
+#include "main/snort.h"
 #include "detection/detection_util.h"
 
 #include "nhttp_enum.h"
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_msg_chunk.cc b/src/service_inspectors/nhttp_inspect/nhttp_msg_chunk.cc
index 7672d181e..620dfe092 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_msg_chunk.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_msg_chunk.cc
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#include "snort.h"
+#include "main/snort.h"
 #include "nhttp_enum.h"
 #include "nhttp_msg_chunk.h"
 
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_msg_head_shared.cc b/src/service_inspectors/nhttp_inspect/nhttp_msg_head_shared.cc
index 40889aeba..fc91b9534 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_msg_head_shared.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_msg_head_shared.cc
@@ -22,7 +22,8 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#include "snort.h"
+#include "main/snort.h"
+
 #include "nhttp_enum.h"
 #include "nhttp_normalizers.h"
 #include "nhttp_msg_head_shared.h"
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_msg_header.cc b/src/service_inspectors/nhttp_inspect/nhttp_msg_header.cc
index a1b2e05bf..541bad177 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_msg_header.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_msg_header.cc
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#include "snort.h"
+#include "main/snort.h"
 #include "detection/detection_util.h"
 
 #include "nhttp_enum.h"
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_msg_request.cc b/src/service_inspectors/nhttp_inspect/nhttp_msg_request.cc
index cffa4174a..31bd71b8b 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_msg_request.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_msg_request.cc
@@ -23,7 +23,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#include "snort.h"
+#include "main/snort.h"
 #include "detection/detection_util.h"
 
 #include "nhttp_enum.h"
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_msg_section.cc b/src/service_inspectors/nhttp_inspect/nhttp_msg_section.cc
index ca0c26e96..b2af8ce75 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_msg_section.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_msg_section.cc
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#include "snort.h"
+#include "main/snort.h"
 #include "detection/detection_util.h"
 
 #include "nhttp_enum.h"
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_msg_start.cc b/src/service_inspectors/nhttp_inspect/nhttp_msg_start.cc
index 214a3eab4..19862226f 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_msg_start.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_msg_start.cc
@@ -22,7 +22,8 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#include "snort.h"
+#include "main/snort.h"
+
 #include "nhttp_enum.h"
 #include "nhttp_msg_start.h"
 
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_msg_status.cc b/src/service_inspectors/nhttp_inspect/nhttp_msg_status.cc
index 4aa9d4ce6..add1f18ce 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_msg_status.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_msg_status.cc
@@ -23,7 +23,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#include "snort.h"
+#include "main/snort.h"
 #include "detection/detection_util.h"
 
 #include "nhttp_enum.h"
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_msg_trailer.cc b/src/service_inspectors/nhttp_inspect/nhttp_msg_trailer.cc
index 2b1e6f0f2..5278219dd 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_msg_trailer.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_msg_trailer.cc
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#include "snort.h"
+#include "main/snort.h"
 #include "detection/detection_util.h"
 
 #include "nhttp_enum.h"
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_splitter.h b/src/service_inspectors/nhttp_inspect/nhttp_splitter.h
index 51453f8e3..05c554217 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_splitter.h
+++ b/src/service_inspectors/nhttp_inspect/nhttp_splitter.h
@@ -22,6 +22,7 @@
 #define NHTTP_SPLITTER_H
 
 #include <assert.h>
+
 #include "nhttp_enum.h"
 
 //-------------------------------------------------------------------------
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_stream_splitter.cc b/src/service_inspectors/nhttp_inspect/nhttp_stream_splitter.cc
index b69fe2ea2..ba99c781a 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_stream_splitter.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_stream_splitter.cc
@@ -20,6 +20,7 @@
 
 #include <assert.h>
 #include <sys/types.h>
+
 #include "nhttp_enum.h"
 #include "nhttp_test_manager.h"
 #include "nhttp_test_input.h"
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_stream_splitter.h b/src/service_inspectors/nhttp_inspect/nhttp_stream_splitter.h
index 2245e10ae..d98d1eff3 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_stream_splitter.h
+++ b/src/service_inspectors/nhttp_inspect/nhttp_stream_splitter.h
@@ -22,6 +22,7 @@
 #define NHTTP_STREAM_SPLITTER_H
 
 #include "stream/stream_splitter.h"
+
 #include "nhttp_flow_data.h"
 #include "nhttp_test_manager.h"
 
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_tables.cc b/src/service_inspectors/nhttp_inspect/nhttp_tables.cc
index 312682cb7..97759f66d 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_tables.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_tables.cc
@@ -21,8 +21,9 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "snort.h"
+#include "main/snort.h"
 #include "framework/module.h"
+
 #include "nhttp_enum.h"
 #include "nhttp_str_to_code.h"
 #include "nhttp_normalizers.h"
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_test_manager.cc b/src/service_inspectors/nhttp_inspect/nhttp_test_manager.cc
index 7a79b928a..ee672a4a1 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_test_manager.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_test_manager.cc
@@ -19,6 +19,7 @@
 // nhttp_test_manager.cc author Tom Peters <thopeter@cisco.com>
 
 #include <stdexcept>
+
 #include "nhttp_test_manager.h"
 #include "nhttp_test_input.h"
 
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_uri.cc b/src/service_inspectors/nhttp_inspect/nhttp_uri.cc
index fc1570e6e..7c1d44867 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_uri.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_uri.cc
@@ -23,7 +23,8 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#include "snort.h"
+#include "main/snort.h"
+
 #include "nhttp_enum.h"
 #include "nhttp_normalizers.h"
 #include "nhttp_uri.h"