http_request_line: register inspect engine from keyword

src/detect-engine.c

@@ -72,7 +72,6 @@
 #include "detect-uricontent.h"
 #include "detect-engine-threshold.h"
 
-#include "detect-http-request-line.h"
 #include "detect-http-response-line.h"
 
 #include "detect-engine-loader.h"
@@ -136,9 +135,6 @@ void DetectEngineRegisterAppInspectionEngines(void)
         { ALPROTO_HTTP,
           DETECT_SM_LIST_UMATCH,
           DetectEngineInspectPacketUris },
-        { ALPROTO_HTTP,
-          DETECT_SM_LIST_HTTP_REQLINEMATCH,
-          DetectEngineInspectHttpRequestLine },
         { ALPROTO_HTTP,
           DETECT_SM_LIST_HCBDMATCH,
           DetectEngineInspectHttpClientBody },

src/detect-http-request-line.c

@@ -64,7 +64,12 @@ int DetectHttpRequestLineSetup(DetectEngineCtx *, Signature *, char *);
 void DetectHttpRequestLineRegisterTests(void);
 void DetectHttpRequestLineFree(void *);
 static int PrefilterTxHttpRequestLineRegister(SigGroupHead *sgh, MpmCtx *mpm_ctx);
-
+static int DetectEngineInspectHttpRequestLine(ThreadVars *tv,
+                                  DetectEngineCtx *de_ctx,
+                                  DetectEngineThreadCtx *det_ctx,
+                                  Signature *s, Flow *f, uint8_t flags,
+                                  void *alstate,
+                                  void *txv, uint64_t tx_id);
 /**
  * \brief Registers the keyword handlers for the "http_request_line" keyword.
  */
@@ -85,6 +90,10 @@ void DetectHttpRequestLineRegister(void)
             DETECT_SM_LIST_HTTP_REQLINEMATCH, 2,
             PrefilterTxHttpRequestLineRegister);
 
+    DetectAppLayerInspectEngineRegister(ALPROTO_HTTP, SIG_FLAG_TOSERVER,
+            DETECT_SM_LIST_HTTP_REQLINEMATCH,
+            DetectEngineInspectHttpRequestLine);
+
     return;
 }
 
@@ -162,7 +171,7 @@ static int PrefilterTxHttpRequestLineRegister(SigGroupHead *sgh, MpmCtx *mpm_ctx
  * \retval 1 match.
  * \retval 2 Sig can't match.
  */
-int DetectEngineInspectHttpRequestLine(ThreadVars *tv,
+static int DetectEngineInspectHttpRequestLine(ThreadVars *tv,
                                   DetectEngineCtx *de_ctx,
                                   DetectEngineThreadCtx *det_ctx,
                                   Signature *s, Flow *f, uint8_t flags,

src/detect-http-request-line.h

@@ -24,12 +24,6 @@
 #ifndef __DETECT_HTTP_REQUEST_LINE_H__
 #define __DETECT_HTTP_REQUEST_LINE_H__
 
-int DetectEngineInspectHttpRequestLine(ThreadVars *tv,
-                                  DetectEngineCtx *de_ctx,
-                                  DetectEngineThreadCtx *det_ctx,
-                                  Signature *s, Flow *f, uint8_t flags,
-                                  void *alstate,
-                                  void *txv, uint64_t tx_id);
 void DetectHttpRequestLineRegister(void);
 
 #endif /* __DETECT_HTTP_REQUEST_LINE_H__ */