detect/modbus: convert to v2 inspect API

diff --git a/src/detect-engine-modbus.c b/src/detect-engine-modbus.c
index 7db6dd57911b181976d7c514d614ddb31fdda337..e194a42a72c544ac52c10910ee0bf15806b9efce 100644 (file)
--- a/src/detect-engine-modbus.c
+++ b/src/detect-engine-modbus.c
@@ -196,20 +196,13 @@ static int DetectEngineInspectModbusAddress(ModbusTransaction   *tx,
  *
  *  \retval 0 no match or 1 match
  */
-int DetectEngineInspectModbus(ThreadVars            *tv,
-                              DetectEngineCtx       *de_ctx,
-                              DetectEngineThreadCtx *det_ctx,
-                              const Signature       *s,
-                              const SigMatchData    *smd,
-                              Flow                  *f,
-                              uint8_t               flags,
-                              void                  *alstate,
-                              void                  *txv,
-                              uint64_t              tx_id)
+int DetectEngineInspectModbus(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx,
+        const struct DetectEngineAppInspectionEngine_ *engine, const Signature *s, Flow *f,
+        uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
 {
     SCEnter();
     ModbusTransaction   *tx = (ModbusTransaction *)txv;
-    DetectModbus        *modbus = (DetectModbus *) smd->ctx;
+    DetectModbus *modbus = (DetectModbus *)engine->smd->ctx;
 
     int ret = 0;
 

diff --git a/src/detect-engine-modbus.h b/src/detect-engine-modbus.h
index 4ffe45ca681110438b203baefb3eb5e983a137dc..5881fa772bec5b5192c6fdd2eb2187c00612e5a2 100644 (file)
--- a/src/detect-engine-modbus.h
+++ b/src/detect-engine-modbus.h
@@ -33,10 +33,9 @@
 #ifndef __DETECT_ENGINE_MODBUS_H__
 #define __DETECT_ENGINE_MODBUS_H__
 
-int DetectEngineInspectModbus(ThreadVars *,
-        DetectEngineCtx *de_ctx, DetectEngineThreadCtx *,
-        const Signature *, const SigMatchData *,
-        Flow *, uint8_t, void *, void *, uint64_t);
+int DetectEngineInspectModbus(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *,
+        const struct DetectEngineAppInspectionEngine_ *engine, const Signature *, Flow *, uint8_t,
+        void *, void *, uint64_t);
 
 void DetectEngineInspectModbusRegisterTests(void);
 #endif /* __DETECT_ENGINE_MODBUS_H__ */

diff --git a/src/detect-modbus.c b/src/detect-modbus.c
index 3fb52819d4f139efae5e4c0a463bc665981d740d..c4e3a5f08382b809a5e6b4e5c415c3415aa11d8e 100644 (file)
--- a/src/detect-modbus.c
+++ b/src/detect-modbus.c
@@ -563,9 +563,8 @@ void DetectModbusRegister(void)
     DetectSetupParseRegexes(PARSE_REGEX_FUNCTION, &function_parse_regex);
     DetectSetupParseRegexes(PARSE_REGEX_ACCESS, &access_parse_regex);
 
-    DetectAppLayerInspectEngineRegister("modbus",
-            ALPROTO_MODBUS, SIG_FLAG_TOSERVER, 0,
-            DetectEngineInspectModbus);
+    DetectAppLayerInspectEngineRegister2(
+            "modbus", ALPROTO_MODBUS, SIG_FLAG_TOSERVER, 0, DetectEngineInspectModbus, NULL);
 
     g_modbus_buffer_id = DetectBufferTypeGetByName("modbus");
 }
@@ -1009,4 +1008,4 @@ void DetectModbusRegisterTests(void)
     UtRegisterTest("DetectModbusTest13 - Testing a range of unit_id",
                    DetectModbusTest13);
 }
-#endif /* UNITTESTS */
\ No newline at end of file
+#endif /* UNITTESTS */