From 6f253e1ea7d02469d471ee5a0bb37cc7c1a08e48 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Fri, 23 Sep 2016 09:21:07 +0200
Subject: [PATCH] file detect: register inspect engines from keyword

---
 src/detect-engine.c   | 10 ----------
 src/detect-filename.c | 12 ++++++++++++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/detect-engine.c b/src/detect-engine.c
index 5b82b68b00..6e9c6a78ae 100644
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -115,13 +115,6 @@ void DetectEngineRegisterAppInspectionEngines(void)
     };
 
     struct tmp_t data_toserver[] = {
-        { ALPROTO_HTTP,
-          DETECT_SM_LIST_FILEMATCH,
-          DetectFileInspectHttp },
-        /* SMTP */
-        { ALPROTO_SMTP,
-          DETECT_SM_LIST_FILEMATCH,
-          DetectFileInspectSmtp },
         /* Template. */
         { ALPROTO_TEMPLATE,
           DETECT_SM_LIST_TEMPLATE_BUFFER_MATCH,
@@ -129,9 +122,6 @@ void DetectEngineRegisterAppInspectionEngines(void)
     };
 
     struct tmp_t data_toclient[] = {
-        { ALPROTO_HTTP,
-          DETECT_SM_LIST_FILEMATCH,
-          DetectFileInspectHttp },
         /* Template. */
         { ALPROTO_TEMPLATE,
           DETECT_SM_LIST_TEMPLATE_BUFFER_MATCH,
diff --git a/src/detect-filename.c b/src/detect-filename.c
index 638bb7439f..ce89d0caf8 100644
--- a/src/detect-filename.c
+++ b/src/detect-filename.c
@@ -34,6 +34,7 @@
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
+#include "detect-engine-file.h"
 
 #include "flow.h"
 #include "flow-var.h"
@@ -70,6 +71,17 @@ void DetectFilenameRegister(void)
     sigmatch_table[DETECT_FILENAME].Free  = DetectFilenameFree;
     sigmatch_table[DETECT_FILENAME].RegisterTests = DetectFilenameRegisterTests;
 
+    DetectAppLayerInspectEngineRegister(ALPROTO_HTTP, SIG_FLAG_TOSERVER,
+            DETECT_SM_LIST_FILEMATCH,
+            DetectFileInspectHttp);
+    DetectAppLayerInspectEngineRegister(ALPROTO_HTTP, SIG_FLAG_TOCLIENT,
+            DETECT_SM_LIST_FILEMATCH,
+            DetectFileInspectHttp);
+
+    DetectAppLayerInspectEngineRegister(ALPROTO_SMTP, SIG_FLAG_TOSERVER,
+            DETECT_SM_LIST_FILEMATCH,
+            DetectFileInspectSmtp);
+
 	SCLogDebug("registering filename rule option");
     return;
 }