file detect: register inspect engines from keyword

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,

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;
 }