src: add json support for last statement
Pablo Neira Ayuso
maintainerPATCH 1/1 src: add json support for last statement
This patch adds json support for the last statement, it works for me here.
However, tests/py still displays a warning:
any/last.t: WARNING: line 12: '{"nftables": [{"add": {"rule": {"family": "ip", "table": "test-ip4", "chain": "input", "expr": [{"last": {"used": 300000}}]}}}]}': '[{"last": {"used": 300000}}]' mismatches '[{"last": null}]'
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/json.h | 2 ++ src/json.c | 8 ++++++++ src/parser_json.c | 22 ++++++++++++++++++++++ src/statement.c | 1 + tests/py/any/last.t.json | 16 ++++++++++++++++ 5 files changed, 49 insertions(+) create mode 100644 tests/py/any/last.t.json
include/json.h +2 -0
@@ -74,6 +74,7 @@ json_t *payload_stmt_json(const struct stmt *stmt, struct output_ctx *octx);json_t *exthdr_stmt_json (const struct stmt *stmt,struct output_ctx *octx);json_t *quota_stmt_json (const struct stmt *stmt,struct output_ctx *octx);json_t *ct_stmt_json (const struct stmt *stmt,struct output_ctx *octx); +json_t *last_stmt_json (const struct stmt *stmt,struct output_ctx *octx);json_t *limit_stmt_json (const struct stmt *stmt,struct output_ctx *octx);json_t *fwd_stmt_json (const struct stmt *stmt,struct output_ctx *octx);json_t *notrack_stmt_json (const struct stmt *stmt,struct output_ctx *octx);
@@ -177,6 +178,7 @@ STMT_PRINT_STUB(payload) STMT_PRINT_STUB(exthdr) STMT_PRINT_STUB(quota) STMT_PRINT_STUB(ct) +STMT_PRINT_STUB(last) STMT_PRINT_STUB(limit) STMT_PRINT_STUB(fwd) STMT_PRINT_STUB(notrack)
src/json.c +8 -0
@@ -1482,6 +1482,14 @@ json_t *counter_stmt_json(const struct stmt *stmt, struct output_ctx *octx) "bytes", stmt->counter.bytes); } +json_t *last_stmt_json (const struct stmt *stmt,struct output_ctx *octx) +{ +if (nft_output_stateless (octx) || stmt->last.set ==0 ) +return json_pack ("{s:n}" ,"last" ); + +return json_pack ("{s:{s:I}}" ,"last" ,"used" , stmt->last.used); +} +json_t *set_stmt_json (const struct stmt *stmt,struct output_ctx *octx) {json_t *root;
src/parser_json.c +22 -0
@@ -1731,6 +1731,27 @@ static struct stmt *json_parse_counter_stmt(struct json_ctx *ctx,return stmt; } +static struct stmt *json_parse_last_stmt (struct json_ctx *ctx, +const char *key,json_t *value) +{ +struct stmt *stmt; +int64_t used; + +if (json_is_null (value)) +return last_stmt_alloc (int_loc); + +if (!json_unpack (value,"{s:I}" ,"used" , &used)) { + stmt =last_stmt_alloc (int_loc); +if (used !=-1 ) { + stmt->last.used = used; + stmt->last.set =1 ; + } +return stmt; + } + +return NULL ; +} +static struct stmt *json_parse_verdict_stmt (struct json_ctx *ctx,const char *key,json_t *value) {
@@ -2747,6 +2768,7 @@ static struct stmt *json_parse_stmt(struct json_ctx *ctx, json_t *root) { "counter", json_parse_counter_stmt }, { "mangle", json_parse_mangle_stmt }, { "quota", json_parse_quota_stmt }, + { "last", json_parse_last_stmt }, { "limit", json_parse_limit_stmt }, { "flow", json_parse_flow_offload_stmt }, { "fwd", json_parse_fwd_stmt },
src/statement.c +1 -0
@@ -268,6 +268,7 @@ static const struct stmt_ops last_stmt_ops = { .type = STMT_LAST, .name = "last", .print = last_stmt_print, + .json = last_stmt_json, };struct stmt *last_stmt_alloc (const struct location *loc)
tests/py/any/last.t.json new file +16 -0
@@ -0,0 +1,16 @@ +# last +[ + { + "last": null + } +] + +# last used 300s +[ + { + "last": { + "used": 300000 + } + } +] +
Signature · 1 line
2.30.2