netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH nft 1/2] doc: libnftables-json: make the example valid JSON
@ 2021-10-11 11:59 Štěpán Němec
  2021-10-11 11:59 ` [PATCH nft 2/2] doc: libnftables-json: make the example valid libnftables JSON input Štěpán Němec
  2021-10-11 16:34 ` [PATCH nft 1/2] doc: libnftables-json: make the example valid JSON Phil Sutter
  0 siblings, 2 replies; 3+ messages in thread
From: Štěpán Němec @ 2021-10-11 11:59 UTC (permalink / raw)
  To: netfilter-devel, Pablo Neira Ayuso; +Cc: Phil Sutter

Add missing comma between array elements.

Fixes: 2e56f533b36a ("doc: Improve example in libnftables-json(5)")
Signed-off-by: Štěpán Němec <snemec@redhat.com>
---
 doc/libnftables-json.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/libnftables-json.adoc b/doc/libnftables-json.adoc
index c152dc055b50..f67de33482a9 100644
--- a/doc/libnftables-json.adoc
+++ b/doc/libnftables-json.adoc
@@ -92,7 +92,7 @@ translates into JSON as such:
 			"family": "inet",
 			"table": "mytable",
 			"chain": "mychain"
-	}}}
+	}}},
 	{ "add": { "rule": {
 			"family": "inet",
 			"table": "mytable",

base-commit: 6bcd0d576a60d8a681cc6dd78551633f09534260
-- 
2.33.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH nft 2/2] doc: libnftables-json: make the example valid libnftables JSON input
  2021-10-11 11:59 [PATCH nft 1/2] doc: libnftables-json: make the example valid JSON Štěpán Němec
@ 2021-10-11 11:59 ` Štěpán Němec
  2021-10-11 16:34 ` [PATCH nft 1/2] doc: libnftables-json: make the example valid JSON Phil Sutter
  1 sibling, 0 replies; 3+ messages in thread
From: Štěpán Němec @ 2021-10-11 11:59 UTC (permalink / raw)
  To: netfilter-devel, Pablo Neira Ayuso; +Cc: Phil Sutter

Fixes: 2e56f533b36a ("doc: Improve example in libnftables-json(5)")
Fixes: 90d4ee087171 ("JSON: Make match op mandatory, introduce 'in' operator")
Signed-off-by: Štěpán Němec <snemec@redhat.com>
---
 doc/libnftables-json.adoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/libnftables-json.adoc b/doc/libnftables-json.adoc
index f67de33482a9..9cc17ff26306 100644
--- a/doc/libnftables-json.adoc
+++ b/doc/libnftables-json.adoc
@@ -91,7 +91,7 @@ translates into JSON as such:
 	{ "add": { "chain": {
 			"family": "inet",
 			"table": "mytable",
-			"chain": "mychain"
+			"name": "mychain"
 	}}},
 	{ "add": { "rule": {
 			"family": "inet",
@@ -99,6 +99,7 @@ translates into JSON as such:
 			"chain": "mychain",
 			"expr": [
 				{ "match": {
+					"op": "==",
 					"left": { "payload": {
 							"protocol": "tcp",
 							"field": "dport"
-- 
2.33.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH nft 1/2] doc: libnftables-json: make the example valid JSON
  2021-10-11 11:59 [PATCH nft 1/2] doc: libnftables-json: make the example valid JSON Štěpán Němec
  2021-10-11 11:59 ` [PATCH nft 2/2] doc: libnftables-json: make the example valid libnftables JSON input Štěpán Němec
@ 2021-10-11 16:34 ` Phil Sutter
  1 sibling, 0 replies; 3+ messages in thread
From: Phil Sutter @ 2021-10-11 16:34 UTC (permalink / raw)
  To: Štěpán Němec; +Cc: netfilter-devel, Pablo Neira Ayuso

Hi Štěpán,

On Mon, Oct 11, 2021 at 01:59:04PM +0200, Štěpán Němec wrote:
> Add missing comma between array elements.

Applied (after folding the two commits into one), thanks!

Cheers, Phil

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-10-11 16:34 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-11 11:59 [PATCH nft 1/2] doc: libnftables-json: make the example valid JSON Štěpán Němec
2021-10-11 11:59 ` [PATCH nft 2/2] doc: libnftables-json: make the example valid libnftables JSON input Štěpán Němec
2021-10-11 16:34 ` [PATCH nft 1/2] doc: libnftables-json: make the example valid JSON Phil Sutter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).