detect/analyzer: fix lists names

Simpler names that lead to cleaner json.

diff --git a/src/detect-engine-analyzer.c b/src/detect-engine-analyzer.c
index 2488dcc9583b0bb9cd9b142291df266f3c936d65..d71dcb6f50902bca1849d72d2574595ad5c1f4a7 100644 (file)
--- a/src/detect-engine-analyzer.c
+++ b/src/detect-engine-analyzer.c
@@ -1027,7 +1027,7 @@ void EngineAnalysisRules2(const DetectEngineCtx *de_ctx, const Signature *s)
     jb_open_object(ctx.js, "lists");
     for (int i = 0; i < DETECT_SM_LIST_MAX; i++) {
         if (s->sm_arrays[i] != NULL) {
-            jb_open_object(ctx.js, DetectSigmatchListEnumToString(i));
+            jb_open_object(ctx.js, DetectListToHumanString(i));
             DumpMatches(&ctx, ctx.js, s->sm_arrays[i]);
             jb_close(ctx.js);
         }

diff --git a/src/detect-parse.c b/src/detect-parse.c
index 6c14f55a8c3ed85fdfdf1e916439e14431931fb6..b3a094deab459a4731b3d3882564bc7166fb983f 100644 (file)
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -120,8 +120,9 @@ const char *DetectListToHumanString(int list)
     switch (list) {
         CASE_CODE_STRING(DETECT_SM_LIST_MATCH, "packet");
         CASE_CODE_STRING(DETECT_SM_LIST_PMATCH, "payload");
-        CASE_CODE_STRING(DETECT_SM_LIST_TMATCH, "tag");
+        CASE_CODE_STRING(DETECT_SM_LIST_BASE64_DATA, "base64_data");
         CASE_CODE_STRING(DETECT_SM_LIST_POSTMATCH, "postmatch");
+        CASE_CODE_STRING(DETECT_SM_LIST_TMATCH, "tag");
         CASE_CODE_STRING(DETECT_SM_LIST_SUPPRESS, "suppress");
         CASE_CODE_STRING(DETECT_SM_LIST_THRESHOLD, "threshold");
         CASE_CODE_STRING(DETECT_SM_LIST_MAX, "max (internal)");
@@ -136,6 +137,7 @@ const char *DetectListToString(int list)
     switch (list) {
         CASE_CODE(DETECT_SM_LIST_MATCH);
         CASE_CODE(DETECT_SM_LIST_PMATCH);
+        CASE_CODE(DETECT_SM_LIST_BASE64_DATA);
         CASE_CODE(DETECT_SM_LIST_TMATCH);
         CASE_CODE(DETECT_SM_LIST_POSTMATCH);
         CASE_CODE(DETECT_SM_LIST_SUPPRESS);