From 8de2948df81686079bdb0aee859caeffbca4e90d Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Thu, 16 Mar 2023 06:38:48 +0100 Subject: [PATCH] detect/analyzer: fix lists names Simpler names that lead to cleaner json. --- src/detect-engine-analyzer.c | 2 +- src/detect-parse.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/detect-engine-analyzer.c b/src/detect-engine-analyzer.c index 2488dcc958..d71dcb6f50 100644 --- 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 6c14f55a8c..b3a094deab 100644 --- 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);