src: add command tag in json/xml export support
PATCH v7 1/4 src: add command tag in json/xml export support
Currently, we can't do incremental updates. For example:
If we have a ruleset like:
table ip filter {
chain input {
type filter hook input priority 0;
}
}The new syntax is:
{"nftables":[{"add":[{"table":{"name":"filter",...}}]}]}
Moreover, this patch adds support to export this new command tag. We support all the actions that we can do with nft, they are:
- Add, delete and flush tables/chains.
- Add, delete, replace and insert rules.
- Add and delete sets.
- Add and delete set elements.
- Flush ruleset.
You only need to add the command tag:
{"nftables":[{"delete":[{...}, {...},...}]}]}
^^^^^^^^
command tagThe possible fields that we can use are "add", "delete", "flush", "insert", "replace" and "flush". For example:
- Flush table or chain:
{"nftables":[{"flush":[{"table":{"name":...}}]}]}To flush a chain. Replace the table with the chain in json format
- Delete table, chain, set or rule:
{"nftables":[{"delete":[{"chain":{"name":...}]}]}To delete a table, set or rule. Replace chain with the table, set or rule in json format.
- Replace a rule:
{"nftables":[{"replace":[{"rule":{...}}]}]}- Insert a rule:
{"nftables":[{"insert":[{"rule":{...}}]}]}We can export to the new syntax using the event flags and also you can use the new functions nft_*_cmd_snprintf. In these functions, you can specify the command that you want to set with your ruleset like a parameter.
---
[changes in v7]
* Don't expose the functions nft_*_cmd_snprintf and make it static.
include/buffer.h | 7 ++++ include/libnftnl/common.h | 9 +++++ src/buffer.c | 22 +++++++++++ src/chain.c | 23 ++++++++--- src/common.c | 93 ++++++++++++++++++++++++--------------------- src/gen.c | 23 ++++++++--- src/internal.h | 19 +++++---- src/rule.c | 23 ++++++++--- src/ruleset.c | 51 +++++++++++++++++++------ src/set.c | 23 ++++++++--- src/set_elem.c | 24 +++++++++--- src/table.c | 23 ++++++++--- src/utils.c | 24 ++++++++++-- 13 files changed, 261 insertions(+), 103 deletions(-)
include/buffer.h +7 -0
@@ -24,7 +24,9 @@ int nft_buf_done(struct nft_buf *b);union nft_data_reg ;int nft_buf_open (struct nft_buf *b,int type,const char *tag); +int nft_buf_open_array (struct nft_buf *b,int type,const char *tag);int nft_buf_close (struct nft_buf *b,int type,const char *tag); +int nft_buf_close_array (struct nft_buf *b,int type,const char *tag);int nft_buf_u32 (struct nft_buf *b,int type,uint32_t value,const char *tag);int nft_buf_s32 (struct nft_buf *b,int type,uint32_t value,const char *tag);
@@ -76,5 +78,10 @@ int nft_buf_reg(struct nft_buf *b, int type, union nft_data_reg *reg,#define UNIT "unit"#define USE "use"#define XOR "xor" +#define ADD "add" +#define INSERT "insert" +#define DELETE "delete" +#define REPLACE "replace" +#define FLUSH "flush"#endif
include/libnftnl/common.h +9 -0
@@ -21,6 +21,15 @@ enum nft_output_flags { NFT_OF_EVENT_ANY = (NFT_OF_EVENT_NEW | NFT_OF_EVENT_DEL), }; +enum nft_cmd_type { +NFT_CMD_UNSPEC =0 , +NFT_CMD_ADD , +NFT_CMD_INSERT , +NFT_CMD_DELETE , +NFT_CMD_REPLACE , +NFT_CMD_FLUSH , +}; +enum nft_parse_type {NFT_PARSE_NONE =0 ,NFT_PARSE_XML ,
src/buffer.c +22 -0
@@ -71,6 +71,17 @@ int nft_buf_open(struct nft_buf *b, int type, const char *tag) } } +int nft_buf_open_array (struct nft_buf *b,int type,const char *tag) +{ +switch (type) { +case NFT_OUTPUT_JSON : +return nft_buf_put (b,"{\"%s\":[" , tag); +case NFT_OUTPUT_XML : +default : +return 0 ; + } +} +int nft_buf_close (struct nft_buf *b,int type,const char *tag) {switch (type) {
@@ -90,6 +101,17 @@ int nft_buf_close(struct nft_buf *b, int type, const char *tag) } } +int nft_buf_close_array (struct nft_buf *b,int type,const char *tag) +{ +switch (type) { +case NFT_OUTPUT_JSON : +return nft_buf_put (b,"]}" ); +case NFT_OUTPUT_XML : +default : +return 0 ; + } +} +int nft_buf_u32 (struct nft_buf *b,int type,uint32_t value,const char *tag) {switch (type) {
src/chain.c +17 -6
@@ -847,12 +847,12 @@ static int nft_chain_snprintf_default(char *buf, size_t size,return offset; } -int nft_chain_snprintf (char *buf,size_t size,struct nft_chain *c, -uint32_t type,uint32_t flags) +static int nft_chain_cmd_snprintf (char *buf,size_t size,struct nft_chain *c, +uint32_t cmd,uint32_t type,uint32_t flags) {int ret, len = size, offset =0 ; - ret =nft_event_header_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_header_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);switch (type) {
@@ -869,15 +869,25 @@ int nft_chain_snprintf(char *buf, size_t size, struct nft_chain *c,SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =nft_event_footer_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_footer_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset; } + +int nft_chain_snprintf (char *buf,size_t size,struct nft_chain *c, +uint32_t type,uint32_t flags) +{ +uint32_t cmd; + +nft_flag2cmd (flags, &cmd); +return nft_chain_cmd_snprintf (buf, size, c, cmd, type, flags); +}EXPORT_SYMBOL (nft_chain_snprintf);static inline int nft_chain_do_snprintf (char *buf,size_t size,void *c, -uint32_t type,uint32_t flags) +uint32_t cmd,uint32_t type, +uint32_t flags) {return nft_chain_snprintf (buf, size, c, type, flags); }
@@ -885,7 +895,8 @@ static inline int nft_chain_do_snprintf(char *buf, size_t size, void *c,int nft_chain_fprintf (FILE *fp,struct nft_chain *c,uint32_t type,uint32_t flags) { -return nft_fprintf (fp, c, type, flags, nft_chain_do_snprintf); +return nft_fprintf (fp, c,NFT_CMD_UNSPEC , type, flags, + nft_chain_do_snprintf); }EXPORT_SYMBOL (nft_chain_fprintf);
src/common.c +49 -44
145 lines not on this page · raw message
src/gen.c +17 -6
@@ -161,12 +161,12 @@ static int nft_gen_snprintf_default(char *buf, size_t size, struct nft_gen *gen)return snprintf (buf, size,"ruleset generation ID %u" , gen->id); } -int nft_gen_snprintf (char *buf,size_t size,struct nft_gen *gen, -uint32_t type,uint32_t flags) +static int nft_gen_cmd_snprintf (char *buf,size_t size,struct nft_gen *gen, +uint32_t cmd,uint32_t type,uint32_t flags) {int ret, len = size, offset =0 ; - ret =nft_event_header_snprintf (buf + offset, len, type, flags); + ret =nft_cmd_header_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);switch (type) {
@@ -178,15 +178,25 @@ int nft_gen_snprintf(char *buf, size_t size, struct nft_gen *gen, }SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =nft_event_footer_snprintf (buf + offset, len, type, flags); + ret =nft_cmd_footer_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset; } + +int nft_gen_snprintf (char *buf,size_t size,struct nft_gen *gen,uint32_t type, +uint32_t flags) +{ +uint32_t cmd; + +nft_flag2cmd (flags, &cmd); +return nft_gen_cmd_snprintf (buf, size, gen, cmd, type, flags); +}EXPORT_SYMBOL (nft_gen_snprintf);static inline int nft_gen_do_snprintf (char *buf,size_t size,void *gen, -uint32_t type,uint32_t flags) +uint32_t cmd,uint32_t type, +uint32_t flags) {return nft_gen_snprintf (buf, size, gen, type, flags); }
@@ -194,6 +204,7 @@ static inline int nft_gen_do_snprintf(char *buf, size_t size, void *gen,int nft_gen_fprintf (FILE *fp,struct nft_gen *gen,uint32_t type,uint32_t flags) { -return nft_fprintf (fp, gen, type, flags, nft_gen_do_snprintf); +return nft_fprintf (fp, gen,NFT_CMD_UNSPEC , type, flags, + nft_gen_do_snprintf); }EXPORT_SYMBOL (nft_gen_fprintf);
src/internal.h +12 -7
@@ -146,16 +146,21 @@ int nft_str2family(const char *family);int nft_strtoi (const char *string,int base,void *number,enum nft_type type);const char *nft_verdict2str (uint32_t verdict);int nft_str2verdict (const char *verdict,int *verdict_num); +int nft_flag2cmd (uint32_t flags,uint32_t *cmd);int nft_get_value (enum nft_type type,void *val,void *out);#include <stdio.h> -int nft_fprintf (FILE *fp,void *obj,uint32_t type,uint32_t flags,int (*snprintf_cb)(char *buf,size_t bufsiz,void *obj,uint32_t type,uint32_t flags)); -int nft_event_header_snprintf (char *buf,size_t bufsize, -uint32_t format,uint32_t flags); -int nft_event_header_fprintf (FILE *fp,uint32_t format,uint32_t flags); -int nft_event_footer_snprintf (char *buf,size_t bufsize, -uint32_t format,uint32_t flags); -int nft_event_footer_fprintf (FILE *fp,uint32_t format,uint32_t flags); +int nft_fprintf (FILE *fp,void *obj,uint32_t cmd,uint32_t type, +uint32_t flags,int (*snprintf_cb)(char *buf,size_t bufsiz, +void *obj,uint32_t cmd,uint32_t type,uint32_t flags)); +int nft_cmd_header_snprintf (char *buf,size_t bufsize,uint32_t cmd, +uint32_t format,uint32_t flags); +int nft_cmd_header_fprintf (FILE *fp,uint32_t cmd,uint32_t format, +uint32_t flags); +int nft_cmd_footer_snprintf (char *buf,size_t bufsize,uint32_t cmd, +uint32_t format,uint32_t flags); +int nft_cmd_footer_fprintf (FILE *fp,uint32_t cmd,uint32_t format, +uint32_t flags);struct expr_ops ;
src/rule.c +17 -6
@@ -963,15 +963,15 @@ static int nft_rule_snprintf_default(char *buf, size_t size, struct nft_rule *r,return offset; } -int nft_rule_snprintf (char *buf,size_t size,struct nft_rule *r, -uint32_t type,uint32_t flags) +static int nft_rule_cmd_snprintf (char *buf,size_t size,struct nft_rule *r, +uint32_t cmd,uint32_t type,uint32_t flags) {int ret, len = size, offset =0 ;uint32_t inner_flags = flags; inner_flags &= ~NFT_OF_EVENT_ANY ; - ret =nft_event_header_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_header_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);switch (type) {
@@ -993,15 +993,25 @@ int nft_rule_snprintf(char *buf, size_t size, struct nft_rule *r,SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =nft_event_footer_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_footer_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset; } + +int nft_rule_snprintf (char *buf,size_t size,struct nft_rule *r, +uint32_t type,uint32_t flags) +{ +uint32_t cmd; + +nft_flag2cmd (flags, &cmd); +return nft_rule_cmd_snprintf (buf, size, r, cmd, type, flags); +}EXPORT_SYMBOL (nft_rule_snprintf);static inline int nft_rule_do_snprintf (char *buf,size_t size,void *r, -uint32_t type,uint32_t flags) +uint32_t cmd,uint32_t type, +uint32_t flags) {return nft_rule_snprintf (buf, size, r, type, flags); }
@@ -1009,7 +1019,8 @@ static inline int nft_rule_do_snprintf(char *buf, size_t size, void *r,int nft_rule_fprintf (FILE *fp,struct nft_rule *r,uint32_t type,uint32_t flags) { -return nft_fprintf (fp, r, type, flags, nft_rule_do_snprintf); +return nft_fprintf (fp, r,NFT_CMD_UNSPEC , type, flags, + nft_rule_do_snprintf); }EXPORT_SYMBOL (nft_rule_fprintf);
src/ruleset.c +39 -12
109 lines not on this page · raw message
src/set.c +17 -6
@@ -889,8 +889,8 @@ static int nft_set_snprintf_xml(char *buf, size_t size, struct nft_set *s,return offset; } -int nft_set_snprintf (char *buf,size_t size,struct nft_set *s, -uint32_t type,uint32_t flags) +static int nft_set_cmd_snprintf (char *buf,size_t size,struct nft_set *s, +uint32_t cmd,uint32_t type,uint32_t flags) {int ret, len = size, offset =0 ;uint32_t inner_flags = flags;
@@ -898,7 +898,7 @@ int nft_set_snprintf(char *buf, size_t size, struct nft_set *s,/* prevent set_elems to print as events */ inner_flags &= ~NFT_OF_EVENT_ANY ; - ret =nft_event_header_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_header_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);switch (type) {
@@ -919,15 +919,25 @@ int nft_set_snprintf(char *buf, size_t size, struct nft_set *s,SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =nft_event_footer_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_footer_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset; } + +int nft_set_snprintf (char *buf,size_t size,struct nft_set *s, +uint32_t type,uint32_t flags) +{ +uint32_t cmd; + +nft_flag2cmd (flags, &cmd); +return nft_set_cmd_snprintf (buf, size, s, cmd, type, flags); +}EXPORT_SYMBOL (nft_set_snprintf);static inline int nft_set_do_snprintf (char *buf,size_t size,void *s, -uint32_t type,uint32_t flags) +uint32_t cmd,uint32_t type, +uint32_t flags) {return nft_set_snprintf (buf, size, s, type, flags); }
@@ -935,7 +945,8 @@ static inline int nft_set_do_snprintf(char *buf, size_t size, void *s,int nft_set_fprintf (FILE *fp,struct nft_set *s,uint32_t type,uint32_t flags) { -return nft_fprintf (fp, s, type, flags, nft_set_do_snprintf); +return nft_fprintf (fp, s,NFT_CMD_UNSPEC , type, flags, + nft_set_do_snprintf); }EXPORT_SYMBOL (nft_set_fprintf);
src/set_elem.c +18 -6
@@ -614,12 +614,13 @@ static int nft_set_elem_snprintf_xml(char *buf, size_t size,return offset; } -int nft_set_elem_snprintf (char *buf,size_t size,struct nft_set_elem *e, -uint32_t type,uint32_t flags) +static int nft_set_elem_cmd_snprintf (char *buf,size_t size, +struct nft_set_elem *e,uint32_t cmd, +uint32_t type,uint32_t flags) {int ret, len = size, offset =0 ; - ret =nft_event_header_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_header_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);switch (type) {
@@ -638,15 +639,25 @@ int nft_set_elem_snprintf(char *buf, size_t size, struct nft_set_elem *e,SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =nft_event_footer_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_footer_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset; } + +int nft_set_elem_snprintf (char *buf,size_t size,struct nft_set_elem *e, +uint32_t type,uint32_t flags) +{ +uint32_t cmd; + +nft_flag2cmd (flags, &cmd); +return nft_set_elem_cmd_snprintf (buf, size, e, cmd, type, flags); +}EXPORT_SYMBOL (nft_set_elem_snprintf);static inline int nft_set_elem_do_snprintf (char *buf,size_t size,void *e, -uint32_t type,uint32_t flags) +uint32_t cmd,uint32_t type, +uint32_t flags) {return nft_set_elem_snprintf (buf, size, e, type, flags); }
@@ -654,7 +665,8 @@ static inline int nft_set_elem_do_snprintf(char *buf, size_t size, void *e,int nft_set_elem_fprintf (FILE *fp,struct nft_set_elem *se,uint32_t type,uint32_t flags) { -return nft_fprintf (fp, se, type, flags, nft_set_elem_do_snprintf); +return nft_fprintf (fp, se,NFT_CMD_UNSPEC , type, flags, + nft_set_elem_do_snprintf); }EXPORT_SYMBOL (nft_set_elem_fprintf);
src/table.c +17 -6
@@ -419,12 +419,12 @@ static int nft_table_snprintf_default(char *buf, size_t size, struct nft_table * t->table_flags, t->use); } -int nft_table_snprintf (char *buf,size_t size,struct nft_table *t, -uint32_t type,uint32_t flags) +static int nft_table_cmd_snprintf (char *buf,size_t size,struct nft_table *t, +uint32_t cmd,uint32_t type,uint32_t flags) {int ret, len = size, offset =0 ; - ret =nft_event_header_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_header_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);switch (type) {
@@ -440,15 +440,25 @@ int nft_table_snprintf(char *buf, size_t size, struct nft_table *t, }SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =nft_event_footer_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_footer_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset; } + +int nft_table_snprintf (char *buf,size_t size,struct nft_table *t, +uint32_t type,uint32_t flags) +{ +uint32_t cmd; + +nft_flag2cmd (flags, &cmd); +return nft_table_cmd_snprintf (buf, size, t, cmd, type, flags); +}EXPORT_SYMBOL (nft_table_snprintf);static inline int nft_table_do_snprintf (char *buf,size_t size,void *t, -uint32_t type,uint32_t flags) +uint32_t cmd,uint32_t type, +uint32_t flags) {return nft_table_snprintf (buf, size, t, type, flags); }
@@ -456,7 +466,8 @@ static inline int nft_table_do_snprintf(char *buf, size_t size, void *t,int nft_table_fprintf (FILE *fp,struct nft_table *t,uint32_t type,uint32_t flags) { -return nft_fprintf (fp, t, type, flags, nft_table_do_snprintf); +return nft_fprintf (fp, t,NFT_CMD_UNSPEC , type, flags, + nft_table_do_snprintf); }EXPORT_SYMBOL (nft_table_fprintf);
src/utils.c +20 -4
@@ -177,16 +177,32 @@ int nft_str2verdict(const char *verdict, int *verdict_num)return -1 ; } -int nft_fprintf (FILE *fp,void *obj,uint32_t type,uint32_t flags, +int nft_flag2cmd (uint32_t flags,uint32_t *cmd) +{ +if (!(flags &NFT_OF_EVENT_ANY )) { + *cmd =NFT_CMD_UNSPEC ; +return 0 ; + }else if (flags &NFT_OF_EVENT_NEW ) { + *cmd =NFT_CMD_ADD ; +return 0 ; + }else if (flags &NFT_OF_EVENT_DEL ) { + *cmd =NFT_CMD_DELETE ; +return 0 ; + } + +return -1 ; +} + +int nft_fprintf (FILE *fp,void *obj,uint32_t cmd,uint32_t type,uint32_t flags,int (*snprintf_cb)(char *buf,size_t bufsiz,void *obj, -uint32_t type,uint32_t flags)) +uint32_t cmd,uint32_t type,uint32_t flags)) {char _buf[NFT_SNPRINTF_BUFSIZ ];char *buf = _buf;size_t bufsiz =sizeof (_buf);int ret; - ret =snprintf_cb (buf, bufsiz, obj, type, flags); + ret =snprintf_cb (buf, bufsiz, obj, cmd, type, flags);if (ret <=0 ) goto out;
@@ -197,7 +213,7 @@ int nft_fprintf(FILE *fp, void *obj, uint32_t type, uint32_t flags,if (buf ==NULL )return -1 ; - ret =snprintf_cb (buf, bufsiz, obj, type, flags); + ret =snprintf_cb (buf, bufsiz, obj, cmd, type, flags);if (ret <=0 ) goto out; }
Signature · 1 line
1.7.10.4
PATCH v7 2/4 src: add support to import json/xml with the new command syntax
This patch adds support to parse the new syntax in xml/json. This patch adds two new different functions nft_ruleset_parse_*_cb. The ruleset contais differents objects (tables, chains, set and rules) of nftables. With these functions, we can pass a callback functions as parameter and we can call for each objects.
These functions use a new structure as parameter called nft_parse_ctx. This structure contains the command associated, the type of the object (table, chain, rule, set or set element) and the object.
Also, with this changes, we support to parse another new ruleset syntax:
{"nftables":[{"add":[{"element":{"name":"blackhole","table":"filter"
"family":"ip","key_type":7,"key_len":4,"set_elem":[{"key":{
"reg":{"type":"value","len":4,"data0":"0x0403a8c0"}}}]}}]}]}With this new "element", we can make incremental changes to set elements.
In short, these functions offer us the possibility to make incremental changes to the ruleset.
Moreover, this patch consolidate the code in the ruleset xml/json import support.
Another interesting goal is extend (in the future) the ruleset structure with information like the command associated to each object.
---
[changes in v7]
* Add the atribute CTX_DATA to set it. Also, to get it in userspace.
* Fix the conflict with the previously patch changes in libnftnl.map
include/libnftnl/ruleset.h | 32 ++ src/internal.h | 3 + src/libnftnl.map | 8 + src/ruleset.c | 824 +++++++++++++++++++++++++++----------------- src/set.c | 12 + src/utils.c | 17 + 6 files changed, 589 insertions(+), 307 deletions(-)
include/libnftnl/ruleset.h +32 -0
@@ -25,11 +25,43 @@ enum { NFT_RULESET_ATTR_RULELIST, }; +enum nft_ruleset_type { +NFT_RULESET_UNSPEC =0 , +NFT_RULESET_RULESET , +NFT_RULESET_TABLE , +NFT_RULESET_CHAIN , +NFT_RULESET_RULE , +NFT_RULESET_SET , +NFT_RULESET_SET_ELEMS , +}; +bool nft_ruleset_attr_is_set (const struct nft_ruleset *r,uint16_t attr);void nft_ruleset_attr_unset (struct nft_ruleset *r,uint16_t attr);void nft_ruleset_attr_set (struct nft_ruleset *r,uint16_t attr,void *data);void *nft_ruleset_attr_get (const struct nft_ruleset *r,uint16_t attr); +enum { +NFT_RULESET_CTX_CMD =0 , +NFT_RULESET_CTX_TYPE , +NFT_RULESET_CTX_TABLE , +NFT_RULESET_CTX_CHAIN , +NFT_RULESET_CTX_RULE , +NFT_RULESET_CTX_SET , +NFT_RULESET_CTX_DATA , +}; + +struct nft_parse_ctx ; +bool nft_ruleset_ctx_is_set (const struct nft_parse_ctx *ctx,uint16_t attr); +void *nft_ruleset_ctx_get (const struct nft_parse_ctx *ctx,uint16_t attr); +uint32_t nft_ruleset_ctx_get_u32 (const struct nft_parse_ctx *ctx, +uint16_t attr); + +int nft_ruleset_parse_file_cb (enum nft_parse_type type,FILE *fp, +struct nft_parse_err *err,void *data, +int (*cb)(const struct nft_parse_ctx *ctx)); +int nft_ruleset_parse_buffer_cb (enum nft_parse_type type,const char *buffer, +struct nft_parse_err *err,void *data, +int (*cb)(const struct nft_parse_ctx *ctx));int nft_ruleset_parse (struct nft_ruleset *rs,enum nft_parse_type type,const char *data,struct nft_parse_err *err); int nft_ruleset_parse_file(struct nft_ruleset *rs, enum nft_parse_type type,
src/internal.h +3 -0
@@ -139,6 +139,8 @@ int nft_jansson_parse_rule(struct nft_rule *r, json_t *tree,struct nft_set ;int nft_jansson_parse_set (struct nft_set *s,json_t *tree,struct nft_parse_err *err); +int nft_jansson_parse_elem (struct nft_set *s,json_t *tree, +struct nft_parse_err *err);#endif const char *nft_family2str (uint32_t family);
@@ -148,6 +150,7 @@ const char *nft_verdict2str(uint32_t verdict);int nft_str2verdict (const char *verdict,int *verdict_num);int nft_flag2cmd (uint32_t flags,uint32_t *cmd);int nft_get_value (enum nft_type type,void *val,void *out); +uint32_t nft_str2cmd (const char *cmd);#include <stdio.h> int nft_fprintf(FILE *fp, void *obj, uint32_t cmd, uint32_t type,
src/libnftnl.map +8 -0
@@ -227,3 +227,11 @@ LIBNFTNL_1.2 { nft_gen_snprintf; nft_gen_fprintf; } LIBNFTNL_1.1; + +LIBNFTNL_1.2.0 { + nft_ruleset_ctx_is_set; + nft_ruleset_ctx_get; + nft_ruleset_ctx_get_u32; + nft_ruleset_parse_file_cb; + nft_ruleset_parse_buffer_cb; +} LIBNFTNL_1.2;
src/ruleset.c +517 -307
999 lines not on this page · raw message
src/set.c +12 -0
@@ -511,6 +511,18 @@ int nft_jansson_parse_set(struct nft_set *s, json_t *tree,return nft_jansson_parse_set_info (s, root, err); } + +int nft_jansson_parse_elem (struct nft_set *s,json_t *tree, +struct nft_parse_err *err) +{ +json_t *root; + + root =nft_jansson_get_node (tree,"element" , err); +if (root ==NULL ) +return -1 ; + +return nft_jansson_parse_set_info (s, root, err); +}#endif static int nft_set_json_parse(struct nft_set *s, const void *json,
src/utils.c +17 -0
@@ -16,6 +16,7 @@#include <arpa/inet.h> #include <errno.h> #include <inttypes.h> +#include <buffer.h> #include <linux/netfilter.h> #include <linux/netfilter/nf_tables.h>
@@ -193,6 +194,22 @@ int nft_flag2cmd(uint32_t flags, uint32_t *cmd)return -1 ; } +uint32_t nft_str2cmd (const char *cmd) +{ +if (strcmp (cmd,ADD ) ==0 ) +return NFT_CMD_ADD ; +else if (strcmp (cmd,INSERT ) ==0 ) +return NFT_CMD_INSERT ; +else if (strcmp (cmd,DELETE ) ==0 ) +return NFT_CMD_DELETE ; +else if (strcmp (cmd,REPLACE ) ==0 ) +return NFT_CMD_REPLACE ; +else if (strcmp (cmd,FLUSH ) ==0 ) +return NFT_CMD_FLUSH ; + +return NFT_CMD_UNSPEC ; +} +int nft_fprintf (FILE *fp,void *obj,uint32_t cmd,uint32_t type,uint32_t flags,int (*snprintf_cb)(char *buf,size_t bufsiz,void *obj,uint32_t cmd,uint32_t type,uint32_t flags))
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerRe: [libnftnl PATCH 2/4 v7] src: add support to import json/xml with the new command syntax
Quoted 224 lines · Alvaro Neira Ayuso
This patch adds support to parse the new syntax in xml/json. This patch adds two new different functions nft_ruleset_parse_*_cb. The ruleset contais differents objects (tables, chains, set and rules) of nftables. With these functions, we can pass a callback functions as parameter and we can call for each objects.
These functions use a new structure as parameter called
nft_parse_ctx. This structure contains the command associated, the type of the object (table, chain, rule, set or set element) and the object.Also, with this changes, we support to parse another new ruleset syntax:
{"nftables":[{"add":[{"element":{"name":"blackhole","table":"filter" "family":"ip","key_type":7,"key_len":4,"set_elem":[{"key":{ "reg":{"type":"value","len":4,"data0":"0x0403a8c0"}}}]}}]}]}With this new "element", we can make incremental changes to set elements.
In short, these functions offer us the possibility to make incremental changes to the ruleset.
Moreover, this patch consolidate the code in the ruleset xml/json import support.
Another interesting goal is extend (in the future) the ruleset structure with information like the command associated to each object.
Signed-off-by Alvaro Neira Ayuso <[email protected]>---
[changes in v7]
* Add the atributeCTX_DATAto set it. Also, to get it in userspace.
* Fix the conflict with the previously patch changes in libnftnl.mapinclude/libnftnl/ruleset.h | 32 ++ src/internal.h | 3 + src/libnftnl.map | 8 + src/ruleset.c | 824 +++++++++++++++++++++++++++----------------- src/set.c | 12 + src/utils.c | 17 + 6 files changed, 589 insertions(+), 307 deletions(-)include/libnftnl/ruleset.h +32
-0@@ -25,11 +25,43 @@ enum { NFT_RULESET_ATTR_RULELIST, }; +enum nft_ruleset_type { +NFT_RULESET_UNSPEC =0 , +NFT_RULESET_RULESET , +NFT_RULESET_TABLE , +NFT_RULESET_CHAIN , +NFT_RULESET_RULE , +NFT_RULESET_SET , +NFT_RULESET_SET_ELEMS , +}; +bool nft_ruleset_attr_is_set (const struct nft_ruleset *r,uint16_t attr);void nft_ruleset_attr_unset (struct nft_ruleset *r,uint16_t attr);void nft_ruleset_attr_set (struct nft_ruleset *r,uint16_t attr,void *data);void *nft_ruleset_attr_get (const struct nft_ruleset *r,uint16_t attr); +enum { +NFT_RULESET_CTX_CMD =0 , +NFT_RULESET_CTX_TYPE , +NFT_RULESET_CTX_TABLE , +NFT_RULESET_CTX_CHAIN , +NFT_RULESET_CTX_RULE , +NFT_RULESET_CTX_SET , +NFT_RULESET_CTX_DATA , +}; + +struct nft_parse_ctx ; +bool nft_ruleset_ctx_is_set (const struct nft_parse_ctx *ctx,uint16_t attr); +void *nft_ruleset_ctx_get (const struct nft_parse_ctx *ctx,uint16_t attr); +uint32_t nft_ruleset_ctx_get_u32 (const struct nft_parse_ctx *ctx, +uint16_t attr); + +int nft_ruleset_parse_file_cb (enum nft_parse_type type,FILE *fp, +struct nft_parse_err *err,void *data, +int (*cb)(const struct nft_parse_ctx *ctx)); +int nft_ruleset_parse_buffer_cb (enum nft_parse_type type,const char *buffer, +struct nft_parse_err *err,void *data, +int (*cb)(const struct nft_parse_ctx *ctx));int nft_ruleset_parse (struct nft_ruleset *rs,enum nft_parse_type type,const char *data,struct nft_parse_err *err); int nft_ruleset_parse_file(struct nft_ruleset *rs, enum nft_parse_type type,src/internal.h +3
-0@@ -139,6 +139,8 @@ int nft_jansson_parse_rule(struct nft_rule *r, json_t *tree,struct nft_set ;int nft_jansson_parse_set (struct nft_set *s,json_t *tree,struct nft_parse_err *err); +int nft_jansson_parse_elem (struct nft_set *s,json_t *tree, +struct nft_parse_err *err);#endif const char *nft_family2str (uint32_t family);@@ -148,6 +150,7 @@ const char *nft_verdict2str(uint32_t verdict);int nft_str2verdict (const char *verdict,int *verdict_num);int nft_flag2cmd (uint32_t flags,uint32_t *cmd);int nft_get_value (enum nft_type type,void *val,void *out); +uint32_t nft_str2cmd (const char *cmd);#include <stdio.h> int nft_fprintf(FILE *fp, void *obj, uint32_t cmd, uint32_t type,src/libnftnl.map +8
-0@@ -227,3 +227,11 @@ LIBNFTNL_1.2 { nft_gen_snprintf; nft_gen_fprintf; } LIBNFTNL_1.1; + +LIBNFTNL_1.2.0 { + nft_ruleset_ctx_is_set; + nft_ruleset_ctx_get; + nft_ruleset_ctx_get_u32; + nft_ruleset_parse_file_cb; + nft_ruleset_parse_buffer_cb; +} LIBNFTNL_1.2;src/ruleset.c +81
-3@@ -32,6 +32,32 @@ struct nft_ruleset {uint16_t flags; }; +struct nft_parse_ctx { +enum nft_cmd_type cmd; +enum nft_ruleset_type type; +union { +struct nft_table *table; +struct nft_chain *chain; +struct nft_rule *rule; +struct nft_set *set; +struct nft_set_elem *set_elem; + }; +void *data; + +/* These fields below are not exposed to the user */ +union { +json_t *json; +mxml_node_t *xml; + }; + +uint32_t format; +uint32_t set_id; +struct nft_set_list *set_list; + +int (*cb)(const struct nft_parse_ctx *ctx); +uint16_t flags; +}; +struct nft_ruleset *nft_ruleset_alloc (void ) {return calloc (1 ,sizeof (struct nft_ruleset ));@@ -131,230 +157,419 @@ void *nft_ruleset_attr_get(const struct nft_ruleset *r, uint16_t attr) }EXPORT_SYMBOL (nft_ruleset_attr_get); -#ifdef JSON_PARSING -static int nft_ruleset_json_parse_tables (struct nft_ruleset *rs,json_t *array, -struct nft_parse_err *err) +bool nft_ruleset_ctx_is_set (const struct nft_parse_ctx *ctx,uint16_t attr) +{ +return ctx->flags & (1 << attr); +} +EXPORT_SYMBOL (nft_ruleset_ctx_is_set); + +void *nft_ruleset_ctx_get (const struct nft_parse_ctx *ctx,uint16_t attr) +{ +if (!(ctx->flags & (1 << attr))) +return NULL ; + +switch (attr) { +case NFT_RULESET_CTX_CMD : +return (void *)&ctx->cmd; +case NFT_RULESET_CTX_TYPE : +return (void *)&ctx->type; +case NFT_RULESET_CTX_TABLE : +return ctx->table; +case NFT_RULESET_CTX_CHAIN : +return ctx->chain; +case NFT_RULESET_CTX_RULE : +return ctx->rule; +case NFT_RULESET_CTX_SET : +return ctx->set; +case NFT_RULESET_CTX_DATA : +return ctx->data; +default : +return NULL ; + } +} +EXPORT_SYMBOL (nft_ruleset_ctx_get); + +uint32_t nft_ruleset_ctx_get_u32 (const struct nft_parse_ctx *ctx,uint16_t attr) +{ +const void *ret =nft_ruleset_ctx_get (ctx, attr); +return ret ==NULL ?0 : *((uint32_t *)ret); +} +EXPORT_SYMBOL (nft_ruleset_ctx_get_u32); + +#if defined(JSON_PARSING ) || defined(XML_PARSING ) +static void nft_ruleset_ctx_unset (struct nft_parse_ctx *ctx,uint16_t attr) +{ +if (!(ctx->flags & (1 << attr))) +return ; + +switch (attr) { +case NFT_RULESET_CTX_CMD : +case NFT_RULESET_CTX_TYPE : +break ; +case NFT_RULESET_CTX_TABLE : + ctx->table =NULL ; +break ; +case NFT_RULESET_CTX_CHAIN : + ctx->chain =NULL ; +break ;
src/ruleset.c void *nft_ruleset_attr_get(const struct nft_ruleset *r, uint16_t attr) · line 224
Quoted 10 lines
src/ruleset.c +10
-0+case NFT_RULESET_CTX_RULE : + ctx->rule =NULL ; +break ; +case NFT_RULESET_CTX_SET : + ctx->set =NULL ; +break ; +case NFT_RULESET_CTX_DATA : + ctx->data =NULL ; +break ; + }
I think you don't need to set all these pointers to NULL.
src/ruleset.c void *nft_ruleset_attr_get(const struct nft_ruleset *r, uint16_t attr) · line 225
Quoted 1 line
src/ruleset.c +1
-0+ ctx->flags &= ~(1 << attr);
Unsetting the flag should be sufficient.
src/ruleset.c void *nft_ruleset_attr_get(const struct nft_ruleset *r, uint16_t attr) · line 233
Quoted 8 lines
src/ruleset.c +8
-0+} + +static void nft_ruleset_ctx_set (struct nft_parse_ctx *ctx,uint16_t attr, +void *data) +{ +switch (attr) { +case NFT_RULESET_CTX_CMD : +nft_ruleset_ctx_unset (ctx,NFT_RULESET_CTX_CMD );
You don't need to call unset first.
Quoted 58 lines
src/ruleset.c +40
-11+ ctx->cmd = *((uint32_t *)data); +break ; +case NFT_RULESET_CTX_TYPE : +nft_ruleset_ctx_unset (ctx,NFT_RULESET_CTX_TYPE ); + ctx->type = *((uint32_t *)data); +break ; +case NFT_RULESET_CTX_TABLE : +nft_ruleset_ctx_unset (ctx,NFT_RULESET_CTX_TABLE ); + ctx->table = data; +break ; +case NFT_RULESET_CTX_CHAIN : +nft_ruleset_ctx_unset (ctx,NFT_RULESET_CTX_CHAIN ); + ctx->chain = data; +break ; +case NFT_RULESET_CTX_RULE : +nft_ruleset_ctx_unset (ctx,NFT_RULESET_CTX_RULE ); + ctx->rule = data; +break ; +case NFT_RULESET_CTX_SET : +nft_ruleset_ctx_unset (ctx,NFT_RULESET_CTX_SET ); + ctx->set = data; +break ; +case NFT_RULESET_CTX_DATA : +nft_ruleset_ctx_unset (ctx,NFT_RULESET_CTX_DATA ); + ctx->data = data; +break ; + } + ctx->flags |= (1 << attr); +} + +static void nft_ruleset_ctx_set_u32 (struct nft_parse_ctx *ctx,uint16_t attr, +uint32_t val) +{ +nft_ruleset_ctx_set (ctx, attr, &val); +} + +static int nft_ruleset_parse_tables (struct nft_parse_ctx *ctx, +struct nft_parse_err *err) { -int i, len; -json_t *node;struct nft_table *table; -struct nft_table_list *list =nft_table_list_alloc (); -if (list ==NULL ) { + table =nft_table_alloc (); +if (table ==NULL ) { errno =ENOMEM ;return -1 ; } - len =json_array_size (array); -for (i =0 ; i < len; i++) { - node =json_array_get (array, i); -if (node ==NULL ) { - errno =EINVAL ; - goto err; - }
src/ruleset.c void *nft_ruleset_attr_get(const struct nft_ruleset *r, uint16_t attr) · line 283
Quoted 10 lines
src/ruleset.c +3
-7- -if (!(nft_jansson_node_exist (node,"table" ))) -continue ; - - table =nft_table_alloc (); -if (table ==NULL ) { - errno =ENOMEM ; +switch (ctx->format) { +case NFT_OUTPUT_JSON : +#ifdef JSON_PARSING
Can you move this ifdef inside nft_jansson_parse_table().
I mean:
int nft_jansson_parse_table(...)
{
#ifdef JSON_PARSING
...
#else
errno = EOPNOTSUPP;
return -1;#endif
}
Quoted 112 lines
src/ruleset.c +49
-41+if (nft_jansson_parse_table (table, ctx->json, err) <0 ) goto err; - } - -if (nft_jansson_parse_table (table, node, err) <0 ) { -nft_table_free (table); +#endif +break ; +case NFT_OUTPUT_XML : +#ifdef XML_PARSING +if (nft_mxml_table_parse (ctx->xml, table, err) <0 ) goto err; - } - -nft_table_list_add_tail (table, list); +#endif +break ; +default : +return -1 ; } -if (!nft_table_list_is_empty (list)) -nft_ruleset_attr_set (rs,NFT_RULESET_ATTR_TABLELIST , list); -else -nft_table_list_free (list); +nft_ruleset_ctx_set_u32 (ctx,NFT_RULESET_CTX_TYPE ,NFT_RULESET_TABLE ); +nft_ruleset_ctx_set (ctx,NFT_RULESET_CTX_TABLE , table); +if (ctx->cb (ctx) <0 ) + goto err;return 0 ; err: -nft_table_list_free (list); +nft_table_free (table);return -1 ; } -static int nft_ruleset_json_parse_chains (struct nft_ruleset *rs,json_t *array, -struct nft_parse_err *err) +static int nft_ruleset_parse_chains (struct nft_parse_ctx *ctx, +struct nft_parse_err *err) { -int i, len; -json_t *node;struct nft_chain *chain; -struct nft_chain_list *list =nft_chain_list_alloc (); -if (list ==NULL ) { + chain =nft_chain_alloc (); +if (chain ==NULL ) { errno =ENOMEM ;return -1 ; } - len =json_array_size (array); -for (i =0 ; i < len; i++) { - node =json_array_get (array, i); -if (node ==NULL ) { - errno =EINVAL ; +switch (ctx->format) { +case NFT_OUTPUT_JSON : +#ifdef JSON_PARSING +if (nft_jansson_parse_chain (chain, ctx->json, err) <0 ) goto err; - } - -if (!(nft_jansson_node_exist (node,"chain" ))) -continue ; - - chain =nft_chain_alloc (); -if (chain ==NULL ) { - errno =ENOMEM ; +#endif +break ; +case NFT_OUTPUT_XML : +#ifdef XML_PARSING +if (nft_mxml_chain_parse (ctx->xml, chain, err) <0 ) goto err; - } +#endif +break ; +default : +return -1 ; + } -if (nft_jansson_parse_chain (chain, node, err) <0 ) { -nft_chain_free (chain); - goto err; - } +nft_ruleset_ctx_set_u32 (ctx,NFT_RULESET_CTX_TYPE ,NFT_RULESET_CHAIN ); +nft_ruleset_ctx_set (ctx,NFT_RULESET_CTX_CHAIN , chain); +if (ctx->cb (ctx) <0 ) + goto err; -nft_chain_list_add_tail (chain, list); - } +return 0 ; +err: +nft_chain_free (chain); +return -1 ; +} + +static int nft_ruleset_parse_set (struct nft_parse_ctx *ctx, +struct nft_set *set,uint32_t type, +struct nft_parse_err *err) +{ +nft_set_attr_set_u32 (set,NFT_SET_ATTR_ID , ctx->set_id++); +nft_set_list_add_tail (set, ctx->set_list); -if (!nft_chain_list_is_empty (list)) -nft_ruleset_attr_set (rs,NFT_RULESET_ATTR_CHAINLIST , list); -else
src/ruleset.c void *nft_ruleset_attr_get(const struct nft_ruleset *r, uint16_t attr) · line 362
Quoted 10 lines
src/ruleset.c +5
-2-nft_chain_list_free (list); +nft_ruleset_ctx_set_u32 (ctx,NFT_RULESET_CTX_TYPE , type); +nft_ruleset_ctx_set (ctx,NFT_RULESET_CTX_SET , set); +if (ctx->cb (ctx) <0 ) + goto err;return 0 ; err: -nft_chain_list_free (list); +nft_set_free (set);
Do you really have to release this set here? This object is not allocated by us, this is received as a parameter. The caller should be resposible for releasing this IMO.
Quoted 54 lines
src/ruleset.c +23
-17return -1 ; } -static int nft_ruleset_json_parse_sets (struct nft_ruleset *rs,json_t *array, +static int nft_ruleset_parse_set_elems (struct nft_parse_ctx *ctx,struct nft_parse_err *err) { -int i, len; -uint32_t set_id =0 ; -json_t *node;struct nft_set *set; -struct nft_set_list *list =nft_set_list_alloc (); -if (list ==NULL ) { + set =nft_set_alloc (); +if (set ==NULL ) { errno =ENOMEM ;return -1 ; } - len =json_array_size (array); -for (i =0 ; i < len; i++) { - node =json_array_get (array, i); -if (node ==NULL ) { - errno =EINVAL ; +switch (ctx->format) { +case NFT_OUTPUT_JSON : +#ifdef JSON_PARSING +if (nft_jansson_parse_elem (set, ctx->json, err) <0 ) goto err; - } +#endif +break ; +case NFT_OUTPUT_XML : +#ifdef XML_PARSING +if (nft_mxml_set_parse (ctx->xml, set, err) <0 ) + goto err; +#endif +break ; +default : +return -1 ; + } -if (!(nft_jansson_node_exist (node,"set" ))) -continue ; +return nft_ruleset_parse_set (ctx, set,NFT_RULESET_SET_ELEMS , err); +err: +nft_set_free (set); +return -1 ; +} - set =nft_set_alloc (); -if (set ==NULL ) { - errno =ENOMEM ;
src/ruleset.c void *nft_ruleset_attr_get(const struct nft_ruleset *r, uint16_t attr) · line 407
Quoted 10 lines
src/ruleset.c +8
-2- goto err; - } +static int nft_ruleset_parse_sets (struct nft_parse_ctx *ctx, +struct nft_parse_err *err) +{ +struct nft_set *set; + + set =nft_set_alloc (); +if (set ==NULL ) { + errno =ENOMEM ;
No need to set errno: malloc() / calloc() already sets this for you when it fails.
Quoted 112 lines
src/ruleset.c +63
-29+ return -1; + } -if (nft_jansson_parse_set (set, node, err) <0 ) { -nft_set_free (set); +switch (ctx->format) { +case NFT_OUTPUT_JSON : +#ifdef JSON_PARSING +if (nft_jansson_parse_set (set, ctx->json, err) <0 ) goto err; - } +#endif +break ; +case NFT_OUTPUT_XML : +#ifdef XML_PARSING +if (nft_mxml_set_parse (ctx->xml, set, err) <0 ) + goto err; +#endif +break ; +default : +return -1 ; + } -nft_set_attr_set_u32 (set,NFT_SET_ATTR_ID , set_id++); -nft_set_list_add_tail (set, list); +return nft_ruleset_parse_set (ctx, set,NFT_RULESET_SET , err); +err: +nft_set_free (set); +return -1 ; +} + +static int nft_ruleset_parse_rules (struct nft_parse_ctx *ctx, +struct nft_parse_err *err) +{ +struct nft_rule *rule; + + rule =nft_rule_alloc (); +if (rule ==NULL ) { + errno =ENOMEM ; +return -1 ; } -if (!nft_set_list_is_empty (list)) -nft_ruleset_attr_set (rs,NFT_RULESET_ATTR_SETLIST , list); -else -nft_set_list_free (list); +switch (ctx->format) { +case NFT_OUTPUT_JSON : +#ifdef JSON_PARSING +if (nft_jansson_parse_rule (rule, ctx->json, err, + ctx->set_list) <0 ) + goto err; +#endif +break ; +case NFT_OUTPUT_XML : +#ifdef XML_PARSING +if (nft_mxml_rule_parse (ctx->xml, rule, err, ctx->set_list) <0 ) + goto err; +#endif +break ; +default : +return -1 ; + } + +nft_ruleset_ctx_set_u32 (ctx,NFT_RULESET_CTX_TYPE ,NFT_RULESET_RULE ); +nft_ruleset_ctx_set (ctx,NFT_RULESET_CTX_RULE , rule); +if (ctx->cb (ctx) <0 ) + goto err;return 0 ; err: -nft_set_list_free (list); +nft_rule_free (rule);return -1 ; } +#endif -static int nft_ruleset_json_parse_rules (struct nft_ruleset *rs,json_t *array, -struct nft_parse_err *err) +#ifdef JSON_PARSING +static int nft_ruleset_json_parse_ruleset (struct nft_parse_ctx *ctx, +struct nft_parse_err *err) { -int i, len; -json_t *node; -struct nft_rule *rule =NULL ; -struct nft_rule_list *list =nft_rule_list_alloc (); +json_t *node, *array = ctx->json; +int len, i; -if (list ==NULL ) { - errno =ENOMEM ; + ctx->set_list =nft_set_list_alloc (); +if (ctx->set_list ==NULL )return -1 ; - } len =json_array_size (array);for (i =0 ; i < len; i++) { node =json_array_get (array, i);if (node ==NULL ) { errno =EINVAL ; - goto err; - } - -if (!(nft_jansson_node_exist (node,"rule" ))) -continue ; - - rule =nft_rule_alloc (); -if (rule ==NULL ) { - errno =ENOMEM ; - goto err;
src/ruleset.c void *nft_ruleset_attr_get(const struct nft_ruleset *r, uint16_t attr) · line 497
Quoted 10 lines
src/ruleset.c +5
-3+return -1 ; } -if (nft_jansson_parse_rule (rule, node, err, rs->set_list) <0 ) { -nft_rule_free (rule); - goto err; + ctx->json = node; +if (nft_jansson_node_exist (node,"table" )) { +if (nft_ruleset_parse_tables (ctx, err) <0 ) +return -1 ;
You can get better code if you use this pattern instead:
err = nft_ruleset_parse_tables(...);
and see below...
Quoted 5 lines
src/ruleset.c +5
-0+ }else if (nft_jansson_node_exist (node,"chain" )) { +if (nft_ruleset_parse_chains (ctx, err) <0 ) +return -1 ; + }else if (nft_jansson_node_exist (node,"set" )) { +if (nft_ruleset_parse_sets (ctx, err) <0 )
src/ruleset.c void *nft_ruleset_attr_get(const struct nft_ruleset *r, uint16_t attr) · line 512
Quoted 10 lines
src/ruleset.c +9
-0+return -1 ; + }else if (nft_jansson_node_exist (node,"rule" )) { +if (nft_ruleset_parse_rules (ctx, err) <0 ) +return -1 ; + }else if (nft_jansson_node_exist (node,"element" )) { +if (nft_ruleset_parse_set_elems (ctx, err) <0 ) +return -1 ; + }else { +return -1 ; }
Then, here you add:
if (err < 0)
return err;Quoted 209 lines
src/ruleset.c +65
-102- - nft_rule_list_add_tail(rule, list); } -if (!nft_rule_list_is_empty (list)) -nft_ruleset_attr_set (rs,NFT_RULESET_ATTR_RULELIST , list); -else -nft_rule_list_free (list); +if (len ==0 && ctx->cmd ==NFT_CMD_FLUSH ) { +nft_ruleset_ctx_set_u32 (ctx,NFT_RULESET_CTX_TYPE , +NFT_RULESET_RULESET ); +if (ctx->cb (ctx) <0 ) +return -1 ; + }return 0 ; -err: -nft_rule_list_free (list); -return -1 ; } -static int nft_ruleset_json_parse_ruleset (struct nft_ruleset *rs,json_t *array, -struct nft_parse_err *err) +static int nft_ruleset_json_parse_cmd (const char *cmd, +struct nft_parse_err *err, +struct nft_parse_ctx *ctx) { -if (nft_ruleset_json_parse_tables (rs, array, err) !=0 ) -return -1 ; +uint32_t cmdnum; +json_t *nodecmd; -if (nft_ruleset_json_parse_chains (rs, array, err) !=0 ) + cmdnum =nft_str2cmd (cmd); +if (cmdnum ==NFT_CMD_UNSPEC ) { + err->error =NFT_PARSE_EMISSINGNODE ; + err->node_name =strdup (cmd);return -1 ; + } -if (nft_ruleset_json_parse_sets (rs, array, err) !=0 ) -return -1 ; +nft_ruleset_ctx_set_u32 (ctx,NFT_RULESET_CTX_CMD , cmdnum); -if (nft_ruleset_json_parse_rules (rs, array, err) !=0 ) -return -1 ; + nodecmd =json_object_get (ctx->json, cmd); +if (nodecmd ==NULL ) +return 0 ; + + ctx->json = nodecmd; +if (nft_ruleset_json_parse_ruleset (ctx, err) !=0 ) + goto err;return 0 ; +err: +return -1 ; }#endif -static int nft_ruleset_json_parse (struct nft_ruleset *rs,const void *json, -struct nft_parse_err *err,enum nft_parse_input input) +static int nft_ruleset_json_parse (const void *json, +struct nft_parse_err *err, +enum nft_parse_input input, +enum nft_parse_type type,void *arg, +int (*cb)(const struct nft_parse_ctx *ctx)) {#ifdef JSON_PARSING -json_t *root, *array; +json_t *root, *array, *node;json_error_t error; +int i, len; +const char *key; +struct nft_parse_ctx ctx; + + ctx.cb = cb; + ctx.format = type; + +if (arg !=NULL ) +nft_ruleset_ctx_set (&ctx,NFT_RULESET_CTX_DATA , arg); root =nft_jansson_create_root (json, &error, err, input);if (root ==NULL )@@ -366,8 +581,21 @@ static int nft_ruleset_json_parse(struct nft_ruleset *rs, const void *json, goto err; } -if (nft_ruleset_json_parse_ruleset (rs, array, err) !=0 ) - goto err; + len =json_array_size (array); +for (i =0 ; i < len; i++) { + node =json_array_get (array, i); +if (node ==NULL ) { + errno =EINVAL ; + goto err; + } + ctx.json = node; + key =json_object_iter_key (json_object_iter (node)); +if (key ==NULL ) + goto err; + +if (nft_ruleset_json_parse_cmd (key, err, &ctx) <0 ) + goto err; + }nft_jansson_free_root (root);return 0 ;@@ -381,203 +609,113 @@ err: }#ifdef XML_PARSING -static int -nft_ruleset_xml_parse_tables (struct nft_ruleset *rs,mxml_node_t *tree, -struct nft_parse_err *err) +static int nft_ruleset_xml_parse_ruleset (struct nft_parse_ctx *ctx, +struct nft_parse_err *err) { -mxml_node_t *node; -struct nft_table *table; -struct nft_table_list *table_list =nft_table_list_alloc (); -if (table_list ==NULL ) { - errno =ENOMEM ; -return -1 ; - } - -for (node =mxmlFindElement (tree, tree,"table" ,NULL ,NULL , -MXML_DESCEND_FIRST ); - node !=NULL ; - node =mxmlFindElement (node, tree,"table" ,NULL ,NULL , -MXML_NO_DESCEND )) { - table =nft_table_alloc (); -if (table ==NULL ) - goto err_free; - -if (nft_mxml_table_parse (node, table, err) !=0 ) { -nft_table_free (table); - goto err_free; - } - -nft_table_list_add_tail (table, table_list); - } - -if (!nft_table_list_is_empty (table_list)) -nft_ruleset_attr_set (rs,NFT_RULESET_ATTR_TABLELIST , - table_list); -else -nft_table_list_free (table_list); +const char *node_type; +mxml_node_t *node, *array = ctx->xml; +int len =0 ; -return 0 ; -err_free: -nft_table_list_free (table_list); -return -1 ; -} - -static int -nft_ruleset_xml_parse_chains (struct nft_ruleset *rs,mxml_node_t *tree, -struct nft_parse_err *err) -{ -mxml_node_t *node; -struct nft_chain *chain; -struct nft_chain_list *chain_list =nft_chain_list_alloc (); -if (chain_list ==NULL ) { + ctx->set_list =nft_set_list_alloc (); +if (ctx->set_list ==NULL ) { errno =ENOMEM ;return -1 ; } -for (node =mxmlFindElement (tree, tree,"chain" ,NULL ,NULL , +for (node =mxmlFindElement (array, array,NULL ,NULL ,NULL ,MXML_DESCEND_FIRST ); node !=NULL ; - node =mxmlFindElement (node, tree,"chain" ,NULL ,NULL , + node =mxmlFindElement (node, array,NULL ,NULL ,NULL ,MXML_NO_DESCEND )) { - chain =nft_chain_alloc (); -if (chain ==NULL ) - goto err_free; - -if (nft_mxml_chain_parse (node, chain, err) !=0 ) { -nft_chain_free (chain); - goto err_free; - } - -nft_chain_list_add_tail (chain, chain_list); - } - -if (!nft_chain_list_is_empty (chain_list)) -nft_ruleset_attr_set (rs,NFT_RULESET_ATTR_CHAINLIST , - chain_list); -else -nft_chain_list_free (chain_list); - -return 0 ; -err_free: -nft_chain_list_free (chain_list); -return -1 ; -} - -static int -nft_ruleset_xml_parse_sets (struct nft_ruleset *rs,mxml_node_t *tree, -struct nft_parse_err *err) -{ -uint32_t set_id =0 ; -mxml_node_t *node;
src/ruleset.c err: · line 634
Quoted 10 lines
src/ruleset.c +5
-5-struct nft_set *set; -struct nft_set_list *set_list =nft_set_list_alloc (); -if (set_list ==NULL ) { - errno =ENOMEM ; -return -1 ; + len++; + node_type = node->value.opaque; + ctx->xml = node; +if (strcmp (node_type,"table" ) ==0 ) { +if (nft_ruleset_parse_tables (ctx, err) !=0 )
You can perform the same consolidation as above.
Quoted 201 lines
src/ruleset.c +71
-83+ return -1; + }else if (strcmp (node_type,"chain" ) ==0 ) { +if (nft_ruleset_parse_chains (ctx, err) !=0 ) +return -1 ; + }else if (strcmp (node_type,"set" ) ==0 ) { +if (nft_ruleset_parse_sets (ctx, err) !=0 ) +return -1 ; + }else if (strcmp (node_type,"rule" ) ==0 ) { +if (nft_ruleset_parse_rules (ctx, err) !=0 ) +return -1 ; + }else if (strcmp (node_type,"element" ) ==0 ) { +if (nft_ruleset_parse_set_elems (ctx, err) !=0 ) +return -1 ; + }else +return -1 ; } -for (node =mxmlFindElement (tree, tree,"set" ,NULL ,NULL , -MXML_DESCEND_FIRST ); - node !=NULL ; - node =mxmlFindElement (node, tree,"set" ,NULL ,NULL , -MXML_NO_DESCEND )) { - set =nft_set_alloc (); -if (set ==NULL ) - goto err_free; - -if (nft_mxml_set_parse (node, set, err) !=0 ) { -nft_set_free (set); - goto err_free; - } - -nft_set_attr_set_u32 (set,NFT_SET_ATTR_ID , set_id++); -nft_set_list_add_tail (set, set_list); +if (len ==0 && ctx->cmd ==NFT_CMD_FLUSH ) { +nft_ruleset_ctx_set_u32 (ctx,NFT_RULESET_CTX_TYPE , +NFT_RULESET_RULESET ); +if (ctx->cb (ctx) <0 ) +return -1 ; } -if (!nft_set_list_is_empty (set_list)) -nft_ruleset_attr_set (rs,NFT_RULESET_ATTR_SETLIST , set_list); -else -nft_set_list_free (set_list); -return 0 ; -err_free: -nft_set_list_free (set_list); -return -1 ; } -static int -nft_ruleset_xml_parse_rules (struct nft_ruleset *rs,mxml_node_t *tree, -struct nft_parse_err *err, -struct nft_set_list *set_list) +static int nft_ruleset_xml_parse_cmd (const char *cmd,struct nft_parse_err *err, +struct nft_parse_ctx *ctx) { -mxml_node_t *node; -struct nft_rule *rule; -struct nft_rule_list *rule_list =nft_rule_list_alloc (); -if (rule_list ==NULL ) { - errno =ENOMEM ; +uint32_t cmdnum; +mxml_node_t *nodecmd; + + cmdnum =nft_str2cmd (cmd); +if (cmdnum ==NFT_CMD_UNSPEC ) { + err->error =NFT_PARSE_EMISSINGNODE ; + err->node_name =strdup (cmd);return -1 ; } -for (node =mxmlFindElement (tree, tree,"rule" ,NULL ,NULL , -MXML_DESCEND_FIRST ); - node !=NULL ; - node =mxmlFindElement (node, tree,"rule" ,NULL ,NULL , -MXML_NO_DESCEND )) { - rule =nft_rule_alloc (); -if (rule ==NULL ) - goto err_free; + nodecmd =mxmlFindElement (ctx->xml, ctx->xml, cmd,NULL ,NULL , +MXML_DESCEND_FIRST ); -if (nft_mxml_rule_parse (node, rule, err, set_list) !=0 ) { -nft_rule_free (rule); - goto err_free; - } + ctx->xml = nodecmd; +nft_ruleset_ctx_set_u32 (ctx,NFT_RULESET_CTX_CMD , cmdnum); -nft_rule_list_add_tail (rule, rule_list); - } - -if (!nft_rule_list_is_empty (rule_list)) -nft_ruleset_attr_set (rs,NFT_RULESET_ATTR_RULELIST , rule_list); -else -nft_rule_list_free (rule_list); +if (nft_ruleset_xml_parse_ruleset (ctx, err) !=0 ) + goto err;return 0 ; -err_free: -nft_rule_list_free (rule_list); +err:return -1 ; } - -static int nft_ruleset_xml_parse_ruleset (struct nft_ruleset *rs, -mxml_node_t *tree, -struct nft_parse_err *err) -{ -if (nft_ruleset_xml_parse_tables (rs, tree, err) !=0 ) -return -1 ; - -if (nft_ruleset_xml_parse_chains (rs, tree, err) !=0 ) -return -1 ; - -if (nft_ruleset_xml_parse_sets (rs, tree, err) !=0 ) -return -1 ; - -if (nft_ruleset_xml_parse_rules (rs, tree, err, rs->set_list) !=0 ) -return -1 ; - -return 0 ; -}#endif -static int nft_ruleset_xml_parse (struct nft_ruleset *rs,const void *xml, -struct nft_parse_err *err,enum nft_parse_input input) +static int nft_ruleset_xml_parse (const void *xml,struct nft_parse_err *err, +enum nft_parse_input input, +enum nft_parse_type type,void *arg, +int (*cb)(const struct nft_parse_ctx *ctx)) {#ifdef XML_PARSING -mxml_node_t *tree; +mxml_node_t *tree, *nodecmd =NULL ; +char *cmd; +struct nft_parse_ctx ctx; + + ctx.cb = cb; + ctx.format = type; + +if (arg !=NULL ) +nft_ruleset_ctx_set (&ctx,NFT_RULESET_CTX_DATA , arg); tree =nft_mxml_build_tree (xml,"nftables" , err, input);if (tree ==NULL )return -1 ; -if (nft_ruleset_xml_parse_ruleset (rs, tree, err) !=0 ) - goto err; + ctx.xml = tree; + + nodecmd =mxmlWalkNext (tree, tree,MXML_DESCEND_FIRST ); +while (nodecmd !=NULL ) { + cmd = nodecmd->value.opaque; +if (nft_ruleset_xml_parse_cmd (cmd, err, &ctx) <0 ) + goto err; + nodecmd =mxmlWalkNext (tree, tree,MXML_NO_DESCEND ); + }mxmlDelete (tree);return 0 ;@@ -591,18 +729,18 @@ err: }static int -nft_ruleset_do_parse (struct nft_ruleset *r,enum nft_parse_type type, -const void *data,struct nft_parse_err *err, -enum nft_parse_input input) +nft_ruleset_do_parse (enum nft_parse_type type,const void *data, +struct nft_parse_err *err,enum nft_parse_input input, +void *arg,int (*cb)(const struct nft_parse_ctx *ctx)) {int ret;switch (type) {case NFT_PARSE_XML : - ret =nft_ruleset_xml_parse (r, data, err, input); + ret =nft_ruleset_xml_parse (data, err, input, type, arg, cb);break ;case NFT_PARSE_JSON : - ret =nft_ruleset_json_parse (r, data, err, input); + ret =nft_ruleset_json_parse (data, err, input, type, arg, cb);break ;default : ret =-1 ;@@ -613,17 +751,89 @@ nft_ruleset_do_parse(struct nft_ruleset *r, enum nft_parse_type type,return ret; } +int nft_ruleset_parse_file_cb (enum nft_parse_type type,FILE *fp, +struct nft_parse_err *err,void *data, +int (*cb)(const struct nft_parse_ctx *ctx)) +{ +return nft_ruleset_do_parse (type, fp, err,NFT_PARSE_FILE , data, cb); +} +EXPORT_SYMBOL (nft_ruleset_parse_file_cb); +
src/ruleset.c nft_ruleset_do_parse(struct nft_ruleset *r, enum nft_parse_type type, · line 771
Quoted 10 lines
src/ruleset.c +10
-0+int nft_ruleset_parse_buffer_cb (enum nft_parse_type type,const char *buffer, +struct nft_parse_err *err,void *data, +int (*cb)(const struct nft_parse_ctx *ctx)) +{ +return nft_ruleset_do_parse (type, buffer, err,NFT_PARSE_BUFFER , data, + cb); +} +EXPORT_SYMBOL (nft_ruleset_parse_buffer_cb); + +static int nft_ruleset_init_ruleset (const struct nft_parse_ctx *ctx)
^^^^^^^ ^^^^^^^
I'm pretty sure you can get a better name here. I'd suggest:
static int nft_ruleset_cb(...)
src/ruleset.c nft_ruleset_do_parse(struct nft_ruleset *r, enum nft_parse_type type, · line 777
Quoted 6 lines
src/ruleset.c +6
-0+{ +struct nft_ruleset *r = ctx->data; +struct nft_table_list *table_list = r->table_list; +struct nft_chain_list *chain_list = r->chain_list; +struct nft_rule_list *rule_list = r->rule_list; +struct nft_set_list *set_list = r->set_list;
Why don't you use r->object_list instead all alround this function?
src/ruleset.c nft_ruleset_do_parse(struct nft_ruleset *r, enum nft_parse_type type, · line 785
Quoted 8 lines
src/ruleset.c +8
-0+ +if (ctx->cmd !=NFT_CMD_ADD ) +return -1 ; + +switch (ctx->type) { +case NFT_RULESET_TABLE : +if (table_list ==NULL ) { + table_list =nft_table_list_alloc ();
You have to check if list_alloc() returns NULL, in that case goto err and release what you had.
Quoted 5 lines
src/ruleset.c +5
-0+nft_ruleset_attr_set (r,NFT_RULESET_ATTR_TABLELIST , + table_list); + } +nft_table_list_add_tail (ctx->table, table_list); +break ;
PATCH v7 3/4 example: Parse and create netlink message using the new parsing functions.
In reply to Alvaro Neira AyusoWith this example, we can parse the elements in the ruleset and create the netlink message with the action associated. For example:
- Flush ruleset
- Add, delete or flush tables/chains
- Add, delete sets
- Add, delete set elements
- Add, delete, replace or prepend rules
---
[no changes]
examples/Makefile.am | 4 + examples/nft-ruleset-parse-file.c | 448 +++++++++++++++++++++++++++++++++++++ 2 files changed, 452 insertions(+) create mode 100644 examples/nft-ruleset-parse-file.c
examples/Makefile.am +4 -0
@@ -22,6 +22,7 @@ check_PROGRAMS = nft-table-add \ nft-set-elem-get \ nft-set-elem-del \ nft-ruleset-get \ + nft-ruleset-parse-file \ nft-compat-get nft_table_add_SOURCES = nft-table-add.c
@@ -90,5 +91,8 @@ nft_set_elem_get_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_ruleset_get_SOURCES = nft-ruleset-get.c nft_ruleset_get_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} +nft_ruleset_parse_file_SOURCES = nft-ruleset-parse-file.c +nft_ruleset_parse_file_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} + nft_compat_get_SOURCES = nft-compat-get.c nft_compat_get_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS}
examples/nft-ruleset-parse-file.c new file +448 -0
448 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerRe: [libnftnl PATCH 3/4 v7] example: Parse and create netlink message using the new parsing functions.
Quoted 90 lines · Alvaro Neira Ayuso
With this example, we can parse the elements in the ruleset and create the netlink message with the action associated. For example:
- Flush ruleset
- Add, delete or flush tables/chains
- Add, delete sets
- Add, delete set elements
- Add, delete, replace or prepend rulesSigned-off-by Alvaro Neira Ayuso <[email protected]>---
[no changes]examples/Makefile.am | 4 + examples/nft-ruleset-parse-file.c | 448 +++++++++++++++++++++++++++++++++++++ 2 files changed, 452 insertions(+) create mode 100644 examples/nft-ruleset-parse-file.cexamples/Makefile.am +4
-0@@ -22,6 +22,7 @@ check_PROGRAMS = nft-table-add \ nft-set-elem-get \ nft-set-elem-del \ nft-ruleset-get \ + nft-ruleset-parse-file \ nft-compat-get nft_table_add_SOURCES = nft-table-add.c@@ -90,5 +91,8 @@ nft_set_elem_get_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_ruleset_get_SOURCES = nft-ruleset-get.c nft_ruleset_get_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} +nft_ruleset_parse_file_SOURCES = nft-ruleset-parse-file.c +nft_ruleset_parse_file_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} + nft_compat_get_SOURCES = nft-compat-get.c nft_compat_get_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS}examples/nft-ruleset-parse-file.c new file +45
-0@@ -0,0 +1,448 @@ +/* +* (C) 2014 by Alvaro Neira Ayuso <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +*/ + +#include <stdlib.h> +#include <time.h> +#include <string.h> +#include <stddef.h> /* for offsetof */ +#include <netinet/in.h> +#include <netinet/ip.h> +#include <netinet/tcp.h> +#include <arpa/inet.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <errno.h> + +#include <linux/netfilter.h> +#include <linux/netfilter/nfnetlink.h> +#include <linux/netfilter/nf_tables.h> + +#include <libmnl/libmnl.h> +#include <libnftnl/ruleset.h> +#include <libnftnl/table.h> +#include <libnftnl/chain.h> +#include <libnftnl/rule.h> +#include <libnftnl/set.h> + +struct mnl_nlmsg_batch *batch; +uint32_t seq; + +static int nft_ruleset_flush_rules (const struct nft_parse_ctx *ctx); + +static int nft_ruleset_set_elems (const struct nft_parse_ctx *ctx, +uint32_t cmd) +{ +struct nft_set_elems_iter *iter_elems; +struct nft_set_elem *elem; +struct nft_set *tmp; +uint16_t nl_type =0 , nl_flags =0 ; +struct nlmsghdr *nlh;
examples/nft-ruleset-parse-file.c line 55
Quoted 10 lines
examples/nft-ruleset-parse-file.c new file +10
-0+struct nft_set *set; + + set =nft_ruleset_ctx_get (ctx,NFT_RULESET_CTX_SET ); +if (set ==NULL ) +return -1 ; + +switch (cmd) { +case NFT_CMD_ADD : + nl_type =NFT_MSG_NEWSETELEM ; + nl_flags =NLM_F_CREATE |NLM_F_EXCL |NLM_F_ACK ;
The use of NLM_F_ACK for this example is OK, but in the nft import support you will have to use batch_talk() instead that internally uses select().
Note that this will generate an ACK message for each request. When removing NLM_F_ACK, the kernel will only report when things go wrong. So we skip a storm of ACK messages ;-).
examples/nft-ruleset-parse-file.c line 60
Quoted 5 lines
examples/nft-ruleset-parse-file.c new file +5
-0+break ; +case NFT_CMD_DELETE : + nl_type =NFT_MSG_DELSETELEM ; + nl_flags =NLM_F_ACK ; +break ;
default:
return -1;So you can remove the nl_type = 0 and nl_flags = 0.
examples/nft-ruleset-parse-file.c line 68
Quoted 8 lines
examples/nft-ruleset-parse-file.c new file +8
-0+ } + + iter_elems =nft_set_elems_iter_create (set); + elem =nft_set_elems_iter_next (iter_elems); +while (elem !=NULL ) { + tmp =nft_set_alloc (); +if (tmp ==NULL ) +return -1 ;
tmp is not released, so I guess this is a leak.
Run the test with valgrind --leak-check=full to catch these problems.
Quoted 31 lines
examples/nft-ruleset-parse-file.c new file +31
-0+ +nft_set_attr_set (tmp,NFT_SET_ATTR_TABLE , +nft_set_attr_get_str (set,NFT_SET_ATTR_TABLE )); +nft_set_attr_set (tmp,NFT_SET_ATTR_NAME , +nft_set_attr_get_str (set,NFT_SET_ATTR_NAME )); + +nft_set_elem_add (tmp, elem); + + nlh =nft_set_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), + nl_type, +nft_set_attr_get_u32 (set, +NFT_SET_ATTR_FAMILY ), + nl_flags, seq++); +nft_set_elems_nlmsg_build_payload (nlh, tmp); +mnl_nlmsg_batch_next (batch); + elem =nft_set_elems_iter_next (iter_elems); + } + +return 0 ; +} + +static int nft_ruleset_set (const struct nft_parse_ctx *ctx,uint32_t cmd) +{ + +struct nlmsghdr *nlh; +uint16_t nl_type =0 , nl_flags =0 ; +struct nft_set *set; + + set =nft_ruleset_ctx_get (ctx,NFT_RULESET_CTX_SET ); +if (set ==NULL ) +return -1 ;
examples/nft-ruleset-parse-file.c line 109
Quoted 10 lines
examples/nft-ruleset-parse-file.c new file +10
-0+ +switch (cmd) { +case NFT_CMD_ADD : + nl_type =NFT_MSG_NEWSET ; + nl_flags =NLM_F_CREATE |NLM_F_ACK ; +break ; +case NFT_CMD_DELETE : + nl_type =NFT_MSG_DELSET ; + nl_flags =NLM_F_ACK ; +break ;
Add also a default case here as I suggested above.
Quoted 42 lines
examples/nft-ruleset-parse-file.c new file +42
-0+ } + + nlh =nft_set_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), + nl_type, +nft_set_attr_get_u32 (set, +NFT_SET_ATTR_FAMILY ), + nl_flags, + seq++); + +nft_set_nlmsg_build_payload (nlh, set); +mnl_nlmsg_batch_next (batch); + +if (nft_ruleset_set_elems (ctx, cmd) <0 ) +return -1 ; + +return 0 ; +} + +static int nft_ruleset_rule (const struct nft_parse_ctx *ctx,uint32_t cmd, +struct nft_rule *nlr) +{ +struct nlmsghdr *nlh; +uint16_t nl_type =0 , nl_flags =0 ; +struct nft_rule *rule; + +if (nft_ruleset_ctx_is_set (ctx,NFT_RULESET_CTX_RULE )) + rule =nft_ruleset_ctx_get (ctx,NFT_RULESET_CTX_RULE ); +else + rule = nlr; + +if (rule ==NULL ) +return -1 ; + +switch (cmd) { +case NFT_CMD_ADD : + nl_type =NFT_MSG_NEWRULE ; + nl_flags =NLM_F_APPEND |NLM_F_CREATE |NLM_F_ACK ; +nft_rule_attr_unset (rule,NFT_RULE_ATTR_HANDLE ); +break ; +case NFT_CMD_DELETE : + nl_type =NFT_MSG_DELRULE ; + nl_flags =NLM_F_ACK ;
examples/nft-ruleset-parse-file.c line 161
Quoted 10 lines
examples/nft-ruleset-parse-file.c new file +10
-0+break ; +case NFT_CMD_REPLACE : + nl_type =NFT_MSG_NEWRULE ; + nl_flags =NLM_F_REPLACE |NLM_F_ACK ; +break ; +case NFT_CMD_INSERT : + nl_type =NFT_MSG_NEWRULE ; + nl_flags =NLM_F_CREATE |NLM_F_ACK ; +nft_rule_attr_unset (rule,NFT_RULE_ATTR_HANDLE ); +break ;
Same here... and so on.
Quoted 145 lines
examples/nft-ruleset-parse-file.c new file +145
-0+ } + + nlh =nft_rule_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), + nl_type, +nft_rule_attr_get_u32 (rule, +NFT_RULE_ATTR_FAMILY ), + nl_flags, + seq++); + +nft_rule_nlmsg_build_payload (nlh, rule); +mnl_nlmsg_batch_next (batch); + +nft_rule_free (rule); +return 0 ; +} + +static int nft_ruleset_chain (const struct nft_parse_ctx *ctx,uint32_t cmd) +{ +struct nlmsghdr *nlh; +uint16_t nl_type =0 , nl_flags =0 ; +struct nft_chain *chain; + + chain =nft_ruleset_ctx_get (ctx,NFT_RULESET_CTX_CHAIN ); +if (chain ==NULL ) +return -1 ; + +switch (cmd) { +case NFT_CMD_ADD : + nl_type =NFT_MSG_NEWCHAIN ; + nl_flags =NLM_F_CREATE |NLM_F_ACK ; +break ; +case NFT_CMD_DELETE : + nl_type =NFT_MSG_DELCHAIN ; + nl_flags =NLM_F_ACK ; +break ; +case NFT_CMD_FLUSH : +return nft_ruleset_flush_rules (ctx); + } + +nft_chain_attr_unset (chain,NFT_CHAIN_ATTR_HANDLE ); + nlh =nft_chain_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), + nl_type, +nft_chain_attr_get_u32 (chain, +NFT_CHAIN_ATTR_FAMILY ), + nl_flags, + seq++); + +nft_chain_nlmsg_build_payload (nlh, chain); +mnl_nlmsg_batch_next (batch); + +nft_chain_free (chain); +return 0 ; +} + +static int nft_ruleset_table (const struct nft_parse_ctx *ctx,uint32_t cmd, +struct nft_table *nlt) +{ +struct nlmsghdr *nlh; +uint16_t nl_type =0 , nl_flags =0 ; +struct nft_table *table; + +if (nft_ruleset_ctx_is_set (ctx,NFT_RULESET_CTX_TABLE )) + table =nft_ruleset_ctx_get (ctx,NFT_RULESET_CTX_TABLE ); +else + table = nlt; + +if (table ==NULL ) +return -1 ; + +switch (cmd) { +case NFT_CMD_ADD : + nl_type =NFT_MSG_NEWTABLE ; + nl_flags =NLM_F_CREATE |NLM_F_ACK ; +break ; +case NFT_CMD_DELETE : + nl_type =NFT_MSG_DELTABLE ; + nl_flags =NLM_F_ACK ; +break ; +case NFT_CMD_FLUSH : +return nft_ruleset_flush_rules (ctx); + } + + nlh =nft_table_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), + nl_type, +nft_table_attr_get_u32 (table, +NFT_TABLE_ATTR_FAMILY ), + nl_flags, + seq++); + +nft_table_nlmsg_build_payload (nlh, table); +mnl_nlmsg_batch_next (batch); + +nft_table_free (table); +return 0 ; +} + +static int nft_ruleset_flush_rules (const struct nft_parse_ctx *ctx) +{ +struct nft_rule *nlr; +struct nft_table *nlt; +struct nft_chain *nlc; +uint32_t type; + + nlr =nft_rule_alloc (); +if (nlr ==NULL ) +return -1 ; + + type =nft_ruleset_ctx_get_u32 (ctx,NFT_RULESET_CTX_TYPE ); +switch (type) { +case NFT_RULESET_TABLE : + nlt =nft_ruleset_ctx_get (ctx,NFT_RULESET_CTX_TABLE ); +nft_rule_attr_set (nlr,NFT_RULE_ATTR_TABLE , +nft_table_attr_get (nlt,NFT_TABLE_ATTR_NAME )); +nft_rule_attr_set (nlr,NFT_RULE_ATTR_FAMILY , +nft_table_attr_get (nlt,NFT_TABLE_ATTR_FAMILY )); +break ; +case NFT_RULESET_CHAIN : + nlc =nft_ruleset_ctx_get (ctx,NFT_RULESET_CTX_CHAIN ); +nft_rule_attr_set (nlr,NFT_RULE_ATTR_TABLE , +nft_chain_attr_get (nlc, +NFT_CHAIN_ATTR_TABLE )); +nft_rule_attr_set (nlr,NFT_RULE_ATTR_CHAIN , +nft_chain_attr_get (nlc, +NFT_CHAIN_ATTR_NAME )); +nft_rule_attr_set (nlr,NFT_RULE_ATTR_FAMILY , +nft_chain_attr_get (nlc,NFT_TABLE_ATTR_FAMILY )); +break ; + } + +return nft_ruleset_rule (ctx,NFT_CMD_DELETE , nlr); +} + +static int nft_ruleset_flush_ruleset (const struct nft_parse_ctx *ctx) +{ +struct nft_table *nlt; + + nlt =nft_table_alloc (); +if (nlt ==NULL ) +return -1 ; + +return nft_ruleset_table (ctx,NFT_CMD_DELETE , nlt); +} + +static int ruleset_elems_cb (const struct nft_parse_ctx *ctx) +{
examples/nft-ruleset-parse-file.c line 316
Quoted 10 lines
examples/nft-ruleset-parse-file.c new file +10
-0+uint32_t cmd; +uint32_t type; + + type =nft_ruleset_ctx_get_u32 (ctx,NFT_RULESET_CTX_TYPE ); + cmd =nft_ruleset_ctx_get_u32 (ctx,NFT_RULESET_CTX_CMD ); + +switch (type) { +case NFT_RULESET_TABLE : +if (nft_ruleset_table (ctx, cmd,NULL ) <0 ) +return -1 ;
You can get less lines of code with:
err = nft_ruleset_table(...);
then... see below.
Quoted 12 lines
examples/nft-ruleset-parse-file.c new file +12
-0+break ; +case NFT_RULESET_CHAIN : +if (nft_ruleset_chain (ctx, cmd) <0 ) +return -1 ; +break ; +case NFT_RULESET_RULE : +if (nft_ruleset_rule (ctx, cmd,NULL ) <0 ) +return -1 ; +break ; +case NFT_RULESET_SET : +if (nft_ruleset_set (ctx, cmd) <0 ) +return -1 ;
examples/nft-ruleset-parse-file.c line 338
Quoted 10 lines
examples/nft-ruleset-parse-file.c new file +10
-0+break ; +case NFT_RULESET_SET_ELEMS : +if (nft_ruleset_set_elems (ctx, cmd) <0 ) +return -1 ; +break ; +case NFT_RULESET_RULESET : +if (nft_ruleset_flush_ruleset (ctx) <0 ) +return -1 ; +break ; + }
if (err < 0)
return err;Quoted 2 lines
examples/nft-ruleset-parse-file.c new file +2
-0+return 0 ; +}
PATCH v7 4/4 test: update json/xml tests to the new syntax
In reply to Alvaro Neira Ayuso---
[no changes]
tests/jsonfiles/01-table.json | 2 +- tests/jsonfiles/02-table.json | 2 +- tests/jsonfiles/11-chain.json | 2 +- tests/jsonfiles/12-chain.json | 2 +- tests/jsonfiles/13-chain.json | 2 +- tests/jsonfiles/14-chain.json | 2 +- tests/jsonfiles/20-rule-bitwise.json | 2 +- tests/jsonfiles/21-rule-byteorder.json | 2 +- tests/jsonfiles/22-rule-cmp.json | 2 +- tests/jsonfiles/23-rule-counter.json | 2 +- tests/jsonfiles/24-rule-ct.json | 2 +- tests/jsonfiles/25-rule-exthdr.json | 2 +- tests/jsonfiles/26-rule-immediate.json | 2 +- tests/jsonfiles/27-rule-limit.json | 2 +- tests/jsonfiles/28-rule-log.json | 2 +- tests/jsonfiles/29-rule-match.json | 2 +- tests/jsonfiles/30-rule-lookup.json | 2 +- tests/jsonfiles/31-rule-meta.json | 2 +- tests/jsonfiles/32-rule-nat4.json | 2 +- tests/jsonfiles/33-rule-nat6.json | 2 +- tests/jsonfiles/34-rule-payload.json | 2 +- tests/jsonfiles/35-rule-target.json | 2 +- tests/jsonfiles/36-rule-real.json | 2 +- tests/jsonfiles/37-rule-real.json | 2 +- tests/jsonfiles/38-rule-real.json | 2 +- tests/jsonfiles/39-rule-real.json | 2 +- tests/jsonfiles/40-rule-real.json | 2 +- tests/jsonfiles/41-rule-real.json | 2 +- tests/jsonfiles/42-rule-real.json | 2 +- tests/jsonfiles/43-rule-real.json | 2 +- tests/jsonfiles/44-rule-real.json | 2 +- tests/jsonfiles/45-rule-real.json | 2 +- tests/jsonfiles/46-rule-real.json | 2 +- tests/jsonfiles/47-rule-real.json | 2 +- tests/jsonfiles/48-rule-real.json | 2 +- tests/jsonfiles/49-rule-real.json | 2 +- tests/jsonfiles/50-rule-real.json | 2 +- tests/jsonfiles/51-rule-real.json | 2 +- tests/jsonfiles/52-rule-real.json | 2 +- tests/jsonfiles/53-rule-real.json | 2 +- tests/jsonfiles/54-rule-real.json | 2 +- tests/jsonfiles/55-rule-real.json | 2 +- tests/jsonfiles/56-rule-real.json | 2 +- tests/jsonfiles/57-rule-real.json | 2 +- tests/jsonfiles/58-rule-real.json | 2 +- tests/jsonfiles/59-rule-real.json | 2 +- tests/jsonfiles/60-rule-real.json | 2 +- tests/jsonfiles/61-rule-real.json | 2 +- tests/jsonfiles/62-set.json | 2 +- tests/jsonfiles/63-set.json | 2 +- tests/jsonfiles/64-ruleset.json | 2 +- tests/jsonfiles/65-rule-meta-target.json | 2 +- tests/jsonfiles/66-rule-queue.json | 2 +- tests/jsonfiles/67-rule-queue.json | 2 +- tests/jsonfiles/68-rule-masq.json | 2 +- tests/jsonfiles/69-rule-redir.json | 2 +- tests/jsonfiles/70-rule-real.json | 1 + tests/nft-parsing-test.c | 4 ++-- tests/xmlfiles/01-table.xml | 2 +- tests/xmlfiles/02-table.xml | 2 +- tests/xmlfiles/10-chain.xml | 2 +- tests/xmlfiles/11-chain.xml | 2 +- tests/xmlfiles/12-chain.xml | 2 +- tests/xmlfiles/20-rule-bitwise.xml | 2 +- tests/xmlfiles/21-rule-byteorder.xml | 2 +- tests/xmlfiles/22-rule-cmp.xml | 2 +- tests/xmlfiles/23-rule-counter.xml | 2 +- tests/xmlfiles/24-rule-ct.xml | 2 +- tests/xmlfiles/25-rule-exthdr.xml | 2 +- tests/xmlfiles/26-rule-immediate.xml | 2 +- tests/xmlfiles/27-rule-limit.xml | 2 +- tests/xmlfiles/28-rule-log.xml | 2 +- tests/xmlfiles/29-rule-lookup.xml | 2 +- tests/xmlfiles/30-rule-match.xml | 2 +- tests/xmlfiles/31-rule-meta.xml | 2 +- tests/xmlfiles/32-rule-nat6.xml | 2 +- tests/xmlfiles/33-rule-nat4.xml | 2 +- tests/xmlfiles/34-rule-payload.xml | 2 +- tests/xmlfiles/35-rule-target.xml | 2 +- tests/xmlfiles/36-rule-real.xml | 2 +- tests/xmlfiles/37-rule-real.xml | 2 +- tests/xmlfiles/38-rule-real.xml | 2 +- tests/xmlfiles/39-rule-real.xml | 2 +- tests/xmlfiles/40-rule-real.xml | 2 +- tests/xmlfiles/41-rule-real.xml | 2 +- tests/xmlfiles/42-rule-real.xml | 2 +- tests/xmlfiles/43-rule-real.xml | 2 +- tests/xmlfiles/44-rule-real.xml | 2 +- tests/xmlfiles/45-rule-real.xml | 2 +- tests/xmlfiles/46-rule-real.xml | 2 +- tests/xmlfiles/47-rule-real.xml | 2 +- tests/xmlfiles/48-rule-real.xml | 2 +- tests/xmlfiles/49-rule-real.xml | 2 +- tests/xmlfiles/50-rule-real.xml | 2 +- tests/xmlfiles/51-rule-real.xml | 2 +- tests/xmlfiles/52-rule-real.xml | 2 +- tests/xmlfiles/53-rule-real.xml | 2 +- tests/xmlfiles/54-rule-real.xml | 2 +- tests/xmlfiles/55-rule-real.xml | 2 +- tests/xmlfiles/56-rule-real.xml | 2 +- tests/xmlfiles/57-rule-real.xml | 2 +- tests/xmlfiles/58-rule-real.xml | 2 +- tests/xmlfiles/59-rule-real.xml | 2 +- tests/xmlfiles/60-rule-real.xml | 2 +- tests/xmlfiles/61-rule-real.xml | 2 +- tests/xmlfiles/62-rule-real.xml | 2 +- tests/xmlfiles/63-rule-real.xml | 2 +- tests/xmlfiles/64-rule-real.xml | 2 +- tests/xmlfiles/65-rule-real.xml | 2 +- tests/xmlfiles/66-rule-real.xml | 2 +- tests/xmlfiles/67-rule-real.xml | 2 +- tests/xmlfiles/68-rule-real.xml | 2 +- tests/xmlfiles/69-rule-real.xml | 2 +- tests/xmlfiles/70-rule-real.xml | 2 +- tests/xmlfiles/71-rule-real.xml | 2 +- tests/xmlfiles/72-rule-real.xml | 2 +- tests/xmlfiles/73-set.xml | 2 +- tests/xmlfiles/74-set.xml | 2 +- tests/xmlfiles/75-ruleset.xml | 2 +- tests/xmlfiles/76-rule-meta_target.xml | 2 +- tests/xmlfiles/77-rule-queue.xml | 2 +- tests/xmlfiles/78-rule-queue.xml | 2 +- tests/xmlfiles/79-rule-masq.xml | 2 +- tests/xmlfiles/80-rule-redir.xml | 2 +- tests/xmlfiles/81-rule-real.xml | 1 + 125 files changed, 126 insertions(+), 124 deletions(-) create mode 100644 tests/jsonfiles/70-rule-real.json create mode 100644 tests/xmlfiles/81-rule-real.xml
tests/jsonfiles/01-table.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"table":{"name":"filter","family":"ip","flags":0,"use":0}}]} +{"nftables":[{"add":[{"table":{"name":"filter","family":"ip","flags":0,"use":0}}]}]}
tests/jsonfiles/02-table.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"table":{"name":"filter2","family":"ip6","flags":0,"use":0}}]} +{"nftables":[{"add":[{"table":{"name":"filter2","family":"ip6","flags":0,"use":0}}]}]}
tests/jsonfiles/11-chain.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"chain":{"name":"input","handle":1,"bytes":1375696,"packets":4136,"table":"filter","family":"ip","use":0,"type":"filter","hooknum":"input","prio":0,"policy":"accept"}}]} +{"nftables":[{"add":[{"chain":{"name":"input","handle":1,"bytes":1375696,"packets":4136,"table":"filter","family":"ip","use":0,"type":"filter","hooknum":"input","prio":0,"policy":"accept"}}]}]}
tests/jsonfiles/12-chain.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"chain":{"name":"forward","handle":2,"bytes":0,"packets":0,"table":"filter","family":"ip","use":0,"type":"filter","hooknum":"forward","prio":0,"policy":"accept"}}]} +{"nftables":[{"add":[{"chain":{"name":"forward","handle":2,"bytes":0,"packets":0,"table":"filter","family":"ip","use":0,"type":"filter","hooknum":"forward","prio":0,"policy":"accept"}}]}]}
tests/jsonfiles/13-chain.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"chain":{"name":"output","handle":3,"bytes":454786,"packets":2681,"table":"filter","family":"ip","use":0,"type":"filter","hooknum":"output","prio":0,"policy":"accept"}}]} +{"nftables":[{"add":[{"chain":{"name":"output","handle":3,"bytes":454786,"packets":2681,"table":"filter","family":"ip","use":0,"type":"filter","hooknum":"output","prio":0,"policy":"accept"}}]}]}
tests/jsonfiles/14-chain.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"chain":{"name":"chain1","handle":4,"bytes":0,"packets":0,"table":"filter","family":"ip","use":0}}]} +{"nftables":[{"add":[{"chain":{"name":"chain1","handle":4,"bytes":0,"packets":0,"table":"filter","family":"ip","use":0}}]}]}
tests/jsonfiles/20-rule-bitwise.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":20,"expr":[{"type":"bitwise","sreg":1,"dreg":1,"len":4,"mask":{"reg":{"type":"value","len":4,"data0":"0x0000000a"}},"xor":{"reg":{"type":"value","len":4,"data0":"0x00000000"}}}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":20,"expr":[{"type":"bitwise","sreg":1,"dreg":1,"len":4,"mask":{"reg":{"type":"value","len":4,"data0":"0x0000000a"}},"xor":{"reg":{"type":"value","len":4,"data0":"0x00000000"}}}]}}]}]}
tests/jsonfiles/21-rule-byteorder.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":21,"expr":[{"type":"byteorder","sreg":3,"dreg":4,"op":"hton","len":4,"size":4}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":21,"expr":[{"type":"byteorder","sreg":3,"dreg":4,"op":"hton","len":4,"size":4}]}}]}]}
tests/jsonfiles/22-rule-cmp.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"forward","handle":22,"expr":[{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":16,"data0":"0x00000000","data1":"0x6e6f6200","data2":"0x2e303164","data3":"0x00393331"}}}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"forward","handle":22,"expr":[{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":16,"data0":"0x00000000","data1":"0x6e6f6200","data2":"0x2e303164","data3":"0x00393331"}}}]}}]}]}
tests/jsonfiles/23-rule-counter.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":23,"expr":[{"type":"counter","pkts":135,"bytes":21655}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":23,"expr":[{"type":"counter","pkts":135,"bytes":21655}]}}]}]}
tests/jsonfiles/24-rule-ct.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":24,"expr":[{"type":"ct","dreg":1,"key":"state"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x00000008"}}}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":24,"expr":[{"type":"ct","dreg":1,"key":"state"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x00000008"}}}]}}]}]}
tests/jsonfiles/25-rule-exthdr.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":25,"expr":[{"type":"exthdr","dreg":1,"exthdr_type":"mh","offset":2,"len":16}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":25,"expr":[{"type":"exthdr","dreg":1,"exthdr_type":"mh","offset":2,"len":16}]}}]}]}
tests/jsonfiles/26-rule-immediate.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":26,"expr":[{"type":"immediate","dreg":0,"data":{"reg":{"type":"verdict","verdict":"accept"}}}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":26,"expr":[{"type":"immediate","dreg":0,"data":{"reg":{"type":"verdict","verdict":"accept"}}}]}}]}]}
tests/jsonfiles/27-rule-limit.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":27,"expr":[{"type":"limit","rate":321321,"unit":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":27,"expr":[{"type":"limit","rate":321321,"unit":0}]}}]}]}
tests/jsonfiles/28-rule-log.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":28,"expr":[{"type":"log","prefix":"test_chain","group":1,"snaplen":0,"qthreshold":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":28,"expr":[{"type":"log","prefix":"test_chain","group":1,"snaplen":0,"qthreshold":0}]}}]}]}
tests/jsonfiles/29-rule-match.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":9,"expr":[{"type":"match","name":"state"},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":9,"expr":[{"type":"match","name":"state"},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/30-rule-lookup.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":8,"expr":[{"type":"payload","dreg":1,"offset":12,"len":4,"base":"network"},{"type":"lookup","set":"set0","sreg":1,"dreg":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":8,"expr":[{"type":"payload","dreg":1,"offset":12,"len":4,"base":"network"},{"type":"lookup","set":"set0","sreg":1,"dreg":0}]}}]}]}
tests/jsonfiles/31-rule-meta.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":8,"expr":[{"type":"meta","dreg":1,"key":"protocol"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":8,"expr":[{"type":"meta","dreg":1,"key":"protocol"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/32-rule-nat4.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":10,"expr":[{"type":"nat","nat_type":"dnat","family":"ip","sreg_addr_min":1,"sreg_addr_max":2,"sreg_proto_min":3,"sreg_proto_max":4}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":10,"expr":[{"type":"nat","nat_type":"dnat","family":"ip","sreg_addr_min":1,"sreg_addr_max":2,"sreg_proto_min":3,"sreg_proto_max":4}]}}]}]}
tests/jsonfiles/33-rule-nat6.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip6","table":"nat","chain":"output","handle":33,"expr":[{"type":"nat","nat_type":"snat","family":"ip6","sreg_addr_min":1,"sreg_addr_max":2,"sreg_proto_min":3,"sreg_proto_max":4,"flags":12}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip6","table":"nat","chain":"output","handle":33,"expr":[{"type":"nat","nat_type":"snat","family":"ip6","sreg_addr_min":1,"sreg_addr_max":2,"sreg_proto_min":3,"sreg_proto_max":4,"flags":12}]}}]}]}
tests/jsonfiles/34-rule-payload.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":26,"expr":[{"type":"payload","dreg":1,"offset":9,"len":1,"base":"network"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":2,"len":2,"base":"transport"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":2,"data0":"0x00001600"}}},{"type":"immediate","dreg":0,"data":{"reg":{"type":"verdict","verdict":"accept"}}}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":26,"expr":[{"type":"payload","dreg":1,"offset":9,"len":1,"base":"network"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":2,"len":2,"base":"transport"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":2,"data0":"0x00001600"}}},{"type":"immediate","dreg":0,"data":{"reg":{"type":"verdict","verdict":"accept"}}}]}}]}]}
tests/jsonfiles/35-rule-target.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"INPUT","handle":20,"expr":[{"type":"counter","pkts":17,"bytes":4436},{"type":"target","name":"LOG"}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"INPUT","handle":20,"expr":[{"type":"counter","pkts":17,"bytes":4436},{"type":"target","name":"LOG"}]}}]}]}
tests/jsonfiles/36-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":36,"expr":[{"type":"payload","dreg":1,"offset":12,"len":8,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":8,"data0":"0x0100a8c0","data1":"0x6400a8c0"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":36,"expr":[{"type":"payload","dreg":1,"offset":12,"len":8,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":8,"data0":"0x0100a8c0","data1":"0x6400a8c0"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/37-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":37,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":37,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}}]}}]}]}
tests/jsonfiles/38-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":38,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":38,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}}]}}]}]}
tests/jsonfiles/39-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":39,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"gte","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"cmp","sreg":1,"op":"lte","data":{"reg":{"type":"value","len":4,"data0":"0xfa00a8c0"}}}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":39,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"gte","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"cmp","sreg":1,"op":"lte","data":{"reg":{"type":"value","len":4,"data0":"0xfa00a8c0"}}}]}}]}]}
tests/jsonfiles/40-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":40,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":40,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/41-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":41,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0},{"type":"immediate","dreg":0,"data":{"reg":{"type":"verdict","verdict":"drop"}}}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":41,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0},{"type":"immediate","dreg":0,"data":{"reg":{"type":"verdict","verdict":"drop"}}}]}}]}]}
tests/jsonfiles/42-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":42,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0},{"type":"log","prefix":"(null)","group":0,"snaplen":0,"qthreshold":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":42,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0},{"type":"log","prefix":"(null)","group":0,"snaplen":0,"qthreshold":0}]}}]}]}
tests/jsonfiles/43-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":43,"expr":[{"type":"payload","dreg":1,"offset":9,"len":1,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":2,"len":2,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":2,"data0":"0x00001600"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":43,"expr":[{"type":"payload","dreg":1,"offset":9,"len":1,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":2,"len":2,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":2,"data0":"0x00001600"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/44-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":44,"expr":[{"type":"payload","dreg":1,"offset":9,"len":1,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":0,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x16000004"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":44,"expr":[{"type":"payload","dreg":1,"offset":9,"len":1,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":0,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x16000004"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/45-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":45,"expr":[{"type":"payload","dreg":1,"offset":12,"len":8,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":8,"data0":"0x0100a8c0","data1":"0x6400a8c0"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":45,"expr":[{"type":"payload","dreg":1,"offset":12,"len":8,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":8,"data0":"0x0100a8c0","data1":"0x6400a8c0"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/46-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":46,"expr":[{"type":"payload","dreg":1,"offset":9,"len":1,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":0,"len":8,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":8,"data0":"0x16000004","data1":"0x00000000"}}}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":46,"expr":[{"type":"payload","dreg":1,"offset":9,"len":1,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":0,"len":8,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":8,"data0":"0x16000004","data1":"0x00000000"}}}]}}]}]}
tests/jsonfiles/47-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":47,"expr":[{"type":"payload","dreg":1,"offset":9,"len":1,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":0,"len":8,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":8,"data0":"0x16000004","data1":"0x00000000"}}}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":47,"expr":[{"type":"payload","dreg":1,"offset":9,"len":1,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":0,"len":8,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":8,"data0":"0x16000004","data1":"0x00000000"}}}]}}]}]}
tests/jsonfiles/48-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":48,"expr":[{"type":"meta","dreg":1,"key":"len"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":48,"expr":[{"type":"meta","dreg":1,"key":"len"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/49-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":49,"expr":[{"type":"meta","dreg":1,"key":"mark"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x00000000"}}},{"type":"counter","pkts":55,"bytes":11407}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":49,"expr":[{"type":"meta","dreg":1,"key":"mark"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x00000000"}}},{"type":"counter","pkts":55,"bytes":11407}]}}]}]}
tests/jsonfiles/50-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":50,"expr":[{"type":"meta","dreg":1,"key":"iif"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x00000001"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":50,"expr":[{"type":"meta","dreg":1,"key":"iif"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x00000001"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/51-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":51,"expr":[{"type":"meta","dreg":1,"key":"iifname"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":16,"data0":"0x00000000","data1":"0x00000000","data2":"0x65000000","data3":"0x00306874"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":51,"expr":[{"type":"meta","dreg":1,"key":"iifname"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":16,"data0":"0x00000000","data1":"0x00000000","data2":"0x65000000","data3":"0x00306874"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/52-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":52,"expr":[{"type":"meta","dreg":1,"key":"oif"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x00000001"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":52,"expr":[{"type":"meta","dreg":1,"key":"oif"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x00000001"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/53-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":53,"expr":[{"type":"meta","dreg":1,"key":"oifname"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":16,"data0":"0x00000000","data1":"0x00000000","data2":"0x65000000","data3":"0x00306874"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":53,"expr":[{"type":"meta","dreg":1,"key":"oifname"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":16,"data0":"0x00000000","data1":"0x00000000","data2":"0x65000000","data3":"0x00306874"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/54-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":54,"expr":[{"type":"meta","dreg":1,"key":"skuid"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":54,"expr":[{"type":"meta","dreg":1,"key":"skuid"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/55-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":55,"expr":[{"type":"meta","dreg":1,"key":"skgid"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":55,"expr":[{"type":"meta","dreg":1,"key":"skgid"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/56-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":56,"expr":[{"type":"meta","dreg":1,"key":"secmark"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x00000000"}}},{"type":"counter","pkts":55,"bytes":11407}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":56,"expr":[{"type":"meta","dreg":1,"key":"secmark"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x00000000"}}},{"type":"counter","pkts":55,"bytes":11407}]}}]}]}
tests/jsonfiles/57-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":57,"expr":[{"type":"meta","dreg":1,"key":"len"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":57,"expr":[{"type":"meta","dreg":1,"key":"len"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/58-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":58,"expr":[{"type":"meta","dreg":1,"key":"protocol"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":2,"data0":"0x00000008"}}},{"type":"counter","pkts":55,"bytes":11407}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":58,"expr":[{"type":"meta","dreg":1,"key":"protocol"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":2,"data0":"0x00000008"}}},{"type":"counter","pkts":55,"bytes":11407}]}}]}]}
tests/jsonfiles/59-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":59,"expr":[{"type":"meta","dreg":1,"key":"mark"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x00000000"}}},{"type":"counter","pkts":55,"bytes":11407}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":59,"expr":[{"type":"meta","dreg":1,"key":"mark"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x00000000"}}},{"type":"counter","pkts":55,"bytes":11407}]}}]}]}
tests/jsonfiles/60-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":60,"expr":[{"type":"meta","dreg":1,"key":"iif"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x00000001"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":60,"expr":[{"type":"meta","dreg":1,"key":"iif"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x00000001"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/61-rule-real.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":61,"expr":[{"type":"meta","dreg":1,"key":"iifname"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":16,"data0":"0x00000000","data1":"0x00000000","data2":"0x65000000","data3":"0x00306874"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":61,"expr":[{"type":"meta","dreg":1,"key":"iifname"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":16,"data0":"0x00000000","data1":"0x00000000","data2":"0x65000000","data3":"0x00306874"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/62-set.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"set":{"name":"set0","table":"filter","flags":3,"family":"ip","key_type":12,"key_len":2,"set_elem":[{"flags":0,"key":{"reg":{"type":"value","len":2,"data0":"0x00001700"}}},{"flags":0,"key":{"reg":{"type":"value","len":2,"data0":"0x00001600"}}}]}}]} +{"nftables":[{"add":[{"set":{"name":"set0","table":"filter","flags":3,"family":"ip","key_type":12,"key_len":2,"set_elem":[{"flags":0,"key":{"reg":{"type":"value","len":2,"data0":"0x00001700"}}},{"flags":0,"key":{"reg":{"type":"value","len":2,"data0":"0x00001600"}}}]}}]}]}
tests/jsonfiles/63-set.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"set":{"name":"map0","table":"f","flags":11,"family":"ip","key_type":12,"key_len":2,"data_type":4294967040,"data_len":16,"set_elem":[{"flags":0,"key":{"reg":{"type":"value","len":2,"data0":"0x00001700"}},"data":{"reg":{"type":"verdict","verdict":"goto","chain":"o"}}},{"flags":0,"key":{"reg":{"type":"value","len":2,"data0":"0x00001600"}},"data":{"reg":{"type":"verdict","verdict":"accept"}}}]}}]} +{"nftables":[{"add":[{"set":{"name":"map0","table":"f","flags":11,"family":"ip","key_type":12,"key_len":2,"data_type":4294967040,"data_len":16,"set_elem":[{"flags":0,"key":{"reg":{"type":"value","len":2,"data0":"0x00001700"}},"data":{"reg":{"type":"verdict","verdict":"goto","chain":"o"}}},{"flags":0,"key":{"reg":{"type":"value","len":2,"data0":"0x00001600"}},"data":{"reg":{"type":"verdict","verdict":"accept"}}}]}}]}]}
tests/jsonfiles/64-ruleset.json +0 -1
@@ -1 +1 @@ -{"nftables":[{"table":{"name":"filter","family":"ip","flags":0,"use":0}},{"table":{"name":"filter2","family":"ip6","flags":0,"use":0}},{"chain":{"name":"input","handle":1,"bytes":10681449,"packets":16216,"table":"filter","family":"ip","use":0,"type":"filter","hooknum":"input","prio":0,"policy":"accept"}},{"chain":{"name":"forward","handle":2,"bytes":0,"packets":0,"table":"filter","family":"ip","use":0,"type":"filter","hooknum":"forward","prio":0,"policy":"accept"}},{"chain":{"name":"output","handle":3,"bytes":2375830,"packets":15184,"table":"filter","family":"ip","use":0,"type":"filter","hooknum":"output","prio":0,"policy":"accept"}},{"chain":{"name":"chain1","handle":4,"bytes":0,"packets":0,"table":"filter","family":"ip","use":0}},{"set":{"name":"set0","table":"filter","flags":3,"family"
:"ip","key_type":12,"key_len":2}},{"rule":{"family":"ip","table":"filter","chain":"output","handle":6,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0},{"type":"immediate","dreg":0,"data":{"reg":{"type":"verdict","verdict":"drop"}}}]}},{"rule":{"family":"ip","table":"filter","chain":"output","handle":9,"expr":[{"type":"payload","dreg":1,"offset":9,"len":1,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":2,"len":2,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":2,"data0":"0x00001600"}}},{"type":"counter","pk ts":0,"bytes":0}]}},{"rule":{"family":"ip","table":"filter","chain":"output","handle":10,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0}]}},{"rule":{"family":"ip","table":"filter","chain":"output","handle":11,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0},{"type":"immediate","dreg":0,"data":{"reg":{"type":"verdict","verdict":"drop"}}}]}}]}
+{"nftables":[{"add":[{"table":{"name":"filter","family":"ip","flags":0,"use":0}},{"table":{"name":"filter2","family":"ip6","flags":0,"use":0}},{"chain":{"name":"input","handle":1,"bytes":10681449,"packets":16216,"table":"filter","family":"ip","use":0,"type":"filter","hooknum":"input","prio":0,"policy":"accept"}},{"chain":{"name":"forward","handle":2,"bytes":0,"packets":0,"table":"filter","family":"ip","use":0,"type":"filter","hooknum":"forward","prio":0,"policy":"accept"}},{"chain":{"name":"output","handle":3,"bytes":2375830,"packets":15184,"table":"filter","family":"ip","use":0,"type":"filter","hooknum":"output","prio":0,"policy":"accept"}},{"chain":{"name":"chain1","handle":4,"bytes":0,"packets":0,"table":"filter","family":"ip","use":0}},{"set":{"name":"set0","table":"filter","flags":3,
"family":"ip","key_type":12,"key_len":2}},{"rule":{"family":"ip","table":"filter","chain":"output","handle":6,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0},{"type":"immediate","dreg":0,"data":{"reg":{"type":"verdict","verdict":"drop"}}}]}},{"rule":{"family":"ip","table":"filter","chain":"output","handle":9,"expr":[{"type":"payload","dreg":1,"offset":9,"len":1,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":2,"len":2,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":2,"data0":"0x00001600"}}},{"type":"coun ter","pkts":0,"bytes":0}]}},{"rule":{"family":"ip","table":"filter","chain":"output","handle":10,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0}]}},{"rule":{"family":"ip","table":"filter","chain":"output","handle":11,"expr":[{"type":"payload","dreg":1,"offset":16,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0},{"type":"immediate","dreg":0,"data":{"reg":{"type":"verdict","verdict":"drop"}}}]}}]}]}
tests/jsonfiles/65-rule-meta-target.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":1,"expr":[{"type":"meta","key":"mark","sreg":1},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":1,"expr":[{"type":"meta","key":"mark","sreg":1},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/jsonfiles/66-rule-queue.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":43,"expr":[{"type":"queue","num":4,"total":2,"flags":0}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":43,"expr":[{"type":"queue","num":4,"total":2,"flags":0}]}}]}]}
tests/jsonfiles/67-rule-queue.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":44,"position":43,"expr":[{"type":"queue","num":4,"total":2,"flags":3}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":44,"position":43,"expr":[{"type":"queue","num":4,"total":2,"flags":3}]}}]}]}
tests/jsonfiles/68-rule-masq.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip6","table":"nat","chain":"postrouting","handle":4,"expr":[{"type":"masq","flags":12}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip6","table":"nat","chain":"postrouting","handle":4,"expr":[{"type":"masq","flags":12}]}}]}]}
tests/jsonfiles/69-rule-redir.json +1 -1
@@ -1 +1 @@ -{"nftables":[{"rule":{"family":"ip6","table":"nat","chain":"prerouting","handle":4,"expr":[{"type":"redir"}]}}]} +{"nftables":[{"add":[{"rule":{"family":"ip6","table":"nat","chain":"prerouting","handle":4,"expr":[{"type":"redir"}]}}]}]}
tests/jsonfiles/70-rule-real.json new file +1 -0
@@ -0,0 +1 @@ +{"nftables":[{"add":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":2,"expr":[{"type":"payload","dreg":1,"offset":9,"len":1,"base":"network"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":2,"len":2,"base":"transport"},{"type":"cmp","sreg":1,"op":"eq","data":{"reg":{"type":"value","len":2,"data0":"0x00001600"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}]}
tests/nft-parsing-test.c +2 -2
@@ -68,11 +68,11 @@ static int compare_test(uint32_t type, struct nft_ruleset *rs,switch (type) {case TEST_XML_RULESET :nft_ruleset_snprintf (out,sizeof (out), rs, -NFT_OUTPUT_XML ,0 ); +NFT_OUTPUT_XML ,NFT_OF_EVENT_NEW );break ;case TEST_JSON_RULESET :nft_ruleset_snprintf (out,sizeof (out), rs, -NFT_OUTPUT_JSON ,0 ); +NFT_OUTPUT_JSON ,NFT_OF_EVENT_NEW );break ;default : errno =EINVAL ;
tests/xmlfiles/01-table.xml +1 -1
@@ -1 +1 @@ -<nftables><table><name>filter</name><family>ip</family><flags>0</flags><use>0</use></table></nftables> +<nftables><add><table><name>filter</name><family>ip</family><flags>0</flags><use>0</use></table></add></nftables>
tests/xmlfiles/02-table.xml +1 -1
@@ -1 +1 @@ -<nftables><table><name>nat</name><family>ip6</family><flags>0</flags><use>0</use></table></nftables> +<nftables><add><table><name>nat</name><family>ip6</family><flags>0</flags><use>0</use></table></add></nftables>
tests/xmlfiles/10-chain.xml +1 -1
@@ -1 +1 @@ -<nftables><chain><name>test</name><handle>0</handle><bytes>0</bytes><packets>0</packets><table>filter</table><family>ip</family><type>filter</type><hooknum>input</hooknum><prio>0</prio><policy>accept</policy></chain></nftables> +<nftables><add><chain><name>test</name><handle>0</handle><bytes>0</bytes><packets>0</packets><table>filter</table><family>ip</family><type>filter</type><hooknum>input</hooknum><prio>0</prio><policy>accept</policy></chain></add></nftables>
tests/xmlfiles/11-chain.xml +1 -1
@@ -1 +1 @@ -<nftables><chain><name>test</name><handle>0</handle><bytes>59</bytes><packets>1</packets><table>filter</table><family>ip6</family><type>filter</type><hooknum>forward</hooknum><prio>0</prio><policy>drop</policy></chain></nftables> +<nftables><add><chain><name>test</name><handle>0</handle><bytes>59</bytes><packets>1</packets><table>filter</table><family>ip6</family><type>filter</type><hooknum>forward</hooknum><prio>0</prio><policy>drop</policy></chain></add></nftables>
tests/xmlfiles/12-chain.xml +1 -1
@@ -1 +1 @@ -<nftables><chain><name>foo</name><handle>100</handle><bytes>59264154979</bytes><packets>2548796325</packets><table>nat</table><family>ip</family><type>nat</type><hooknum>postrouting</hooknum><prio>0</prio><policy>accept</policy></chain></nftables> +<nftables><add><chain><name>foo</name><handle>100</handle><bytes>59264154979</bytes><packets>2548796325</packets><table>nat</table><family>ip</family><type>nat</type><hooknum>postrouting</hooknum><prio>0</prio><policy>accept</policy></chain></add></nftables>
tests/xmlfiles/20-rule-bitwise.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="bitwise"><sreg>1</sreg><dreg>1</dreg><len>4</len><mask><reg type="value"><len>4</len><data0>0x0000000a</data0></reg></mask><xor><reg type="value"><len>4</len><data0>0x00000000</data0></reg></xor></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="bitwise"><sreg>1</sreg><dreg>1</dreg><len>4</len><mask><reg type="value"><len>4</len><data0>0x0000000a</data0></reg></mask><xor><reg type="value"><len>4</len><data0>0x00000000</data0></reg></xor></expr></rule></add></nftables>
tests/xmlfiles/21-rule-byteorder.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>test</table><chain>test</chain><handle>1000</handle><expr type="byteorder"><sreg>3</sreg><dreg>4</dreg><op>hton</op><len>4</len><size>4</size></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>test</table><chain>test</chain><handle>1000</handle><expr type="byteorder"><sreg>3</sreg><dreg>4</dreg><op>hton</op><len>4</len><size>4</size></expr></rule></add></nftables>
tests/xmlfiles/22-rule-cmp.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>36</handle><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x6e6f6200</data1><data2>0x2e303164</data2><data3>0x00393331</data3></reg></data></expr></rule></nftables> +<nftables><add><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>36</handle><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x6e6f6200</data1><data2>0x2e303164</data2><data3>0x00393331</data3></reg></data></expr></rule></add></nftables>
tests/xmlfiles/23-rule-counter.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>39</handle><expr type="counter"><pkts>3</pkts><bytes>177</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>39</handle><expr type="counter"><pkts>3</pkts><bytes>177</bytes></expr></rule></add></nftables>
tests/xmlfiles/24-rule-ct.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="ct"><dreg>1</dreg><key>state</key><dir>original</dir></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="ct"><dreg>1</dreg><key>state</key><dir>original</dir></expr></rule></add></nftables>
tests/xmlfiles/25-rule-exthdr.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip6</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="exthdr"><dreg>1</dreg><exthdr_type>mh</exthdr_type><offset>2</offset><len>16</len></expr></rule></nftables> +<nftables><add><rule><family>ip6</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="exthdr"><dreg>1</dreg><exthdr_type>mh</exthdr_type><offset>2</offset><len>16</len></expr></rule></add></nftables>
tests/xmlfiles/26-rule-immediate.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>input</chain><handle>32</handle><expr type="immediate"><dreg>0</dreg><data><reg type="verdict"><verdict>accept</verdict></reg></data></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>input</chain><handle>32</handle><expr type="immediate"><dreg>0</dreg><data><reg type="verdict"><verdict>accept</verdict></reg></data></expr></rule></add></nftables>
tests/xmlfiles/27-rule-limit.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="limit"><rate>123123</rate><unit>321321</unit></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="limit"><rate>123123</rate><unit>321321</unit></expr></rule></add></nftables>
tests/xmlfiles/28-rule-log.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>96</handle><expr type="log"><prefix>test_chain</prefix><group>1</group></expr></rule></nftables> +<nftables><add><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>96</handle><expr type="log"><prefix>test_chain</prefix><group>1</group></expr></rule></add></nftables>
tests/xmlfiles/29-rule-lookup.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>37</handle><expr type="lookup"><set>set0</set><sreg>1</sreg><dreg>0</dreg></expr></rule></nftables> +<nftables><add><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>37</handle><expr type="lookup"><set>set0</set><sreg>1</sreg><dreg>0</dreg></expr></rule></add></nftables>
tests/xmlfiles/30-rule-match.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="match"><name>state</name></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="match"><name>state</name></expr></rule></add></nftables>
tests/xmlfiles/31-rule-meta.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>36</handle><expr type="meta"><dreg>1</dreg><key>iifname</key></expr></rule></nftables> +<nftables><add><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>36</handle><expr type="meta"><dreg>1</dreg><key>iifname</key></expr></rule></add></nftables>
tests/xmlfiles/32-rule-nat6.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip6</family><table>nat</table><chain>OUTPUT</chain><handle>100</handle><expr type="nat"><nat_type>snat</nat_type><family>ip6</family><sreg_addr_min>1</sreg_addr_min><sreg_addr_max>2</sreg_addr_max><sreg_proto_min>3</sreg_proto_min><sreg_proto_max>4</sreg_proto_max></expr></rule></nftables> +<nftables><add><rule><family>ip6</family><table>nat</table><chain>OUTPUT</chain><handle>100</handle><expr type="nat"><nat_type>snat</nat_type><family>ip6</family><sreg_addr_min>1</sreg_addr_min><sreg_addr_max>2</sreg_addr_max><sreg_proto_min>3</sreg_proto_min><sreg_proto_max>4</sreg_proto_max></expr></rule></add></nftables>
tests/xmlfiles/33-rule-nat4.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="nat"><nat_type>dnat</nat_type><family>ip</family><sreg_addr_min>1</sreg_addr_min><sreg_addr_max>2</sreg_addr_max><sreg_proto_min>3</sreg_proto_min><sreg_proto_max>4</sreg_proto_max><flags>12</flags></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="nat"><nat_type>dnat</nat_type><family>ip</family><sreg_addr_min>1</sreg_addr_min><sreg_addr_max>2</sreg_addr_max><sreg_proto_min>3</sreg_proto_min><sreg_proto_max>4</sreg_proto_max><flags>12</flags></expr></rule></add></nftables>
tests/xmlfiles/34-rule-payload.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>34</handle><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr></rule></nftables> +<nftables><add><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>34</handle><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr></rule></add></nftables>
tests/xmlfiles/35-rule-target.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="target"><name>LOG</name></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="target"><name>LOG</name></expr></rule></add></nftables>
tests/xmlfiles/36-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>22</handle><expr type="payload"><dreg>1</dreg><offset>12</offset><len>8</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>8</len><data0>0x0100a8c0</data0><data1>0x6400a8c0</data1></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>22</handle><expr type="payload"><dreg>1</dreg><offset>12</offset><len>8</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>8</len><data0>0x0100a8c0</data0><data1>0x6400a8c0</data1></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/37-rule-real.xml +0 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>25</handle><expr type="meta"><dreg>1</dreg><key>iifname</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x00000000</data1><data2>0x65000000</data2><data3>0x00306874</data3></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>2</len><data0>0x00001600</data0></reg></data></expr><expr type="ct">
<dreg>1</dreg><key>state</key><dir>original</dir></expr><expr type="bitwise"><sreg>1</sreg><dreg>1</dreg><len>4</len><mask><reg type="value"><len>4</len><data0>0x0000000a</data0></reg></mask><xor><reg type="value"><len>4</len><data0>0x00000000</data0></reg></xor></expr><expr type="cmp"><sreg>1</sreg><op>neq</op><data><reg type="value"><len>4</len><data0>0x00000000</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="log"><prefix>testprefix</prefix><group>1</group></expr></rule></nftables>
+<nftables><add><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>25</handle><expr type="meta"><dreg>1</dreg><key>iifname</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x00000000</data1><data2>0x65000000</data2><data3>0x00306874</data3></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>2</len><data0>0x00001600</data0></reg></data></expr><expr type=
"ct"><dreg>1</dreg><key>state</key><dir>original</dir></expr><expr type="bitwise"><sreg>1</sreg><dreg>1</dreg><len>4</len><mask><reg type="value"><len>4</len><data0>0x0000000a</data0></reg></mask><xor><reg type="value"><len>4</len><data0>0x00000000</data0></reg></xor></expr><expr type="cmp"><sreg>1</sreg><op>neq</op><data><reg type="value"><len>4</len><data0>0x00000000</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="log"><prefix>testprefix</prefix><group>1</group></expr></rule></add></nftables>
tests/xmlfiles/38-rule-real.xml +0 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>30</handle><expr type="payload"><dreg>1</dreg><offset>16</offset><len>4</len><base>network</base></expr><expr type="lookup"><set>set3</set><sreg>1</sreg><dreg>0</dreg></expr><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>2</len><data0>0x0000bb01</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="immediate"><dreg>0</dreg><data><reg typ
e="verdict"><verdict>accept</verdict></reg></data></expr></rule></nftables>
+<nftables><add><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>30</handle><expr type="payload"><dreg>1</dreg><offset>16</offset><len>4</len><base>network</base></expr><expr type="lookup"><set>set3</set><sreg>1</sreg><dreg>0</dreg></expr><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>2</len><data0>0x0000bb01</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="immediate"><dreg>0</dreg><data><re
g type="verdict"><verdict>accept</verdict></reg></data></expr></rule></add></nftables>
tests/xmlfiles/39-rule-real.xml +0 -1
@@ -1 +1 @@ -<nftables><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>31</handle><expr type="meta"><dreg>1</dreg><key>iifname</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x00000000</data1><data2>0x6f620000</data2><data3>0x0030646e</data3></reg></data></expr><expr type="meta"><dreg>1</dreg><key>oifname</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x62000000</data1><data2>0x31646e6f</data2><data3>0x0037322e</data3></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>8</offset><len>16</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>16</len><data0>0xc09a002a</d
ata0><data1>0x2700cac1</data1><data2>0x00000000</data2><data3>0x50010000</data3></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>6</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000011</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>2</len><data0>0x00003500</data0></reg></data></expr><expr type="ct"><dreg>1</dreg><key>status</key><dir>original</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00000001</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type=" log"><prefix>dns_drop</prefix><group>2</group></expr><expr type="immediate"><dreg>0</dreg><data><reg type="verdict"><verdict>drop</verdict></reg></data></expr></rule></nftables>
+<nftables><add><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>31</handle><expr type="meta"><dreg>1</dreg><key>iifname</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x00000000</data1><data2>0x6f620000</data2><data3>0x0030646e</data3></reg></data></expr><expr type="meta"><dreg>1</dreg><key>oifname</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x62000000</data1><data2>0x31646e6f</data2><data3>0x0037322e</data3></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>8</offset><len>16</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>16</len><data0>0xc09a00
2a</data0><data1>0x2700cac1</data1><data2>0x00000000</data2><data3>0x50010000</data3></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>6</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000011</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>2</len><data0>0x00003500</data0></reg></data></expr><expr type="ct"><dreg>1</dreg><key>status</key><dir>original</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00000001</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr t ype="log"><prefix>dns_drop</prefix><group>2</group></expr><expr type="immediate"><dreg>0</dreg><data><reg type="verdict"><verdict>drop</verdict></reg></data></expr></rule></add></nftables>
tests/xmlfiles/40-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>2</handle><expr type="payload"><dreg>1</dreg><offset>16</offset><len>4</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x0100a8c0</data0></reg></data></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>2</handle><expr type="payload"><dreg>1</dreg><offset>16</offset><len>4</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x0100a8c0</data0></reg></data></expr></rule></add></nftables>
tests/xmlfiles/41-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>3</handle><expr type="payload"><dreg>1</dreg><offset>16</offset><len>4</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>gte</op><data><reg type="value"><len>4</len><data0>0x0100a8c0</data0></reg></data></expr><expr type="cmp"><sreg>1</sreg><op>lte</op><data><reg type="value"><len>4</len><data0>0xfa00a8c0</data0></reg></data></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>3</handle><expr type="payload"><dreg>1</dreg><offset>16</offset><len>4</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>gte</op><data><reg type="value"><len>4</len><data0>0x0100a8c0</data0></reg></data></expr><expr type="cmp"><sreg>1</sreg><op>lte</op><data><reg type="value"><len>4</len><data0>0xfa00a8c0</data0></reg></data></expr></rule></add></nftables>
tests/xmlfiles/42-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>4</handle><expr type="payload"><dreg>1</dreg><offset>16</offset><len>4</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x0100a8c0</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>4</handle><expr type="payload"><dreg>1</dreg><offset>16</offset><len>4</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x0100a8c0</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/43-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>5</handle><expr type="payload"><dreg>1</dreg><offset>16</offset><len>4</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x0100a8c0</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="immediate"><dreg>0</dreg><data><reg type="verdict"><verdict>drop</verdict></reg></data></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>5</handle><expr type="payload"><dreg>1</dreg><offset>16</offset><len>4</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x0100a8c0</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="immediate"><dreg>0</dreg><data><reg type="verdict"><verdict>drop</verdict></reg></data></expr></rule></add></nftables>
tests/xmlfiles/44-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>6</handle><expr type="payload"><dreg>1</dreg><offset>16</offset><len>4</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x0100a8c0</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="log"></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>6</handle><expr type="payload"><dreg>1</dreg><offset>16</offset><len>4</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x0100a8c0</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="log"></expr></rule></add></nftables>
tests/xmlfiles/45-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>7</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>2</len><data0>0x00001600</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>7</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>2</len><data0>0x00001600</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/46-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>8</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>0</offset><len>4</len><base>transport</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x16000004</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>8</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>0</offset><len>4</len><base>transport</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x16000004</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/47-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>9</handle><expr type="payload"><dreg>1</dreg><offset>12</offset><len>8</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>8</len><data0>0x0100a8c0</data0><data1>0x6400a8c0</data1></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>9</handle><expr type="payload"><dreg>1</dreg><offset>12</offset><len>8</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>8</len><data0>0x0100a8c0</data0><data1>0x6400a8c0</data1></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/48-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>10</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>0</offset><len>8</len><base>transport</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>8</len><data0>0x16000004</data0><data1>0x00000000</data1></reg></data></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>10</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>0</offset><len>8</len><base>transport</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>8</len><data0>0x16000004</data0><data1>0x00000000</data1></reg></data></expr></rule></add></nftables>
tests/xmlfiles/49-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>11</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>0</offset><len>8</len><base>transport</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>8</len><data0>0x16000004</data0><data1>0x00000000</data1></reg></data></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>11</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>0</offset><len>8</len><base>transport</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>8</len><data0>0x16000004</data0><data1>0x00000000</data1></reg></data></expr></rule></add></nftables>
tests/xmlfiles/50-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>12</handle><expr type="ct"><dreg>1</dreg><key>state</key><dir>original</dir></expr><expr type="bitwise"><sreg>1</sreg><dreg>1</dreg><len>4</len><mask><reg type="value"><len>4</len><data0>0x0000000a</data0></reg></mask><xor><reg type="value"><len>4</len><data0>0x00000000</data0></reg></xor></expr><expr type="cmp"><sreg>1</sreg><op>neq</op><data><reg type="value"><len>4</len><data0>0x00000000</data0></reg></data></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>12</handle><expr type="ct"><dreg>1</dreg><key>state</key><dir>original</dir></expr><expr type="bitwise"><sreg>1</sreg><dreg>1</dreg><len>4</len><mask><reg type="value"><len>4</len><data0>0x0000000a</data0></reg></mask><xor><reg type="value"><len>4</len><data0>0x00000000</data0></reg></xor></expr><expr type="cmp"><sreg>1</sreg><op>neq</op><data><reg type="value"><len>4</len><data0>0x00000000</data0></reg></data></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule></add></nftables>
tests/xmlfiles/51-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>13</handle><expr type="ct"><dreg>1</dreg><key>direction</key><dir>original</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000000</data0></reg></data></expr><expr type="counter"><pkts>5</pkts><bytes>160</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>13</handle><expr type="ct"><dreg>1</dreg><key>direction</key><dir>original</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000000</data0></reg></data></expr><expr type="counter"><pkts>5</pkts><bytes>160</bytes></expr></rule></add></nftables>
tests/xmlfiles/52-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>14</handle><expr type="ct"><dreg>1</dreg><key>direction</key><dir>original</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000001</data0></reg></data></expr><expr type="counter"><pkts>50</pkts><bytes>11247</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>14</handle><expr type="ct"><dreg>1</dreg><key>direction</key><dir>original</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000001</data0></reg></data></expr><expr type="counter"><pkts>50</pkts><bytes>11247</bytes></expr></rule></add></nftables>
tests/xmlfiles/53-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>15</handle><expr type="ct"><dreg>1</dreg><key>status</key><dir>original</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00000001</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>15</handle><expr type="ct"><dreg>1</dreg><key>status</key><dir>original</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00000001</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/54-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>16</handle><expr type="ct"><dreg>1</dreg><key>mark</key><dir>original</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00000064</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>16</handle><expr type="ct"><dreg>1</dreg><key>mark</key><dir>original</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00000064</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/55-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>17</handle><expr type="ct"><dreg>1</dreg><key>secmark</key><dir>original</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00000000</data0></reg></data></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>17</handle><expr type="ct"><dreg>1</dreg><key>secmark</key><dir>original</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00000000</data0></reg></data></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule></add></nftables>
tests/xmlfiles/56-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>18</handle><expr type="ct"><dreg>1</dreg><key>expiration</key><dir>original</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x0000001e</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>18</handle><expr type="ct"><dreg>1</dreg><key>expiration</key><dir>original</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x0000001e</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/57-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>19</handle><expr type="ct"><dreg>1</dreg><key>helper</key><dir>original</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00707466</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>19</handle><expr type="ct"><dreg>1</dreg><key>helper</key><dir>original</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00707466</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/58-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>20</handle><expr type="meta"><dreg>1</dreg><key>len</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x000003e8</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>20</handle><expr type="meta"><dreg>1</dreg><key>len</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x000003e8</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/59-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>21</handle><expr type="meta"><dreg>1</dreg><key>protocol</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>2</len><data0>0x00000008</data0></reg></data></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>21</handle><expr type="meta"><dreg>1</dreg><key>protocol</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>2</len><data0>0x00000008</data0></reg></data></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule></add></nftables>
tests/xmlfiles/60-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>22</handle><expr type="meta"><dreg>1</dreg><key>mark</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00000000</data0></reg></data></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>22</handle><expr type="meta"><dreg>1</dreg><key>mark</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00000000</data0></reg></data></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule></add></nftables>
tests/xmlfiles/61-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>23</handle><expr type="meta"><dreg>1</dreg><key>iif</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00000001</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>23</handle><expr type="meta"><dreg>1</dreg><key>iif</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00000001</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/62-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>24</handle><expr type="meta"><dreg>1</dreg><key>iifname</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x00000000</data1><data2>0x65000000</data2><data3>0x00306874</data3></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>24</handle><expr type="meta"><dreg>1</dreg><key>iifname</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x00000000</data1><data2>0x65000000</data2><data3>0x00306874</data3></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/63-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>25</handle><expr type="meta"><dreg>1</dreg><key>oif</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00000001</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>25</handle><expr type="meta"><dreg>1</dreg><key>oif</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00000001</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/64-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>26</handle><expr type="meta"><dreg>1</dreg><key>oifname</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x00000000</data1><data2>0x65000000</data2><data3>0x00306874</data3></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>26</handle><expr type="meta"><dreg>1</dreg><key>oifname</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x00000000</data1><data2>0x65000000</data2><data3>0x00306874</data3></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/65-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>27</handle><expr type="meta"><dreg>1</dreg><key>skuid</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x000003e8</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>27</handle><expr type="meta"><dreg>1</dreg><key>skuid</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x000003e8</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/66-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>28</handle><expr type="meta"><dreg>1</dreg><key>skgid</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x000003e8</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>28</handle><expr type="meta"><dreg>1</dreg><key>skgid</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x000003e8</data0></reg></data></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/67-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>29</handle><expr type="meta"><dreg>1</dreg><key>secmark</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00000000</data0></reg></data></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>29</handle><expr type="meta"><dreg>1</dreg><key>secmark</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>4</len><data0>0x00000000</data0></reg></data></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule></add></nftables>
tests/xmlfiles/68-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>32</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="lookup"><set>set0</set><sreg>1</sreg><dreg>0</dreg></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>32</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="lookup"><set>set0</set><sreg>1</sreg><dreg>0</dreg></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></add></nftables>
tests/xmlfiles/69-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>33</handle><expr type="payload"><dreg>1</dreg><offset>16</offset><len>4</len><base>network</base></expr><expr type="lookup"><set>set1</set><sreg>1</sreg><dreg>0</dreg></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>33</handle><expr type="payload"><dreg>1</dreg><offset>16</offset><len>4</len><base>network</base></expr><expr type="lookup"><set>set1</set><sreg>1</sreg><dreg>0</dreg></expr></rule></add></nftables>
tests/xmlfiles/70-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>34</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="lookup"><set>map0</set><sreg>1</sreg><dreg>0</dreg></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>34</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="lookup"><set>map0</set><sreg>1</sreg><dreg>0</dreg></expr></rule></add></nftables>
tests/xmlfiles/71-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>35</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="lookup"><set>map1</set><sreg>1</sreg><dreg>0</dreg></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>35</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="lookup"><set>map1</set><sreg>1</sreg><dreg>0</dreg></expr></rule></add></nftables>
tests/xmlfiles/72-rule-real.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>36</handle><expr type="payload"><dreg>1</dreg><offset>16</offset><len>4</len><base>network</base></expr><expr type="lookup"><set>map2</set><sreg>1</sreg><dreg>0</dreg></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>output</chain><handle>36</handle><expr type="payload"><dreg>1</dreg><offset>16</offset><len>4</len><base>network</base></expr><expr type="lookup"><set>map2</set><sreg>1</sreg><dreg>0</dreg></expr></rule></add></nftables>
tests/xmlfiles/73-set.xml +1 -1
@@ -1 +1 @@ -<nftables><set><family>ip</family><table>filter</table><name>set0</name><key_type>0</key_type><key_len>0</key_len><data_type>0</data_type><data_len>0</data_len><set_elem><key><reg type="value"><len>4</len><data0>0x0300a8c0</data0></reg></key></set_elem><set_elem><key><reg type="value"><len>4</len><data0>0x0200a8c0</data0></reg></key></set_elem><set_elem><key><reg type="value"><len>4</len><data0>0x0100a8c0</data0></reg></key></set_elem></set></nftables> +<nftables><add><set><family>ip</family><table>filter</table><name>set0</name><key_type>0</key_type><key_len>0</key_len><data_type>0</data_type><data_len>0</data_len><set_elem><key><reg type="value"><len>4</len><data0>0x0300a8c0</data0></reg></key></set_elem><set_elem><key><reg type="value"><len>4</len><data0>0x0200a8c0</data0></reg></key></set_elem><set_elem><key><reg type="value"><len>4</len><data0>0x0100a8c0</data0></reg></key></set_elem></set></add></nftables>
tests/xmlfiles/74-set.xml +1 -1
@@ -1 +1 @@ -<nftables><set><family>ip6</family><table>filter</table><name>set0</name><key_type>0</key_type><key_len>0</key_len><data_type>0</data_type><data_len>0</data_len><set_elem><key><reg type="value"><len>16</len><data0>0xc09a002a</data0><data1>0x2700cac1</data1><data2>0x00000000</data2><data3>0x70010000</data3></reg></key></set_elem><set_elem><key><reg type="value"><len>16</len><data0>0xc09a002a</data0><data1>0x2700cac1</data1><data2>0x00000000</data2><data3>0x50010000</data3></reg></key></set_elem></set></nftables> +<nftables><add><set><family>ip6</family><table>filter</table><name>set0</name><key_type>0</key_type><key_len>0</key_len><data_type>0</data_type><data_len>0</data_len><set_elem><key><reg type="value"><len>16</len><data0>0xc09a002a</data0><data1>0x2700cac1</data1><data2>0x00000000</data2><data3>0x70010000</data3></reg></key></set_elem><set_elem><key><reg type="value"><len>16</len><data0>0xc09a002a</data0><data1>0x2700cac1</data1><data2>0x00000000</data2><data3>0x50010000</data3></reg></key></set_elem></set></add></nftables>
tests/xmlfiles/75-ruleset.xml +0 -1
@@ -1 +1 @@ -<nftables><table><name>filter</name><family>ip</family><flags>0</flags><use>0</use></table><table><name>filter</name><family>ip6</family><flags>0</flags><use>0</use></table><chain><name>input</name><handle>1</handle><bytes>0</bytes><packets>0</packets><table>filter</table><family>ip</family></chain><chain><name>output</name><handle>2</handle><bytes>0</bytes><packets>0</packets><table>filter</table><family>ip</family></chain><chain><name>forward</name><handle>1</handle><bytes>0</bytes><packets>0</packets><table>filter</table><family>ip6</family></chain><set><family>ip6</family><table>filter</table><name>set0</name><flags>3</flags><key_type>12</key_type><key_len>2</key_len><data_type>0</data_type><data_len>0</data_len><set_elem><key><reg type="value"><len>2</len><data0>0x00004300</data0></r
eg></key></set_elem><set_elem><key><reg type="value"><len>2</len><data0>0x00003500</data0></reg></key></set_elem></set><set><family>ip</family><table>filter</table><name>map0</name><flags>11</flags><key_type>12</key_type><key_len>2</key_len><data_type>4294967040</data_type><data_len>16</data_len><set_elem><key><reg type="value"><len>2</len><data0>0x00005000</data0></reg></key><data><reg type="verdict"><verdict>drop</verdict></reg></data></set_elem><set_elem><key><reg type="value"><len>2</len><data0>0x00001600</data0></reg></key><data><reg type="verdict"><verdict>accept</verdict></reg></data></set_elem></set><rule><family>ip</family><table>filter</table><chain>input</chain><handle>8</handle><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="immediate"><dreg>0</dreg><dat a><reg type="verdict"><verdict>accept</verdict></reg></data></expr></rule><rule><family>ip</family><table>filter</table><chain>output</chain><handle>9</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="lookup"><set>map0</set><sreg>1</sreg><dreg>0</dreg></expr></rule><rule><family>ip6</family><table>filter</table><chain>forward</chain><handle>2</handle><expr type="payload"><dreg>1</dreg><offset>6</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</ len><data0>0x00000011</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="lookup"><set>set0</set><sreg>1</sreg><dreg>0</dreg></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="immediate"><dreg>0</dreg><data><reg type="verdict"><verdict>accept</verdict></reg></data></expr></rule></nftables>
+<nftables><add><table><name>filter</name><family>ip</family><flags>0</flags><use>0</use></table><table><name>filter</name><family>ip6</family><flags>0</flags><use>0</use></table><chain><name>input</name><handle>1</handle><bytes>0</bytes><packets>0</packets><table>filter</table><family>ip</family></chain><chain><name>output</name><handle>2</handle><bytes>0</bytes><packets>0</packets><table>filter</table><family>ip</family></chain><chain><name>forward</name><handle>1</handle><bytes>0</bytes><packets>0</packets><table>filter</table><family>ip6</family></chain><set><family>ip6</family><table>filter</table><name>set0</name><flags>3</flags><key_type>12</key_type><key_len>2</key_len><data_type>0</data_type><data_len>0</data_len><set_elem><key><reg type="value"><len>2</len><data0>0x00004300</data
0></reg></key></set_elem><set_elem><key><reg type="value"><len>2</len><data0>0x00003500</data0></reg></key></set_elem></set><set><family>ip</family><table>filter</table><name>map0</name><flags>11</flags><key_type>12</key_type><key_len>2</key_len><data_type>4294967040</data_type><data_len>16</data_len><set_elem><key><reg type="value"><len>2</len><data0>0x00005000</data0></reg></key><data><reg type="verdict"><verdict>drop</verdict></reg></data></set_elem><set_elem><key><reg type="value"><len>2</len><data0>0x00001600</data0></reg></key><data><reg type="verdict"><verdict>accept</verdict></reg></data></set_elem></set><rule><family>ip</family><table>filter</table><chain>input</chain><handle>8</handle><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="immediate"><dreg>0</dreg
Quoted 1 line
<data><reg type="verdict"><verdict>accept</verdict></reg></data></expr></rule><rule><family>ip</family><table>filter</table><chain>output</chain><handle>9</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="lookup"><set>map0</set><sreg>1</sreg><dreg>0</dreg></expr></rule><rule><family>ip6</family><table>filter</table><chain>forward</chain><handle>2</handle><expr type="payload"><dreg>1</dreg><offset>6</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><le
n>1</len><data0>0x00000011</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="lookup"><set>set0</set><sreg>1</sreg><dreg>0</dreg></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="immediate"><dreg>0</dreg><data><reg type="verdict"><verdict>accept</verdict></reg></data></expr></rule></add></nftables>
tests/xmlfiles/76-rule-meta_target.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>129</handle><expr type="meta"><key>mark</key><sreg>1</sreg></expr></rule></nftables> +<nftables><add><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>129</handle><expr type="meta"><key>mark</key><sreg>1</sreg></expr></rule></add></nftables>
tests/xmlfiles/77-rule-queue.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>input</chain><handle>43</handle><expr type="queue"><num>4</num><total>2</total><flags>0</flags></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>input</chain><handle>43</handle><expr type="queue"><num>4</num><total>2</total><flags>0</flags></expr></rule></add></nftables>
tests/xmlfiles/78-rule-queue.xml +1 -1
@@ -1,2 +1,2 @@ -<nftables><rule><family>ip</family><table>filter</table><chain>input</chain><handle>44</handle><position>43</position><expr type="queue"><num>4</num><total>2</total><flags>3</flags></expr></rule></nftables> +<nftables><add><rule><family>ip</family><table>filter</table><chain>input</chain><handle>44</handle><position>43</position><expr type="queue"><num>4</num><total>2</total><flags>3</flags></expr></rule></add></nftables>
tests/xmlfiles/79-rule-masq.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip6</family><table>nat</table><chain>postrouting</chain><handle>4</handle><expr type="masq"><flags>12</flags></expr></rule></nftables> +<nftables><add><rule><family>ip6</family><table>nat</table><chain>postrouting</chain><handle>4</handle><expr type="masq"><flags>12</flags></expr></rule></add></nftables>
tests/xmlfiles/80-rule-redir.xml +1 -1
@@ -1 +1 @@ -<nftables><rule><family>ip6</family><table>nat</table><chain>prerouting</chain><handle>4</handle><expr type="redir"></expr></rule></nftables> +<nftables><add><rule><family>ip6</family><table>nat</table><chain>prerouting</chain><handle>4</handle><expr type="redir"></expr></rule></add></nftables>
tests/xmlfiles/81-rule-real.xml new file +1 -0
@@ -0,0 +1 @@ +<nftables><add><rule><family>ip</family><table>filter</table><chain>input</chain><handle>5</handle><expr type="payload"><dreg>1</dreg><offset>9</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>1</len><data0>0x00000006</data0></reg></data></expr><expr type="payload"><dreg>1</dreg><offset>2</offset><len>2</len><base>transport</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><data><reg type="value"><len>2</len><data0>0x00001700</data0></reg></data></expr></rule></add></nftables>
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerComments below.
Quoted 68 lines · Alvaro Neira Ayuso
include/buffer.h +7
-0@@ -24,7 +24,9 @@ int nft_buf_done(struct nft_buf *b);union nft_data_reg ;int nft_buf_open (struct nft_buf *b,int type,const char *tag); +int nft_buf_open_array (struct nft_buf *b,int type,const char *tag);int nft_buf_close (struct nft_buf *b,int type,const char *tag); +int nft_buf_close_array (struct nft_buf *b,int type,const char *tag);int nft_buf_u32 (struct nft_buf *b,int type,uint32_t value,const char *tag);int nft_buf_s32 (struct nft_buf *b,int type,uint32_t value,const char *tag);@@ -76,5 +78,10 @@ int nft_buf_reg(struct nft_buf *b, int type, union nft_data_reg *reg,#define UNIT "unit"#define USE "use"#define XOR "xor" +#define ADD "add" +#define INSERT "insert" +#define DELETE "delete" +#define REPLACE "replace" +#define FLUSH "flush"#endif include/libnftnl/common.h +9
-0@@ -21,6 +21,15 @@ enum nft_output_flags { NFT_OF_EVENT_ANY = (NFT_OF_EVENT_NEW | NFT_OF_EVENT_DEL), }; +enum nft_cmd_type { +NFT_CMD_UNSPEC =0 , +NFT_CMD_ADD , +NFT_CMD_INSERT , +NFT_CMD_DELETE , +NFT_CMD_REPLACE , +NFT_CMD_FLUSH , +}; +enum nft_parse_type {NFT_PARSE_NONE =0 ,NFT_PARSE_XML ,src/buffer.c +11
-0@@ -71,6 +71,17 @@ int nft_buf_open(struct nft_buf *b, int type, const char *tag) } } +int nft_buf_open_array (struct nft_buf *b,int type,const char *tag) +{ +switch (type) { +case NFT_OUTPUT_JSON : +return nft_buf_put (b,"{\"%s\":[" , tag); +case NFT_OUTPUT_XML : +default : +return 0 ; + } +} +int nft_buf_close (struct nft_buf *b,int type,const char *tag) {switch (type) {
src/buffer.c int nft_buf_close(struct nft_buf *b, int type, const char *tag) · line 104
Quoted 4 lines
src/buffer.c +1
-0@@ -90,6 +101,17 @@ int nft_buf_close(struct nft_buf *b, int type, const char *tag) } } +int nft_buf_close_array (struct nft_buf *b,int type,const char *tag)
You don't use the 'tag' parameter, remove it.
Quoted 62 lines
src/buffer.c +10
-0+{ +switch (type) { +case NFT_OUTPUT_JSON : +return nft_buf_put (b,"]}" ); +case NFT_OUTPUT_XML : +default : +return 0 ; + } +} +int nft_buf_u32 (struct nft_buf *b,int type,uint32_t value,const char *tag) {switch (type) {src/chain.c +15
-5@@ -847,12 +847,12 @@ static int nft_chain_snprintf_default(char *buf, size_t size,return offset; } -int nft_chain_snprintf (char *buf,size_t size,struct nft_chain *c, -uint32_t type,uint32_t flags) +static int nft_chain_cmd_snprintf (char *buf,size_t size,struct nft_chain *c, +uint32_t cmd,uint32_t type,uint32_t flags) {int ret, len = size, offset =0 ; - ret =nft_event_header_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_header_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);switch (type) {@@ -869,15 +869,25 @@ int nft_chain_snprintf(char *buf, size_t size, struct nft_chain *c,SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =nft_event_footer_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_footer_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset; } + +int nft_chain_snprintf (char *buf,size_t size,struct nft_chain *c, +uint32_t type,uint32_t flags) +{ +uint32_t cmd; + +nft_flag2cmd (flags, &cmd); +return nft_chain_cmd_snprintf (buf, size, c, cmd, type, flags); +}EXPORT_SYMBOL (nft_chain_snprintf);static inline int nft_chain_do_snprintf (char *buf,size_t size,void *c, -uint32_t type,uint32_t flags) +uint32_t cmd,uint32_t type, +uint32_t flags) {return nft_chain_snprintf (buf, size, c, type, flags); }
src/chain.c static inline int nft_chain_do_snprintf(char *buf, size_t size, void *c, · line 899
Quoted 6 lines
src/chain.c +2
-1@@ -885,7 +895,8 @@ static inline int nft_chain_do_snprintf(char *buf, size_t size, void *c,int nft_chain_fprintf (FILE *fp,struct nft_chain *c,uint32_t type,uint32_t flags) { -return nft_fprintf (fp, c, type, flags, nft_chain_do_snprintf); +return nft_fprintf (fp, c,NFT_CMD_UNSPEC , type, flags, + nft_chain_do_snprintf);
Why no nft_flag2cmd() in nft_chain_fprintf ?
Quoted 13 lines
src/chain.c +0
-0}EXPORT_SYMBOL (nft_chain_fprintf);src/common.c +1
-0@@ -16,10 +16,19 @@#include <libmnl/libmnl.h> #include <libnftnl/common.h> #include <libnftnl/set.h> +#include <buffer.h>
src/common.c line 30
Quoted 10 lines
src/common.c +7
-0#include <errno.h> #include "internal.h" +const char *cmd2tag[] = { + [NFT_CMD_ADD ] =ADD , + [NFT_CMD_INSERT ] =INSERT , + [NFT_CMD_DELETE ] =DELETE , + [NFT_CMD_REPLACE ] =REPLACE , + [NFT_CMD_FLUSH ] =FLUSH , +};
You have to add something like:
const char *nft_cmd2tag(enum nft_cmd_type cmd)
{
if (cmd >= NFT_CMD_MAX)
return "unknown";
return cmd2tag[cmd];
}So we make sure that wrong outputs will not lead to a out of bound array access (likely a crash).
Quoted 33 lines
src/common.c +5
-13struct nlmsghdr *nft_nlmsg_build_hdr (char *buf,uint16_t cmd,uint16_t family,uint16_t type,uint32_t seq) {@@ -70,86 +79,82 @@ int nft_parse_perror(const char *msg, struct nft_parse_err *err) }EXPORT_SYMBOL (nft_parse_perror); -int nft_event_header_snprintf (char *buf,size_t size,uint32_t type, -uint32_t flags) +int nft_cmd_header_snprintf (char *buf,size_t size,uint32_t cmd,uint32_t type, +uint32_t flags) { -int ret =0 ; +NFT_BUF_INIT (b, buf, size); -if (!(flags &NFT_OF_EVENT_ANY )) +if (cmd ==NFT_CMD_UNSPEC )return 0 ;switch (type) {case NFT_OUTPUT_XML : -if (flags &NFT_OF_EVENT_NEW ) { - ret =snprintf (buf, size,"<event><type>new</type>" ); - }else if (flags &NFT_OF_EVENT_DEL ) { - ret =snprintf (buf, size, -"<event><type>delete</type>" ); - }else { - ret =snprintf (buf, size, -"<event><type>unknown</type>" ); - } +nft_buf_open (&b, type, cmd2tag[cmd]);break ;case NFT_OUTPUT_JSON :
src/common.c int nft_parse_perror(const char *msg, struct nft_parse_err *err) · line 95
Quoted 10 lines
src/common.c +1
-9-if (flags &NFT_OF_EVENT_NEW ) { - ret =snprintf (buf, size,"{event:{type:\"new\",{\"" ); - }else if (flags &NFT_OF_EVENT_DEL ) { - ret =snprintf (buf, size, -"{event:{type:\"delete\",{\"" ); - }else { - ret =snprintf (buf, size, -"{event:{type:\"unknown\",{\"" ); - } +nft_buf_open_array (&b, type, cmd2tag[cmd]);
I think nft_buf_open_array is wrong for XML.
Consolidation means that you can use the same function for no matter what outputs. Here you use nft_buf_open() for XML but nft_buf_open_array(). The idea behind the 'buf' abstraction is that you use the same function call that represents the output in XML or JSON.
I mean:
switch (type) {
case NFT_OUTPUT_XML:
case NFT_OUTPUT_JSON:
nft_buf_open_array(&b, type, nft_cmd2tag(cmd));
break;
default:
...
}Quoted 50 lines
src/common.c +21
-15break ;default : -if (flags &NFT_OF_EVENT_NEW ) { - ret =snprintf (buf, size,"%9s" ,"[NEW] " ); - }else if (flags &NFT_OF_EVENT_DEL ) { - ret =snprintf (buf, size,"%9s" ,"[DELETE] " ); - }else { - ret =snprintf (buf, size,"%9s" ,"[unknown] " ); +switch (cmd) { +case NFT_CMD_ADD : +return snprintf (buf, size,"%9s" ,"[ADD] " ); +case NFT_CMD_DELETE : +return snprintf (buf, size,"%9s" ,"[DELETE] " ); +default : +return snprintf (buf, size,"%9s" ,"[unknown] " ); }break ; } -return ret; +return nft_buf_done (&b); } -static int nft_event_header_fprintf_cb (char *buf,size_t size,void *unused, -uint32_t type,uint32_t flags) +static int nft_cmd_header_fprintf_cb (char *buf,size_t size,void *obj, +uint32_t cmd,uint32_t type, +uint32_t flags) { -return nft_event_header_snprintf (buf, size, type, flags); +return nft_cmd_header_snprintf (buf, size, cmd, type, flags); } -int nft_event_header_fprintf (FILE *fp,uint32_t type,uint32_t flags) +int nft_cmd_header_fprintf (FILE *fp,uint32_t cmd,uint32_t type, +uint32_t flags) { -return nft_fprintf (fp,NULL , type, flags, nft_event_header_fprintf_cb); +return nft_fprintf (fp,NULL , cmd, type, flags, + nft_cmd_header_fprintf_cb); } -int nft_event_footer_snprintf (char *buf,size_t size,uint32_t type, -uint32_t flags) +int nft_cmd_footer_snprintf (char *buf,size_t size,uint32_t cmd,uint32_t type, +uint32_t flags) { -if (!(flags &NFT_OF_EVENT_ANY )) +NFT_BUF_INIT (b, buf, size); + +if (cmd ==NFT_CMD_UNSPEC )
src/common.c int nft_parse_perror(const char *msg, struct nft_parse_err *err) · line 138
Quoted 10 lines
src/common.c +3
-2return 0 ;switch (type) {case NFT_OUTPUT_XML : -return snprintf (buf, size,"</event>" ); +nft_buf_close (&b, type, cmd2tag[cmd]); +break ;case NFT_OUTPUT_JSON : -return snprintf (buf, size,"}}}" ); +nft_buf_close_array (&b, type,0 );
Same comment as above.
Quoted 481 lines
src/common.c +10
-5+break ;default :return 0 ; } +return nft_buf_done (&b); } -static int nft_event_footer_fprintf_cb (char *buf,size_t size,void *unused, -uint32_t type,uint32_t flags) +static int nft_cmd_footer_fprintf_cb (char *buf,size_t size,void *obj, +uint32_t cmd,uint32_t type, +uint32_t flags) { -return nft_event_footer_snprintf (buf, size, type, flags); +return nft_cmd_footer_snprintf (buf, size, cmd, type, flags); } -int nft_event_footer_fprintf (FILE *fp,uint32_t type,uint32_t flags) +int nft_cmd_footer_fprintf (FILE *fp,uint32_t cmd,uint32_t type, +uint32_t flags) { -return nft_fprintf (fp,NULL , type, flags, nft_event_footer_fprintf_cb); +return nft_fprintf (fp,NULL , cmd, type, flags, + nft_cmd_footer_fprintf_cb); }static void nft_batch_build_hdr (char *buf,uint16_t type,uint32_t seq)src/gen.c +17
-6@@ -161,12 +161,12 @@ static int nft_gen_snprintf_default(char *buf, size_t size, struct nft_gen *gen)return snprintf (buf, size,"ruleset generation ID %u" , gen->id); } -int nft_gen_snprintf (char *buf,size_t size,struct nft_gen *gen, -uint32_t type,uint32_t flags) +static int nft_gen_cmd_snprintf (char *buf,size_t size,struct nft_gen *gen, +uint32_t cmd,uint32_t type,uint32_t flags) {int ret, len = size, offset =0 ; - ret =nft_event_header_snprintf (buf + offset, len, type, flags); + ret =nft_cmd_header_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);switch (type) {@@ -178,15 +178,25 @@ int nft_gen_snprintf(char *buf, size_t size, struct nft_gen *gen, }SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =nft_event_footer_snprintf (buf + offset, len, type, flags); + ret =nft_cmd_footer_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset; } + +int nft_gen_snprintf (char *buf,size_t size,struct nft_gen *gen,uint32_t type, +uint32_t flags) +{ +uint32_t cmd; + +nft_flag2cmd (flags, &cmd); +return nft_gen_cmd_snprintf (buf, size, gen, cmd, type, flags); +}EXPORT_SYMBOL (nft_gen_snprintf);static inline int nft_gen_do_snprintf (char *buf,size_t size,void *gen, -uint32_t type,uint32_t flags) +uint32_t cmd,uint32_t type, +uint32_t flags) {return nft_gen_snprintf (buf, size, gen, type, flags); }@@ -194,6 +204,7 @@ static inline int nft_gen_do_snprintf(char *buf, size_t size, void *gen,int nft_gen_fprintf (FILE *fp,struct nft_gen *gen,uint32_t type,uint32_t flags) { -return nft_fprintf (fp, gen, type, flags, nft_gen_do_snprintf); +return nft_fprintf (fp, gen,NFT_CMD_UNSPEC , type, flags, + nft_gen_do_snprintf); }EXPORT_SYMBOL (nft_gen_fprintf);src/internal.h +12
-7@@ -146,16 +146,21 @@ int nft_str2family(const char *family);int nft_strtoi (const char *string,int base,void *number,enum nft_type type);const char *nft_verdict2str (uint32_t verdict);int nft_str2verdict (const char *verdict,int *verdict_num); +int nft_flag2cmd (uint32_t flags,uint32_t *cmd);int nft_get_value (enum nft_type type,void *val,void *out);#include <stdio.h> -int nft_fprintf (FILE *fp,void *obj,uint32_t type,uint32_t flags,int (*snprintf_cb)(char *buf,size_t bufsiz,void *obj,uint32_t type,uint32_t flags)); -int nft_event_header_snprintf (char *buf,size_t bufsize, -uint32_t format,uint32_t flags); -int nft_event_header_fprintf (FILE *fp,uint32_t format,uint32_t flags); -int nft_event_footer_snprintf (char *buf,size_t bufsize, -uint32_t format,uint32_t flags); -int nft_event_footer_fprintf (FILE *fp,uint32_t format,uint32_t flags); +int nft_fprintf (FILE *fp,void *obj,uint32_t cmd,uint32_t type, +uint32_t flags,int (*snprintf_cb)(char *buf,size_t bufsiz, +void *obj,uint32_t cmd,uint32_t type,uint32_t flags)); +int nft_cmd_header_snprintf (char *buf,size_t bufsize,uint32_t cmd, +uint32_t format,uint32_t flags); +int nft_cmd_header_fprintf (FILE *fp,uint32_t cmd,uint32_t format, +uint32_t flags); +int nft_cmd_footer_snprintf (char *buf,size_t bufsize,uint32_t cmd, +uint32_t format,uint32_t flags); +int nft_cmd_footer_fprintf (FILE *fp,uint32_t cmd,uint32_t format, +uint32_t flags);struct expr_ops ;src/rule.c +17
-6@@ -963,15 +963,15 @@ static int nft_rule_snprintf_default(char *buf, size_t size, struct nft_rule *r,return offset; } -int nft_rule_snprintf (char *buf,size_t size,struct nft_rule *r, -uint32_t type,uint32_t flags) +static int nft_rule_cmd_snprintf (char *buf,size_t size,struct nft_rule *r, +uint32_t cmd,uint32_t type,uint32_t flags) {int ret, len = size, offset =0 ;uint32_t inner_flags = flags; inner_flags &= ~NFT_OF_EVENT_ANY ; - ret =nft_event_header_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_header_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);switch (type) {@@ -993,15 +993,25 @@ int nft_rule_snprintf(char *buf, size_t size, struct nft_rule *r,SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =nft_event_footer_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_footer_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset; } + +int nft_rule_snprintf (char *buf,size_t size,struct nft_rule *r, +uint32_t type,uint32_t flags) +{ +uint32_t cmd; + +nft_flag2cmd (flags, &cmd); +return nft_rule_cmd_snprintf (buf, size, r, cmd, type, flags); +}EXPORT_SYMBOL (nft_rule_snprintf);static inline int nft_rule_do_snprintf (char *buf,size_t size,void *r, -uint32_t type,uint32_t flags) +uint32_t cmd,uint32_t type, +uint32_t flags) {return nft_rule_snprintf (buf, size, r, type, flags); }@@ -1009,7 +1019,8 @@ static inline int nft_rule_do_snprintf(char *buf, size_t size, void *r,int nft_rule_fprintf (FILE *fp,struct nft_rule *r,uint32_t type,uint32_t flags) { -return nft_fprintf (fp, r, type, flags, nft_rule_do_snprintf); +return nft_fprintf (fp, r,NFT_CMD_UNSPEC , type, flags, + nft_rule_do_snprintf); }EXPORT_SYMBOL (nft_rule_fprintf);src/ruleset.c +39
-12@@ -784,7 +784,7 @@ nft_ruleset_snprintf_rule(char *buf, size_t size,static int nft_ruleset_do_snprintf (char *buf,size_t size,const struct nft_ruleset *rs, -uint32_t type,uint32_t flags) +uint32_t cmd,uint32_t type,uint32_t flags) {int ret, len = size, offset =0 ;void *prev =NULL ;@@ -793,10 +793,10 @@ nft_ruleset_do_snprintf(char *buf, size_t size, const struct nft_ruleset *rs,/* dont pass events flags to child calls of _snprintf() */ inner_flags &= ~NFT_OF_EVENT_ANY ; - ret =nft_event_header_snprintf (buf+offset, len, type, flags); + ret =snprintf (buf + offset, len,"%s" ,nft_ruleset_o_opentag (type));SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =snprintf (buf+offset, len,"%s" ,nft_ruleset_o_opentag (type)); + ret =nft_cmd_header_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); if (nft_ruleset_attr_is_set(rs, NFT_RULESET_ATTR_TABLELIST) &&@@ -848,23 +848,41 @@ nft_ruleset_do_snprintf(char *buf, size_t size, const struct nft_ruleset *rs,SNPRINTF_BUFFER_SIZE (ret, size, len, offset); } - ret =snprintf (buf+offset, len,"%s" ,nft_ruleset_o_closetag (type)); + ret =nft_cmd_footer_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =nft_event_footer_snprintf (buf+offset, len, type, flags); + ret =snprintf (buf + offset, len,"%s" ,nft_ruleset_o_closetag (type));SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset; } +static int nft_ruleset_cmd_snprintf (char *buf,size_t size, +const struct nft_ruleset *r,uint32_t cmd, +uint32_t type,uint32_t flags) +{ +switch (type) { +case NFT_OUTPUT_DEFAULT : +case NFT_OUTPUT_XML : +case NFT_OUTPUT_JSON : +return nft_ruleset_do_snprintf (buf, size, r, cmd, type, flags); +default : + errno =EOPNOTSUPP ; +return -1 ; + } +} +int nft_ruleset_snprintf (char *buf,size_t size,const struct nft_ruleset *r,uint32_t type,uint32_t flags) { +uint32_t cmd; + +nft_flag2cmd (flags, &cmd);switch (type) {case NFT_OUTPUT_DEFAULT :case NFT_OUTPUT_XML :case NFT_OUTPUT_JSON : -return nft_ruleset_do_snprintf (buf, size, r, type, flags); +return nft_ruleset_cmd_snprintf (buf, size, r, cmd, type, flags);default : errno =EOPNOTSUPP ;return -1 ;@@ -1017,8 +1035,8 @@ err:return -1 ; \ len += ret; -int nft_ruleset_fprintf (FILE *fp,const struct nft_ruleset *rs,uint32_t type, -uint32_t flags) +static int nft_ruleset_cmd_fprintf (FILE *fp,const struct nft_ruleset *rs, +uint32_t cmd,uint32_t type,uint32_t flags) {int len =0 , ret =0 ;void *prev =NULL ;@@ -1027,10 +1045,10 @@ int nft_ruleset_fprintf(FILE *fp, const struct nft_ruleset *rs, uint32_t type,/* dont pass events flags to child calls of _snprintf() */ inner_flags &= ~NFT_OF_EVENT_ANY ; - ret =nft_event_header_fprintf (fp, type, flags); + ret =fprintf (fp,"%s" ,nft_ruleset_o_opentag (type));NFT_FPRINTF_RETURN_OR_FIXLEN (ret, len); - ret =fprintf (fp,"%s" ,nft_ruleset_o_opentag (type)); + ret =nft_cmd_header_fprintf (fp, cmd, type, flags);NFT_FPRINTF_RETURN_OR_FIXLEN (ret, len); if ((nft_ruleset_attr_is_set(rs, NFT_RULESET_ATTR_TABLELIST)) &&@@ -1075,12 +1093,21 @@ int nft_ruleset_fprintf(FILE *fp, const struct nft_ruleset *rs, uint32_t type,NFT_FPRINTF_RETURN_OR_FIXLEN (ret, len); } - ret =fprintf (fp,"%s" ,nft_ruleset_o_closetag (type)); + ret =nft_cmd_footer_fprintf (fp, cmd, type, flags);NFT_FPRINTF_RETURN_OR_FIXLEN (ret, len); - ret =nft_event_footer_fprintf (fp, type, flags); + ret =fprintf (fp,"%s" ,nft_ruleset_o_closetag (type));NFT_FPRINTF_RETURN_OR_FIXLEN (ret, len);return len; } + +int nft_ruleset_fprintf (FILE *fp,const struct nft_ruleset *rs,uint32_t type, +uint32_t flags) +{ +uint32_t cmd; + +nft_flag2cmd (flags, &cmd); +return nft_ruleset_cmd_fprintf (fp, rs, cmd, type, flags); +}EXPORT_SYMBOL (nft_ruleset_fprintf);src/set.c +17
-6@@ -889,8 +889,8 @@ static int nft_set_snprintf_xml(char *buf, size_t size, struct nft_set *s,return offset; } -int nft_set_snprintf (char *buf,size_t size,struct nft_set *s, -uint32_t type,uint32_t flags) +static int nft_set_cmd_snprintf (char *buf,size_t size,struct nft_set *s, +uint32_t cmd,uint32_t type,uint32_t flags) {int ret, len = size, offset =0 ;uint32_t inner_flags = flags;@@ -898,7 +898,7 @@ int nft_set_snprintf(char *buf, size_t size, struct nft_set *s,/* prevent set_elems to print as events */ inner_flags &= ~NFT_OF_EVENT_ANY ; - ret =nft_event_header_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_header_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);switch (type) {@@ -919,15 +919,25 @@ int nft_set_snprintf(char *buf, size_t size, struct nft_set *s,SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =nft_event_footer_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_footer_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset; } + +int nft_set_snprintf (char *buf,size_t size,struct nft_set *s, +uint32_t type,uint32_t flags) +{ +uint32_t cmd; + +nft_flag2cmd (flags, &cmd); +return nft_set_cmd_snprintf (buf, size, s, cmd, type, flags); +}EXPORT_SYMBOL (nft_set_snprintf);static inline int nft_set_do_snprintf (char *buf,size_t size,void *s, -uint32_t type,uint32_t flags) +uint32_t cmd,uint32_t type, +uint32_t flags) {return nft_set_snprintf (buf, size, s, type, flags); }@@ -935,7 +945,8 @@ static inline int nft_set_do_snprintf(char *buf, size_t size, void *s,int nft_set_fprintf (FILE *fp,struct nft_set *s,uint32_t type,uint32_t flags) { -return nft_fprintf (fp, s, type, flags, nft_set_do_snprintf); +return nft_fprintf (fp, s,NFT_CMD_UNSPEC , type, flags, + nft_set_do_snprintf); }EXPORT_SYMBOL (nft_set_fprintf);src/set_elem.c +18
-6@@ -614,12 +614,13 @@ static int nft_set_elem_snprintf_xml(char *buf, size_t size,return offset; } -int nft_set_elem_snprintf (char *buf,size_t size,struct nft_set_elem *e, -uint32_t type,uint32_t flags) +static int nft_set_elem_cmd_snprintf (char *buf,size_t size, +struct nft_set_elem *e,uint32_t cmd, +uint32_t type,uint32_t flags) {int ret, len = size, offset =0 ; - ret =nft_event_header_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_header_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);switch (type) {@@ -638,15 +639,25 @@ int nft_set_elem_snprintf(char *buf, size_t size, struct nft_set_elem *e,SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =nft_event_footer_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_footer_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset; } + +int nft_set_elem_snprintf (char *buf,size_t size,struct nft_set_elem *e, +uint32_t type,uint32_t flags) +{ +uint32_t cmd; + +nft_flag2cmd (flags, &cmd); +return nft_set_elem_cmd_snprintf (buf, size, e, cmd, type, flags); +}EXPORT_SYMBOL (nft_set_elem_snprintf);static inline int nft_set_elem_do_snprintf (char *buf,size_t size,void *e, -uint32_t type,uint32_t flags) +uint32_t cmd,uint32_t type, +uint32_t flags) {return nft_set_elem_snprintf (buf, size, e, type, flags); }@@ -654,7 +665,8 @@ static inline int nft_set_elem_do_snprintf(char *buf, size_t size, void *e,int nft_set_elem_fprintf (FILE *fp,struct nft_set_elem *se,uint32_t type,uint32_t flags) { -return nft_fprintf (fp, se, type, flags, nft_set_elem_do_snprintf); +return nft_fprintf (fp, se,NFT_CMD_UNSPEC , type, flags, + nft_set_elem_do_snprintf); }EXPORT_SYMBOL (nft_set_elem_fprintf);src/table.c +17
-6@@ -419,12 +419,12 @@ static int nft_table_snprintf_default(char *buf, size_t size, struct nft_table * t->table_flags, t->use); } -int nft_table_snprintf (char *buf,size_t size,struct nft_table *t, -uint32_t type,uint32_t flags) +static int nft_table_cmd_snprintf (char *buf,size_t size,struct nft_table *t, +uint32_t cmd,uint32_t type,uint32_t flags) {int ret, len = size, offset =0 ; - ret =nft_event_header_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_header_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);switch (type) {@@ -440,15 +440,25 @@ int nft_table_snprintf(char *buf, size_t size, struct nft_table *t, }SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =nft_event_footer_snprintf (buf+offset, len, type, flags); + ret =nft_cmd_footer_snprintf (buf + offset, len, cmd, type, flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset; } + +int nft_table_snprintf (char *buf,size_t size,struct nft_table *t, +uint32_t type,uint32_t flags) +{ +uint32_t cmd; + +nft_flag2cmd (flags, &cmd); +return nft_table_cmd_snprintf (buf, size, t, cmd, type, flags); +}EXPORT_SYMBOL (nft_table_snprintf);static inline int nft_table_do_snprintf (char *buf,size_t size,void *t, -uint32_t type,uint32_t flags) +uint32_t cmd,uint32_t type, +uint32_t flags) {return nft_table_snprintf (buf, size, t, type, flags); }@@ -456,7 +466,8 @@ static inline int nft_table_do_snprintf(char *buf, size_t size, void *t,int nft_table_fprintf (FILE *fp,struct nft_table *t,uint32_t type,uint32_t flags) { -return nft_fprintf (fp, t, type, flags, nft_table_do_snprintf); +return nft_fprintf (fp, t,NFT_CMD_UNSPEC , type, flags, + nft_table_do_snprintf); }EXPORT_SYMBOL (nft_table_fprintf);src/utils.c +0
-0
src/utils.c int nft_str2verdict(const char *verdict, int *verdict_num) · line 180
Quoted 5 lines
src/utils.c +1
-1@@ -177,16 +177,32 @@ int nft_str2verdict(const char *verdict, int *verdict_num)return -1 ; } -int nft_fprintf(FILE *fp, void *obj, uint32_t type, uint32_t flags, +int nft_flag2cmd (uint32_t flags,uint32_t *cmd)
Why don't you convert this to:
enum nft_cmd_type nft_flag2cmd(uint32_t flags)
and return NFT_CMD_UNSPEC in case that there is not translation.
Quoted 14 lines
src/utils.c +14
-0+{ +if (!(flags &NFT_OF_EVENT_ANY )) { + *cmd =NFT_CMD_UNSPEC ; +return 0 ; + }else if (flags &NFT_OF_EVENT_NEW ) { + *cmd =NFT_CMD_ADD ; +return 0 ; + }else if (flags &NFT_OF_EVENT_DEL ) { + *cmd =NFT_CMD_DELETE ; +return 0 ; + } + +return -1 ; +}