From: snorty <snorty@localhost.localdomain>
Date: Wed, 3 Aug 2016 21:16:21 +0000 (-0400)
Subject: change ohi to http_server with gids 319-320
X-Git-Tag: 3.0.0-233~309
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d43dbfb5cc535499d47e6313b8f45cb72e36c0ef;p=thirdparty%2Fsnort3.git

change ohi to http_server with gids 319-320
---

diff --git a/src/service_inspectors/http_inspect/hi_events.h b/src/service_inspectors/http_inspect/hi_events.h
index 389ce51be..ee6a3819c 100644
--- a/src/service_inspectors/http_inspect/hi_events.h
+++ b/src/service_inspectors/http_inspect/hi_events.h
@@ -22,8 +22,9 @@
 
 #include "hi_include.h"
 
-#define GID_HTTP_CLIENT  119
-#define GID_HTTP_SERVER  120
+// changed gids from 119-120 to avoid overlap with nhi
+#define GID_HTTP_CLIENT  319
+#define GID_HTTP_SERVER  320
 
 // Client Events
 typedef enum _HI_CLI_EVENTS
diff --git a/src/service_inspectors/http_inspect/hi_module.h b/src/service_inspectors/http_inspect/hi_module.h
index f02de41cb..f774ad4c2 100644
--- a/src/service_inspectors/http_inspect/hi_module.h
+++ b/src/service_inspectors/http_inspect/hi_module.h
@@ -28,7 +28,7 @@
 #include "hi_events.h"
 
 #define GLOBAL_KEYWORD "http_global"
-#define SERVER_KEYWORD "http_inspect"
+#define SERVER_KEYWORD "http_server"
 
 #define GLOBAL_HELP "shared HTTP inspector settings"
 #define SERVER_HELP "main HTTP inspector module"