path: root/src/json.c
diff options
authorPhil Sutter <>2018-10-24 12:35:03 +0200
committerPablo Neira Ayuso <>2018-10-24 12:55:13 +0200
commit0eb1b3f9a83dfbe2f3001fd3d9cec497a352b9af (patch)
treeba1d51a8a95fe13a191ffcb8a1fa08681e9ebec3 /src/json.c
parenteff35932059569d2a36a14dd911091c0bec00032 (diff)
json: Fix osf ttl support
Having to use numerical values for ttl property in JSON is not practical as these values are arbitrary and meaningful only in netfilter. Instead align JSON output/input with standard API, accepting names for TTL matching strategy. Also add missing documentation in libnftables-json man page and fix JSON equivalent in tests/py. Fixes: 03eafe098d5ee ("osf: add ttl option support") Signed-off-by: Phil Sutter <> Signed-off-by: Pablo Neira Ayuso <>
Diffstat (limited to 'src/json.c')
1 files changed, 12 insertions, 1 deletions
diff --git a/src/json.c b/src/json.c
index cea9f19c..d21536af 100644
--- a/src/json.c
+++ b/src/json.c
@@ -857,7 +857,18 @@ json_t *socket_expr_json(const struct expr *expr, struct output_ctx *octx)
json_t *osf_expr_json(const struct expr *expr, struct output_ctx *octx)
- return json_pack("{s:{s:i, s:s}}", "osf", "ttl", expr->osf.ttl, "key", "name");
+ json_t *root = json_pack("{s:s}", "key", "name");
+ switch (expr->osf.ttl) {
+ case 1:
+ json_object_set_new(root, "ttl", json_string("loose"));
+ break;
+ case 2:
+ json_object_set_new(root, "ttl", json_string("skip"));
+ break;
+ }
+ return json_pack("{s:o}", "osf", root);
json_t *xfrm_expr_json(const struct expr *expr, struct output_ctx *octx)