detect/ssh: convert to v2 inspect API

src/detect-ssh-software-version.c

@@ -76,14 +76,12 @@ static void DetectSshSoftwareVersionRegisterTests(void);
 static void DetectSshSoftwareVersionFree(DetectEngineCtx *de_ctx, void *);
 static int g_ssh_banner_list_id = 0;
 
-static int InspectSshBanner(ThreadVars *tv,
+static int InspectSshBanner(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx,
-        DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx,
+        const struct DetectEngineAppInspectionEngine_ *engine, const Signature *s, Flow *f,
-        const Signature *s, const SigMatchData *smd,
+        uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
-        Flow *f, uint8_t flags, void *alstate,
-        void *txv, uint64_t tx_id)
 {
-    return DetectEngineInspectGenericList(tv, de_ctx, det_ctx, s, smd,
+    return DetectEngineInspectGenericList(
-                                          f, flags, alstate, txv, tx_id);
+            NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
 }
 
 /**
@@ -107,12 +105,10 @@ void DetectSshSoftwareVersionRegister(void)
 
     g_ssh_banner_list_id = DetectBufferTypeRegister("ssh_banner");
 
-    DetectAppLayerInspectEngineRegister("ssh_banner",
+    DetectAppLayerInspectEngineRegister2("ssh_banner", ALPROTO_SSH, SIG_FLAG_TOSERVER,
-            ALPROTO_SSH, SIG_FLAG_TOSERVER, SshStateBannerDone,
+            SshStateBannerDone, InspectSshBanner, NULL);
-            InspectSshBanner);
+    DetectAppLayerInspectEngineRegister2("ssh_banner", ALPROTO_SSH, SIG_FLAG_TOCLIENT,
-    DetectAppLayerInspectEngineRegister("ssh_banner",
+            SshStateBannerDone, InspectSshBanner, NULL);
-            ALPROTO_SSH, SIG_FLAG_TOCLIENT, SshStateBannerDone,
-            InspectSshBanner);
 }
 
 /**