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 19f2d67bf58bec8902ac2e01c9e6523157614046..3656cff4f6db6f2e812b7e2077d6ead984de6d50 100644 (file)
--- 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 0371639f0be5c1ca10d8e2fd5646055d574b836b..b39910ef39d8d5022641a5c0d1aa02b33e609c04 100644 (file)
--- 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 4c36318aff72c09c5c5675d741d7a0673b7d3a61..0e3fb22ac67e3779fc22f385550db529bbcebfd8 100644 (file)
--- 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 501cd39519accae0cfd37bc85004d0f9d118e249..4bf87d1a1e64cea4101e468dfd37778710550fb4 100644 (file)
--- 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 a864681a901105d667b730e28b0e0ec1283e9e35..93aadf8c6dc1f3a715d892ed951f6f9c0ffadd0a 100644 (file)
--- 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 e6294bd4b6ba2d3fa106f9373a7b09ff3c8cf06c..05fcfef5b4741957185da956b24b8de3ecf2ce11 100644 (file)
--- 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 a4dcad22b18737179fa0b88bd5600e936f3a12fa..e4a3241022a94b3e8babb4ba3489fc453b43dc78 100644 (file)
--- 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 9225cafe558126c37257f9513793c1192f677121..ac8cc9d1dd347aeba708bfedae75560abad3f1e2 100644 (file)
--- 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 7672d181e1352e508de15fcd3dfd28088c68019c..620dfe0923e7de7a189b61e993fca24aa458896b 100644 (file)
--- 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 40889aeba2351d2f50c9667ca80e8ad11135c6e0..fc91b95346457b501263578467ce507c83f47694 100644 (file)
--- 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 a1b2e05bfc794d08ec0a11bf0fa572076ac46424..541bad177c5e82728fbf79385ef6b609c0a49dd7 100644 (file)
--- 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 cffa4174acbffc2579cf337443ee4258ccd845a8..31bd71b8b0f4d8440b0d8f1358fb46b5f9ea9899 100644 (file)
--- 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 ca0c26e96e3a26f80b7f4e0665adb72fea69e855..b2af8ce7504fde44884d13901ed65122c3950bef 100644 (file)
--- 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 214a3eab48f5a13a8c8227a393539b9bdc8270ec..19862226f38655c9c5b11a4d9a52bb495dac6d43 100644 (file)
--- 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 4aa9d4ce672810a5c783c97dbc096cf2720839e4..add1f18ce3163daa74ada0c1538370f38c9506ce 100644 (file)
--- 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 2b1e6f0f27b18ee075faefd96f5bb67f34b045ce..5278219dd787ed70d4e68a2dfa33b7dd9e12da7c 100644 (file)
--- 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 51453f8e31bdb9effef3f8ec25decb02d3ff0e9d..05c5542173c82f3921a122e8670fbb76cd7d7d48 100644 (file)
--- 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 b69fe2ea24e0742809f5c5a7a9bbd47eeadfed11..ba99c781a2f0ab52890c7984330c6a528daf9c62 100644 (file)
--- 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 2245e10aec4a2023f288b650fa9621b44362d3d2..d98d1eff3bdc4f9df3a7075a43b27701f16dd038 100644 (file)
--- 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 312682cb7bfe6b95ab96ce45d7f0bfecbe05f8dd..97759f66d8799a5b3f1f37d675a7c7e3cf2e1ccd 100644 (file)
--- 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 7a79b928aeaca74226f5c604fe63ab69c924c379..ee672a4a1534190b00bcce016956063b0b3aca61 100644 (file)
--- 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 fc1570e6e5113feca63250353188850d07e04f74..7c1d44867d4b59a9906bbe982fddcf0de1b80728 100644 (file)
--- 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"