From 8125785d5c5d35ec275e508166091d5472748bc1 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Wed, 29 Aug 2018 16:23:23 +0200
Subject: JSON: Review verdict statement and expression

Change jump and goto verdicts to become extensible by dedicating an
object for the target parameter.

While being at it, drop break and queue verdict expressions since they
don't seem to exist, no idea where I got those from in the first place.
For queue, there is a dedicated expression at least.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 doc/libnftables-json.adoc | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'doc')

diff --git a/doc/libnftables-json.adoc b/doc/libnftables-json.adoc
index 058573df..74e7d027 100644
--- a/doc/libnftables-json.adoc
+++ b/doc/libnftables-json.adoc
@@ -548,13 +548,13 @@ single statement.
 *{ "drop": null }*
 *{ "continue": null }*
 *{ "return": null }*
-*{ "jump":* 'STRING' *}*
-*{ "goto":* 'STRING' *}*
+*{ "jump": { "target": * 'STRING' *}}*
+*{ "goto": { "target": * 'STRING' *}}*
 
 A verdict either terminates packet traversal through the current chain or
 delegates to a different one.
 
-*jump* and *goto* statements expect a target chain name as value.
+*jump* and *goto* statements expect a target chain name.
 
 === MATCH
 [verse]
@@ -1177,18 +1177,16 @@ side.
 
 === VERDICT
 [verse]
-*{ "continue": null }*
-*{ "break": null }*
-*{ "jump":* 'STRING' *}*
-*{ "goto":* 'STRING' *}*
-*{ "return": null }*
 *{ "accept": null }*
 *{ "drop": null }*
-*{ "queue": null }*
+*{ "continue": null }*
+*{ "return": null }*
+*{ "jump": { "target":* 'STRING' *}}*
+*{ "goto": { "target":* 'STRING' *}}*
 
 Same as *verdict* statement, but for use in verdict maps.
 
-Only *jump* and *goto* verdicts expect a string denoting the target chain name.
+*jump* and *goto* verdicts expect a target chain name.
 
 === ELEM
 [verse]
-- 
cgit v1.2.3