parser_bison: explicit indication on export ruleset

This patch modifies the grammar to explicitly indicate what you want to
export, eg.

 # nft export ruleset json

This leaves room to extend this later on to support other object types,
such as integrating conntrack into nft.

This also leaves the syntax in consistent state wrt. other existing
objects. The existing syntax is still preserved.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/parser_bison.y b/src/parser_bison.y
index dcabb464123f891c80e54101c75b758aebc7176b..a3d93bf32a54ada2bc776074253f1beed7823a63 100644 (file)
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -879,7 +879,13 @@ rename_cmd         :       CHAIN           chain_spec      identifier
                        }
                        ;
 
-export_cmd             :       export_format
+export_cmd             :       RULESET         export_format
+                       {
+                               struct handle h = { .family = NFPROTO_UNSPEC };
+                               struct export *export = export_alloc($2);
+                               $$ = cmd_alloc(CMD_EXPORT, CMD_OBJ_EXPORT, &h, &@$, export);
+                       }
+                       |       export_format
                        {
                                struct handle h = { .family = NFPROTO_UNSPEC };
                                struct export *export = export_alloc($1);