diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2024-06-18 14:26:31 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2024-06-25 17:20:12 +0200 |
commit | 081bf5f0d7952a6e6ac0d23a365ccf1fd27010c0 (patch) | |
tree | 504db7eb68465921f76a917b18ced461a5cf75f6 /src/parser_json.c | |
parent | f13fd62ef1e2755ed5eef11adbe0e8a479528f72 (diff) |
src: add string preprocessor and use it for log prefix string
Add a string preprocessor to identify and replace variables in a string.
Rework existing support to variables in log prefix strings to use it.
Fixes: e76bb3794018 ("src: allow for variables in the log prefix string")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/parser_json.c')
-rw-r--r-- | src/parser_json.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/parser_json.c b/src/parser_json.c index 8b7efaf2..ee4657ee 100644 --- a/src/parser_json.c +++ b/src/parser_json.c @@ -2565,9 +2565,7 @@ static struct stmt *json_parse_log_stmt(struct json_ctx *ctx, stmt = log_stmt_alloc(int_loc); if (!json_unpack(value, "{s:s}", "prefix", &tmpstr)) { - stmt->log.prefix = constant_expr_alloc(int_loc, &string_type, - BYTEORDER_HOST_ENDIAN, - (strlen(tmpstr) + 1) * BITS_PER_BYTE, tmpstr); + stmt->log.prefix = xstrdup(tmpstr); stmt->log.flags |= STMT_LOG_PREFIX; } if (!json_unpack(value, "{s:i}", "group", &tmp)) { |