parsing: rework and generalize the build/parse system
PATCH 1/3 parsing: rework and generalize the build/parse system
The intention behind this patch is to allow adding more input sources in the near future.
For this to happen without duplicating many code, we need to generalize the build/parse system.
The path flow is now as follow:
* API func: here we decide what kind of input we have. nft_table_parse()
* Common function to decide what format to parse (JSON/XML). nft_table_do_parse()
* Common function per format to order the build of the tree and launch the parsing:
nft_table_xml_parse()
nft_table_json_parse()
* Common function per format to build the tree (here more builders can be easily implemented):
nft_mxml_build_tree()
nft_jansson_create_root()
---
0 files changed
src/chain.c +16 -10
@@ -591,14 +591,14 @@ err: }#endif -static int nft_chain_json_parse (struct nft_chain *c,const char *json, -struct nft_parse_err *err) +static int nft_chain_json_parse (struct nft_chain *c,const void *json, +struct nft_parse_err *err,uint32_t buildsrc) {#ifdef JSON_PARSING json_t *tree;json_error_t error; - tree =nft_jansson_create_root (json, &error, err); + tree =nft_jansson_create_root (json, &error, err, buildsrc);if (tree ==NULL )return -1 ;
@@ -708,12 +708,12 @@ int nft_mxml_chain_parse(mxml_node_t *tree, struct nft_chain *c, }#endif -static int nft_chain_xml_parse (struct nft_chain *c,const char *xml, -struct nft_parse_err *err) +static int nft_chain_xml_parse (struct nft_chain *c,const void *xml, +struct nft_parse_err *err,uint32_t buildsrc) {#ifdef XML_PARSING int ret; -mxml_node_t *tree =nft_mxml_build_tree (xml,"chain" , err); +mxml_node_t *tree =nft_mxml_build_tree (xml,"chain" , err, buildsrc);if (tree ==NULL )return -1 ;
@@ -726,18 +726,19 @@ static int nft_chain_xml_parse(struct nft_chain *c, const char *xml,#endif } -int nft_chain_parse (struct nft_chain *c,enum nft_parse_type type, -const char *data,struct nft_parse_err *err) +static int nft_chain_do_parse (struct nft_chain *c,enum nft_parse_type type, +const void *data,struct nft_parse_err *err, +uint32_t buildsrc) {int ret;struct nft_parse_err perr;switch (type) {case NFT_PARSE_XML : - ret =nft_chain_xml_parse (c, data, &perr); + ret =nft_chain_xml_parse (c, data, &perr, buildsrc);break ;case NFT_PARSE_JSON : - ret =nft_chain_json_parse (c, data, &perr); + ret =nft_chain_json_parse (c, data, &perr, buildsrc);break ;default : ret =-1 ;
@@ -750,6 +751,11 @@ int nft_chain_parse(struct nft_chain *c, enum nft_parse_type type,return ret; } +int nft_chain_parse (struct nft_chain *c,enum nft_parse_type type, +const char *data,struct nft_parse_err *err) +{ +return nft_chain_do_parse (c, type, data, err,NFT_PARSE_BUFFER ); +}EXPORT_SYMBOL (nft_chain_parse);static int nft_chain_snprintf_json (char *buf,size_t size,struct nft_chain *c)
src/internal.h +8 -4
@@ -38,12 +38,16 @@ struct nft_parse_err {const char *node_name; }; +enum { +NFT_PARSE_BUFFER , +}; +#ifdef XML_PARSING #include <mxml.h> #define NFT_XML_MAND 0#define NFT_XML_OPT (1 << 0) -mxml_node_t *nft_mxml_build_tree (const char *xml,const char *treename, -struct nft_parse_err *err); +mxml_node_t *nft_mxml_build_tree (const void *data,const char *treename, +struct nft_parse_err *err,uint32_t buildsrc);struct nft_rule_expr *nft_mxml_expr_parse (mxml_node_t *node,struct nft_parse_err *err); int nft_mxml_reg_parse(mxml_node_t *tree, const char *reg_name, uint32_t flags,
@@ -88,8 +92,8 @@ int nft_jansson_parse_val(json_t *root, const char *node_name, int type,const char *nft_jansson_parse_str (json_t *root,const char *node_name,struct nft_parse_err *err);bool nft_jansson_node_exist (json_t *root,const char *node_name); -json_t *nft_jansson_create_root (const char *json,json_error_t *error, -struct nft_parse_err *err); +json_t *nft_jansson_create_root (const void *json,json_error_t *error, +struct nft_parse_err *err,uint32_t buildsrc);json_t *nft_jansson_get_node (json_t *root,const char *node_name,struct nft_parse_err *err);void nft_jansson_free_root (json_t *root);
src/jansson.c +14 -5
@@ -89,22 +89,31 @@ bool nft_jansson_node_exist(json_t *root, const char *node_name)return json_object_get (root, node_name) !=NULL ; } -json_t *nft_jansson_create_root (const char *json,json_error_t *error, -struct nft_parse_err *err) +json_t *nft_jansson_create_root (const void *json,json_error_t *error, +struct nft_parse_err *err,uint32_t buildsrc) {json_t *root; - root =json_loadb (json,strlen (json),0 , error); +switch (buildsrc) { +case NFT_PARSE_BUFFER : + root =json_loadb (json,strlen (json),0 , error); +break ; +default : + goto err; + } +if (root ==NULL ) { err->error =NFT_PARSE_EBADINPUT ; err->line = error->line; err->column = error->column; err->node_name = error->source; - errno =EINVAL ; -return NULL ; + goto err; }return root; +err: + errno =EINVAL ; +return NULL ; } json_t *nft_jansson_get_node(json_t *root, const char *node_name,
src/mxml.c +10 -3
@@ -22,12 +22,19 @@#include <libnftables/set.h> #ifdef XML_PARSING -mxml_node_t *nft_mxml_build_tree (const char *xml,const char *treename, -struct nft_parse_err *err) +mxml_node_t *nft_mxml_build_tree (const void *data,const char *treename, +struct nft_parse_err *err,uint32_t buildsrc) {mxml_node_t *tree; - tree =mxmlLoadString (NULL , xml,MXML_OPAQUE_CALLBACK ); +switch (buildsrc) { +case NFT_PARSE_BUFFER : + tree =mxmlLoadString (NULL , data,MXML_OPAQUE_CALLBACK ); +break ; +default : + goto err; + } +if (tree ==NULL ) { err->error =NFT_PARSE_EBADINPUT ; goto err;
src/rule.c +16 -10
@@ -526,14 +526,14 @@ err: }#endif -static int nft_rule_json_parse (struct nft_rule *r,const char *json, -struct nft_parse_err *err) +static int nft_rule_json_parse (struct nft_rule *r,const void *json, +struct nft_parse_err *err,uint32_t buildsrc) {#ifdef JSON_PARSING json_t *tree;json_error_t error; - tree =nft_jansson_create_root (json, &error, err); + tree =nft_jansson_create_root (json, &error, err, buildsrc);if (tree ==NULL )return -1 ;
@@ -627,12 +627,12 @@ int nft_mxml_rule_parse(mxml_node_t *tree, struct nft_rule *r, }#endif -static int nft_rule_xml_parse (struct nft_rule *r,const char *xml, -struct nft_parse_err *err) +static int nft_rule_xml_parse (struct nft_rule *r,const void *xml, +struct nft_parse_err *err,uint32_t buildsrc) {#ifdef XML_PARSING int ret; -mxml_node_t *tree =nft_mxml_build_tree (xml,"rule" , err); +mxml_node_t *tree =nft_mxml_build_tree (xml,"rule" , err, buildsrc);if (tree ==NULL )return -1 ;
@@ -645,18 +645,19 @@ static int nft_rule_xml_parse(struct nft_rule *r, const char *xml,#endif } -int nft_rule_parse (struct nft_rule *r,enum nft_parse_type type, -const char *data,struct nft_parse_err *err) +static int nft_rule_do_parse (struct nft_rule *r,enum nft_parse_type type, +const void *data,struct nft_parse_err *err, +uint32_t buildsrc) {int ret;struct nft_parse_err perr;switch (type) {case NFT_PARSE_XML : - ret =nft_rule_xml_parse (r, data, &perr); + ret =nft_rule_xml_parse (r, data, &perr, buildsrc);break ;case NFT_PARSE_JSON : - ret =nft_rule_json_parse (r, data, &perr); + ret =nft_rule_json_parse (r, data, &perr, buildsrc);break ;default : ret =-1 ;
@@ -668,6 +669,11 @@ int nft_rule_parse(struct nft_rule *r, enum nft_parse_type type,return ret; } +int nft_rule_parse (struct nft_rule *r,enum nft_parse_type type, +const char *data,struct nft_parse_err *err) +{ +return nft_rule_do_parse (r, type, data, err,NFT_PARSE_BUFFER ); +}EXPORT_SYMBOL (nft_rule_parse); static int nft_rule_snprintf_json(char *buf, size_t size, struct nft_rule *r,
src/ruleset.c +18 -10
@@ -330,14 +330,14 @@ err:#endif -static int nft_ruleset_json_parse (struct nft_ruleset *rs,const char *json, -struct nft_parse_err *err) +static int nft_ruleset_json_parse (struct nft_ruleset *rs,const void *json, +struct nft_parse_err *err,uint32_t buildsrc) {#ifdef JSON_PARSING json_t *root, *array;json_error_t error; - root =nft_jansson_create_root (json, &error, err); + root =nft_jansson_create_root (json, &error, err, buildsrc);if (root ==NULL )return -1 ;
@@ -534,13 +534,13 @@ err_free: }#endif -static int nft_ruleset_xml_parse (struct nft_ruleset *rs,const char *xml, -struct nft_parse_err *err) +static int nft_ruleset_xml_parse (struct nft_ruleset *rs,const void *xml, +struct nft_parse_err *err,uint32_t buildsrc) {#ifdef XML_PARSING mxml_node_t *tree; - tree =nft_mxml_build_tree (xml,"nftables" , err); + tree =nft_mxml_build_tree (xml,"nftables" , err, buildsrc);if (tree ==NULL )return -1 ;
@@ -567,17 +567,19 @@ err:#endif } -int nft_ruleset_parse (struct nft_ruleset *r,enum nft_parse_type type, -const char *data,struct nft_parse_err *err) +static int +nft_ruleset_do_parse (struct nft_ruleset *r,enum nft_parse_type type, +const void *data,struct nft_parse_err *err, +uint32_t buildsrc) {int ret;switch (type) {case NFT_PARSE_XML : - ret =nft_ruleset_xml_parse (r, data, err); + ret =nft_ruleset_xml_parse (r, data, err, buildsrc);break ;case NFT_PARSE_JSON : - ret =nft_ruleset_json_parse (r, data, err); + ret =nft_ruleset_json_parse (r, data, err, buildsrc);break ;default : ret =-1 ;
@@ -587,6 +589,12 @@ int nft_ruleset_parse(struct nft_ruleset *r, enum nft_parse_type type,return ret; } + +int nft_ruleset_parse (struct nft_ruleset *r,enum nft_parse_type type, +const char *data,struct nft_parse_err *err) +{ +return nft_ruleset_do_parse (r, type, data, err,NFT_PARSE_BUFFER ); +}EXPORT_SYMBOL (nft_ruleset_parse);static const char *nft_ruleset_o_opentag (uint32_t type)
src/set.c +16 -10
@@ -375,14 +375,14 @@ err: }#endif -static int nft_set_json_parse (struct nft_set *s,const char *json, -struct nft_parse_err *err) +static int nft_set_json_parse (struct nft_set *s,const void *json, +struct nft_parse_err *err,uint32_t buildsrc) {#ifdef JSON_PARSING json_t *tree;json_error_t error; - tree =nft_jansson_create_root (json, &error, err); + tree =nft_jansson_create_root (json, &error, err, buildsrc);if (tree ==NULL )return -1 ;
@@ -483,12 +483,12 @@ int nft_mxml_set_parse(mxml_node_t *tree, struct nft_set *s, }#endif -static int nft_set_xml_parse (struct nft_set *s,const char *xml, -struct nft_parse_err *err) +static int nft_set_xml_parse (struct nft_set *s,const void *xml, +struct nft_parse_err *err,uint32_t buildsrc) {#ifdef XML_PARSING int ret; -mxml_node_t *tree =nft_mxml_build_tree (xml,"set" , err); +mxml_node_t *tree =nft_mxml_build_tree (xml,"set" , err, buildsrc);if (tree ==NULL )return -1 ;
@@ -501,18 +501,19 @@ static int nft_set_xml_parse(struct nft_set *s, const char *xml,#endif } -int nft_set_parse (struct nft_set *s,enum nft_parse_type type, -const char *data,struct nft_parse_err *err) +static int nft_set_do_parse (struct nft_set *s,enum nft_parse_type type, +const void *data,struct nft_parse_err *err, +uint32_t buildsrc) {int ret;struct nft_parse_err perr;switch (type) {case NFT_PARSE_XML : - ret =nft_set_xml_parse (s, data, &perr); + ret =nft_set_xml_parse (s, data, &perr, buildsrc);break ;case NFT_PARSE_JSON : - ret =nft_set_json_parse (s, data, &perr); + ret =nft_set_json_parse (s, data, &perr, buildsrc);break ;default : ret =-1 ;
@@ -525,6 +526,11 @@ int nft_set_parse(struct nft_set *s, enum nft_parse_type type,return ret; } +int nft_set_parse (struct nft_set *s,enum nft_parse_type type, +const char *data,struct nft_parse_err *err) +{ +return nft_set_do_parse (s, type, data, err,NFT_PARSE_BUFFER ); +}EXPORT_SYMBOL (nft_set_parse); static int nft_set_snprintf_json(char *buf, size_t size, struct nft_set *s,
src/set_elem.c +17 -10
@@ -394,14 +394,14 @@ int nft_mxml_set_elem_parse(mxml_node_t *tree, struct nft_set_elem *e, }#endif -static int nft_set_elem_xml_parse (struct nft_set_elem *e,const char *xml, -struct nft_parse_err *err) +static int nft_set_elem_xml_parse (struct nft_set_elem *e,const void *xml, +struct nft_parse_err *err,uint32_t buildsrc) {#ifdef XML_PARSING mxml_node_t *tree;int ret; - tree =nft_mxml_build_tree (xml,"set_elem" , err); + tree =nft_mxml_build_tree (xml,"set_elem" , err, buildsrc);if (tree ==NULL )return -1 ;
@@ -415,13 +415,13 @@ static int nft_set_elem_xml_parse(struct nft_set_elem *e, const char *xml, }static int nft_set_elem_json_parse (struct nft_set_elem *e,const void *json, -struct nft_parse_err *err) +struct nft_parse_err *err,uint32_t buildsrc) {#ifdef JSON_PARSING json_t *tree;json_error_t error; - tree =nft_jansson_create_root (json, &error, err); + tree =nft_jansson_create_root (json, &error, err, buildsrc);if (tree ==NULL )return -1 ;
@@ -432,17 +432,19 @@ static int nft_set_elem_json_parse(struct nft_set_elem *e, const void *json,#endif } -int nft_set_elem_parse (struct nft_set_elem *e, -enum nft_parse_type type,const char *data, -struct nft_parse_err *err) { +static int +nft_set_elem_do_parse (struct nft_set_elem *e,enum nft_parse_type type, +const void *data,struct nft_parse_err *err, +uint32_t buildsrc) +{int ret;switch (type) {case NFT_PARSE_XML : - ret =nft_set_elem_xml_parse (e, data, err); + ret =nft_set_elem_xml_parse (e, data, err, buildsrc);break ;case NFT_PARSE_JSON : - ret =nft_set_elem_json_parse (e, data, err); + ret =nft_set_elem_json_parse (e, data, err, buildsrc);break ;default : errno =EOPNOTSUPP ;
@@ -452,6 +454,11 @@ int nft_set_elem_parse(struct nft_set_elem *e,return ret; } +int nft_set_elem_parse (struct nft_set_elem *e,enum nft_parse_type type, +const char *data,struct nft_parse_err *err) +{ +return nft_set_elem_do_parse (e, type, data, err,NFT_PARSE_BUFFER ); +}EXPORT_SYMBOL (nft_set_elem_parse); static int nft_set_elem_snprintf_json(char *buf, size_t size,
src/table.c +17 -10
@@ -247,12 +247,12 @@ int nft_mxml_table_parse(mxml_node_t *tree, struct nft_table *t, }#endif -static int nft_table_xml_parse (struct nft_table *t,const char *xml, -struct nft_parse_err *err) +static int nft_table_xml_parse (struct nft_table *t,const void *data, +struct nft_parse_err *err,uint32_t buildsrc) {#ifdef XML_PARSING int ret; -mxml_node_t *tree =nft_mxml_build_tree (xml,"table" , err); +mxml_node_t *tree =nft_mxml_build_tree (data,"table" , err, buildsrc);if (tree ==NULL )return -1 ;
@@ -302,14 +302,14 @@ err: }#endif -static int nft_table_json_parse (struct nft_table *t,const char *json, -struct nft_parse_err *err) +static int nft_table_json_parse (struct nft_table *t,const void *json, +struct nft_parse_err *err,uint32_t buildsrc) {#ifdef JSON_PARSING json_t *tree;json_error_t error; - tree =nft_jansson_create_root (json, &error, err); + tree =nft_jansson_create_root (json, &error, err, buildsrc);if (tree ==NULL )return -1 ;
@@ -320,18 +320,19 @@ static int nft_table_json_parse(struct nft_table *t, const char *json,#endif } -int nft_table_parse (struct nft_table *t,enum nft_parse_type type, -const char *data,struct nft_parse_err *err) +static int nft_table_do_parse (struct nft_table *t,enum nft_parse_type type, +const void *data,struct nft_parse_err *err, +uint32_t buildsrc) {int ret;struct nft_parse_err perr;switch (type) {case NFT_PARSE_XML : - ret =nft_table_xml_parse (t, data, &perr); + ret =nft_table_xml_parse (t, data, &perr, buildsrc);break ;case NFT_PARSE_JSON : - ret =nft_table_json_parse (t, data, &perr); + ret =nft_table_json_parse (t, data, &perr, buildsrc);break ;default : ret =-1 ;
@@ -344,6 +345,12 @@ int nft_table_parse(struct nft_table *t, enum nft_parse_type type,return ret; } + +int nft_table_parse (struct nft_table *t,enum nft_parse_type type, +const char *data,struct nft_parse_err *err) +{ +return nft_table_do_parse (t, type, data, err,NFT_PARSE_BUFFER ); +}EXPORT_SYMBOL (nft_table_parse);static int nft_table_snprintf_json (char *buf,size_t size,struct nft_table *t)
PATCH 2/3 parsing: add interface to parse from file
This patch adds API interfaces to parse nft objects from a given stream. I found this useful in `nft', where I'm trying to parse XML/JSON from a file.
In addition to the API functions, a new builder is added to handle a file.
---
0 files changed
include/libnftables/chain.h +2 -0
@@ -53,6 +53,8 @@ void nft_chain_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_chainint nft_chain_parse (struct nft_chain *c,enum nft_parse_type type,const char *data,struct nft_parse_err *err); +int nft_chain_parse_file (struct nft_chain *c,enum nft_parse_type type, +FILE *fp,struct nft_parse_err *err);int nft_chain_snprintf (char *buf,size_t size,struct nft_chain *t,uint32_t type,uint32_t flags);int nft_chain_fprintf (FILE *fp,struct nft_chain *c,uint32_t type,uint32_t flags);
include/libnftables/rule.h +2 -0
@@ -49,6 +49,8 @@ void nft_rule_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_rule *t);int nft_rule_parse (struct nft_rule *r,enum nft_parse_type type,const char *data,struct nft_parse_err *err); +int nft_rule_parse_file (struct nft_rule *r,enum nft_parse_type type, +FILE *fp,struct nft_parse_err *err);int nft_rule_snprintf (char *buf,size_t size,struct nft_rule *t,uint32_t type,uint32_t flags);int nft_rule_fprintf (FILE *fp,struct nft_rule *r,uint32_t type,uint32_t flags);
include/libnftables/ruleset.h +2 -0
@@ -32,6 +32,8 @@ const void *nft_ruleset_attr_get(const struct nft_ruleset *r, uint16_t attr);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, +FILE *fp,struct nft_parse_err *err);int nft_ruleset_snprintf (char *buf,size_t size,const struct nft_ruleset *rs,uint32_t type,uint32_t flags);int nft_ruleset_fprintf (FILE *fp,const struct nft_ruleset *rs,uint32_t type,uint32_t flags);
include/libnftables/set.h +4 -0
@@ -62,6 +62,8 @@ void nft_set_list_iter_destroy(struct nft_set_list_iter *iter);int nft_set_parse (struct nft_set *s,enum nft_parse_type type,const char *data,struct nft_parse_err *err); +int nft_set_parse_file (struct nft_set *s,enum nft_parse_type type, +FILE *fp,struct nft_parse_err *err);/* * Set elements
@@ -101,6 +103,8 @@ int nft_set_elem_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set_elem *s)int nft_set_elem_parse (struct nft_set_elem *e,enum nft_parse_type type,const char *data,struct nft_parse_err *err); +int nft_set_elem_parse_file (struct nft_set_elem *e,enum nft_parse_type type, +FILE *fp,struct nft_parse_err *err);int nft_set_elem_snprintf (char *buf,size_t size,struct nft_set_elem *s,uint32_t type,uint32_t flags);int nft_set_elem_fprintf (FILE *fp,struct nft_set_elem *se,uint32_t type,uint32_t flags);
include/libnftables/table.h +2 -0
@@ -41,6 +41,8 @@ void nft_table_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_tableint nft_table_parse (struct nft_table *t,enum nft_parse_type type,const char *data,struct nft_parse_err *err); +int nft_table_parse_file (struct nft_table *t,enum nft_parse_type type, +FILE *fp,struct nft_parse_err *err);int nft_table_snprintf (char *buf,size_t size,struct nft_table *t,uint32_t type,uint32_t flags);int nft_table_fprintf (FILE *fp,struct nft_table *t,uint32_t type,uint32_t flags);
src/chain.c +7 -0
@@ -758,6 +758,13 @@ int nft_chain_parse(struct nft_chain *c, enum nft_parse_type type, }EXPORT_SYMBOL (nft_chain_parse); +int nft_chain_parse_file (struct nft_chain *c,enum nft_parse_type type, +FILE *fp,struct nft_parse_err *err) +{ +return nft_chain_do_parse (c, type, fp, err,NFT_PARSE_FILE ); +} +EXPORT_SYMBOL (nft_chain_parse_file); +static int nft_chain_snprintf_json (char *buf,size_t size,struct nft_chain *c) {int ret, len = size, offset =0 ;
src/internal.h +1 -0
@@ -40,6 +40,7 @@ struct nft_parse_err {enum {NFT_PARSE_BUFFER , +NFT_PARSE_FILE , };#ifdef XML_PARSING
src/jansson.c +3 -0
@@ -98,6 +98,9 @@ json_t *nft_jansson_create_root(const void *json, json_error_t *error,case NFT_PARSE_BUFFER : root =json_loadb (json,strlen (json),0 , error);break ; +case NFT_PARSE_FILE : + root =json_loadf ((FILE *)json,0 , error); +break ;default : goto err; }
src/libnftables.map +6 -0
@@ -13,6 +13,7 @@ global: nft_table_attr_get_u32; nft_table_attr_get_str; nft_table_parse; + nft_table_parse_file; nft_table_snprintf; nft_table_fprintf; nft_table_nlmsg_build_payload;
@@ -45,6 +46,7 @@ global: nft_chain_attr_get_u64; nft_chain_attr_get_str; nft_chain_parse; + nft_chain_parse_file; nft_chain_snprintf; nft_chain_fprintf; nft_chain_nlmsg_build_payload;
@@ -74,6 +76,7 @@ global: nft_rule_attr_get_u64; nft_rule_attr_get_str; nft_rule_parse; + nft_rule_parse_file; nft_rule_snprintf; nft_rule_fprintf; nft_rule_nlmsg_build_payload;
@@ -128,6 +131,7 @@ global: nft_set_nlmsg_build_payload; nft_set_nlmsg_parse; nft_set_parse; + nft_set_parse_file; nft_set_snprintf; nft_set_fprintf;
@@ -159,6 +163,7 @@ global: nft_set_elem_nlmsg_build_payload; nft_set_elem_nlmsg_parse; nft_set_elem_parse; + nft_set_elem_parse_file; nft_set_elem_snprintf; nft_set_elem_fprinf;
@@ -179,6 +184,7 @@ global: nft_ruleset_attr_set; nft_ruleset_attr_get; nft_ruleset_parse; + nft_ruleset_parse_file; nft_ruleset_snprintf; nft_ruleset_fprintf;
src/mxml.c +3 -0
@@ -31,6 +31,9 @@ mxml_node_t *nft_mxml_build_tree(const void *data, const char *treename,case NFT_PARSE_BUFFER : tree =mxmlLoadString (NULL , data,MXML_OPAQUE_CALLBACK );break ; +case NFT_PARSE_FILE : + tree =mxmlLoadFile (NULL , (FILE *)data,MXML_OPAQUE_CALLBACK ); +break ;default : goto err; }
src/rule.c +7 -0
@@ -676,6 +676,13 @@ int nft_rule_parse(struct nft_rule *r, enum nft_parse_type type, }EXPORT_SYMBOL (nft_rule_parse); +int nft_rule_parse_file (struct nft_rule *r,enum nft_parse_type type, +FILE *fp,struct nft_parse_err *err) +{ +return nft_rule_do_parse (r, type, fp, err,NFT_PARSE_FILE ); +} +EXPORT_SYMBOL (nft_rule_parse_file); +static int nft_rule_snprintf_json (char *buf,size_t size,struct nft_rule *r,uint32_t type,uint32_t flags) {
src/ruleset.c +7 -0
@@ -597,6 +597,13 @@ int nft_ruleset_parse(struct nft_ruleset *r, enum nft_parse_type type, }EXPORT_SYMBOL (nft_ruleset_parse); +int nft_ruleset_parse_file (struct nft_ruleset *rs,enum nft_parse_type type, +FILE *fp,struct nft_parse_err *err) +{ +return nft_ruleset_do_parse (rs, type, fp, err,NFT_PARSE_FILE ); +} +EXPORT_SYMBOL (nft_ruleset_parse_file); +static const char *nft_ruleset_o_opentag (uint32_t type) {switch (type) {
src/set.c +7 -0
@@ -533,6 +533,13 @@ int nft_set_parse(struct nft_set *s, enum nft_parse_type type, }EXPORT_SYMBOL (nft_set_parse); +int nft_set_parse_file (struct nft_set *s,enum nft_parse_type type, +FILE *fp,struct nft_parse_err *err) +{ +return nft_set_do_parse (s, type, fp, err,NFT_PARSE_FILE ); +} +EXPORT_SYMBOL (nft_set_parse_file); +static int nft_set_snprintf_json (char *buf,size_t size,struct nft_set *s,uint32_t type,uint32_t flags) {
src/set_elem.c +7 -0
@@ -461,6 +461,13 @@ int nft_set_elem_parse(struct nft_set_elem *e, enum nft_parse_type type, }EXPORT_SYMBOL (nft_set_elem_parse); +int nft_set_elem_parse_file (struct nft_set_elem *e,enum nft_parse_type type, +FILE *fp,struct nft_parse_err *err) +{ +return nft_set_elem_do_parse (e, type, fp, err,NFT_PARSE_FILE ); +} +EXPORT_SYMBOL (nft_set_elem_parse_file); +static int nft_set_elem_snprintf_json (char *buf,size_t size,struct nft_set_elem *e,uint32_t flags) {
src/table.c +7 -0
@@ -353,6 +353,13 @@ int nft_table_parse(struct nft_table *t, enum nft_parse_type type, }EXPORT_SYMBOL (nft_table_parse); +int nft_table_parse_file (struct nft_table *t,enum nft_parse_type type, +FILE *fp,struct nft_parse_err *err) +{ +return nft_table_do_parse (t, type, fp, err,NFT_PARSE_FILE ); +} +EXPORT_SYMBOL (nft_table_parse_file); +static int nft_table_snprintf_json (char *buf,size_t size,struct nft_table *t) { return snprintf(buf, size,
PATCH 3/3 tests: update tests with nft_*_parse_file()
In reply to Arturo Borrero GonzalezLets do testing with nft_ruleset_parse_file() functions.
For this to work, all testfiles are enclosed in the corresponding format top element:
* XML: <nftables>*</nftables>
* JSON: {"nftables":[*]}
--- 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 | 1 tests/nft-parsing-test.c | 200 +++++--------------------------- 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 112 files changed, 144 insertions(+), 277 deletions(-)
tests/jsonfiles/01-table.json +1 -1
@@ -1 +1 @@ -{"table":{"name":"filter","family":"ip","flags":0}} +{"nftables":[{"table":{"name":"filter","family":"ip","flags":0}}]}
tests/jsonfiles/02-table.json +1 -1
@@ -1 +1 @@ -{"table":{"name":"filter2","family":"ip6","flags":0}} +{"nftables":[{"table":{"name":"filter2","family":"ip6","flags":0}}]}
tests/jsonfiles/11-chain.json +1 -1
@@ -1 +1 @@ -{"chain":{"name":"input","handle":1,"bytes":1375696,"packets":4136,"family":"ip","table":"filter","use":0,"type":"filter","hooknum":"input","prio":0,"policy":"accept"}} +{"nftables":[{"chain":{"name":"input","handle":1,"bytes":1375696,"packets":4136,"family":"ip","table":"filter","use":0,"type":"filter","hooknum":"input","prio":0,"policy":"accept"}}]}
tests/jsonfiles/12-chain.json +1 -1
@@ -1 +1 @@ -{"chain":{"name":"forward","handle":2,"bytes":0,"packets":0,"family":"ip","table":"filter","use":0,"type":"filter","hooknum":"forward","prio":0,"policy":"accept"}} +{"nftables":[{"chain":{"name":"forward","handle":2,"bytes":0,"packets":0,"family":"ip","table":"filter","use":0,"type":"filter","hooknum":"forward","prio":0,"policy":"accept"}}]}
tests/jsonfiles/13-chain.json +1 -1
@@ -1 +1 @@ -{"chain":{"name":"output","handle":3,"bytes":454786,"packets":2681,"family":"ip","table":"filter","use":0,"type":"filter","hooknum":"output","prio":0,"policy":"accept"}} +{"nftables":[{"chain":{"name":"output","handle":3,"bytes":454786,"packets":2681,"family":"ip","table":"filter","use":0,"type":"filter","hooknum":"output","prio":0,"policy":"accept"}}]}
tests/jsonfiles/14-chain.json +1 -1
@@ -1 +1 @@ -{"chain":{"name":"chain1","handle":4,"bytes":0,"packets":0,"family":"ip","table":"filter","use":0}} +{"nftables":[{"chain":{"name":"chain1","handle":4,"bytes":0,"packets":0,"family":"ip","table":"filter","use":0}}]}
tests/jsonfiles/20-rule-bitwise.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"input","handle":20,"expr":[{"type":"bitwise","sreg":1,"dreg":1,"len":4,"mask":{"data_reg":{"type":"value","len":4,"data0":"0x0000000a"}},"xor":{"data_reg":{"type":"value","len":4,"data0":"0x00000000"}}}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":20,"expr":[{"type":"bitwise","sreg":1,"dreg":1,"len":4,"mask":{"data_reg":{"type":"value","len":4,"data0":"0x0000000a"}},"xor":{"data_reg":{"type":"value","len":4,"data0":"0x00000000"}}}]}}]}
tests/jsonfiles/21-rule-byteorder.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"input","handle":21,"expr":[{"type":"byteorder","sreg":3,"dreg":4,"op":"hton","len":4,"size":4}]}} +{"nftables":[{"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 @@ -{"rule":{"family":"ip","table":"filter","chain":"forward","handle":22,"expr":[{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":16,"data0":"0x00000000","data1":"0x6e6f6200","data2":"0x2e303164","data3":"0x00393331"}}}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"forward","handle":22,"expr":[{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":16,"data0":"0x00000000","data1":"0x6e6f6200","data2":"0x2e303164","data3":"0x00393331"}}}]}}]}
tests/jsonfiles/23-rule-counter.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"output","handle":23,"expr":[{"type":"counter","pkts":135,"bytes":21655}]}} +{"nftables":[{"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 @@ -{"rule":{"family":"ip","table":"filter","chain":"input","handle":24,"expr":[{"type":"ct","dreg":1,"key":"state"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x00000008"}}}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":24,"expr":[{"type":"ct","dreg":1,"key":"state"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x00000008"}}}]}}]}
tests/jsonfiles/25-rule-exthdr.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"input","handle":25,"expr":[{"type":"exthdr","dreg":1,"exthdr_type":"mh","offset":2,"len":16}]}} +{"nftables":[{"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 @@ -{"rule":{"family":"ip","table":"filter","chain":"input","handle":26,"expr":[{"type":"immediate","dreg":0,"immediatedata":{"data_reg":{"type":"verdict","verdict":"accept"}}}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"input","handle":26,"expr":[{"type":"immediate","dreg":0,"immediatedata":{"data_reg":{"type":"verdict","verdict":"accept"}}}]}}]}
tests/jsonfiles/27-rule-limit.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"input","handle":27,"expr":[{"type":"limit","rate":321321,"unit":0}]}} +{"nftables":[{"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 @@ -{"rule":{"family":"ip","table":"filter","chain":"input","handle":28,"expr":[{"type":"log","prefix":"test_chain","group":1,"snaplen":0,"qthreshold":0}]}} +{"nftables":[{"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 @@ -{"rule":{"family":"ip","table":"filter","chain":"input","handle":9,"expr":[{"type":"match","name":"state"},{"type":"counter","pkts":0,"bytes":0}]}} +{"nftables":[{"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 @@ -{"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":[{"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 @@ -{"rule":{"family":"ip","table":"filter","chain":"output","handle":8,"expr":[{"type":"meta","dreg":1,"key":"protocol"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":8,"expr":[{"type":"meta","dreg":1,"key":"protocol"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}
tests/jsonfiles/32-rule-nat4.json +1 -1
@@ -1 +1 @@ -{"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":[{"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 @@ -{"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}]}} +{"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}]}}]}
tests/jsonfiles/34-rule-payload.json +1 -1
@@ -1 +1 @@ -{"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","cmpdata":{"data_reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":2,"len":2,"base":"transport"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":2,"data0":"0x00001600"}}},{"type":"immediate","dreg":0,"immediatedata":{"data_reg":{"type":"verdict","verdict":"accept"}}}]}} +{"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","cmpdata":{"data_reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":2,"len":2,"base":"transport"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":2,"data0":"0x00001600"}}},{"type":"immediate","dreg":0,"immediatedata":{"data_reg":{"type":"verdict","verdict":"accept"}}}]}}]}
tests/jsonfiles/35-rule-target.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"INPUT","handle":20,"expr":[{"type":"counter","pkts":17,"bytes":4436},{"type":"target","name":"LOG"}]}} +{"nftables":[{"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 @@ -{"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","cmpdata":{"data_reg":{"type":"value","len":8,"data0":"0x0100a8c0","data1":"0x6400a8c0"}}},{"type":"counter","pkts":0,"bytes":0}]}} +{"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","cmpdata":{"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 @@ -{"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","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}}]}} +{"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","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}}]}}]}
tests/jsonfiles/38-rule-real.json +1 -1
@@ -1 +1 @@ -{"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","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}}]}} +{"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","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}}]}}]}
tests/jsonfiles/39-rule-real.json +1 -1
@@ -1 +1 @@ -{"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","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"cmp","sreg":1,"op":"lte","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0xfa00a8c0"}}}]}} +{"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","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"cmp","sreg":1,"op":"lte","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0xfa00a8c0"}}}]}}]}
tests/jsonfiles/40-rule-real.json +1 -1
@@ -1 +1 @@ -{"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","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0}]}} +{"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","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}
tests/jsonfiles/41-rule-real.json +1 -1
@@ -1 +1 @@ -{"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","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0},{"type":"immediate","dreg":0,"immediatedata":{"data_reg":{"type":"verdict","verdict":"drop"}}}]}} +{"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","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0},{"type":"immediate","dreg":0,"immediatedata":{"data_reg":{"type":"verdict","verdict":"drop"}}}]}}]}
tests/jsonfiles/42-rule-real.json +1 -1
@@ -1 +1 @@ -{"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","cmpdata":{"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":[{"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","cmpdata":{"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 @@ -{"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","cmpdata":{"data_reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":2,"len":2,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":2,"data0":"0x00001600"}}},{"type":"counter","pkts":0,"bytes":0}]}} +{"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","cmpdata":{"data_reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":2,"len":2,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":2,"data0":"0x00001600"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}
tests/jsonfiles/44-rule-real.json +1 -1
@@ -1 +1 @@ -{"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","cmpdata":{"data_reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":0,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x16000004"}}},{"type":"counter","pkts":0,"bytes":0}]}} +{"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","cmpdata":{"data_reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":0,"len":4,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x16000004"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}
tests/jsonfiles/45-rule-real.json +1 -1
@@ -1 +1 @@ -{"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","cmpdata":{"data_reg":{"type":"value","len":8,"data0":"0x0100a8c0","data1":"0x6400a8c0"}}},{"type":"counter","pkts":0,"bytes":0}]}} +{"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","cmpdata":{"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 @@ -{"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","cmpdata":{"data_reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":0,"len":8,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":8,"data0":"0x16000004","data1":"0x00000000"}}}]}} +{"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","cmpdata":{"data_reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":0,"len":8,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":8,"data0":"0x16000004","data1":"0x00000000"}}}]}}]}
tests/jsonfiles/47-rule-real.json +1 -1
@@ -1 +1 @@ -{"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","cmpdata":{"data_reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":0,"len":8,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":8,"data0":"0x16000004","data1":"0x00000000"}}}]}} +{"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","cmpdata":{"data_reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":0,"len":8,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":8,"data0":"0x16000004","data1":"0x00000000"}}}]}}]}
tests/jsonfiles/48-rule-real.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"output","handle":48,"expr":[{"type":"meta","dreg":1,"key":"len"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":48,"expr":[{"type":"meta","dreg":1,"key":"len"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}
tests/jsonfiles/49-rule-real.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"output","handle":49,"expr":[{"type":"meta","dreg":1,"key":"mark"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x00000000"}}},{"type":"counter","pkts":55,"bytes":11407}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":49,"expr":[{"type":"meta","dreg":1,"key":"mark"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x00000000"}}},{"type":"counter","pkts":55,"bytes":11407}]}}]}
tests/jsonfiles/50-rule-real.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"output","handle":50,"expr":[{"type":"meta","dreg":1,"key":"iif"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x00000001"}}},{"type":"counter","pkts":0,"bytes":0}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":50,"expr":[{"type":"meta","dreg":1,"key":"iif"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x00000001"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}
tests/jsonfiles/51-rule-real.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"output","handle":51,"expr":[{"type":"meta","dreg":1,"key":"iifname"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":16,"data0":"0x00000000","data1":"0x00000000","data2":"0x65000000","data3":"0x00306874"}}},{"type":"counter","pkts":0,"bytes":0}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":51,"expr":[{"type":"meta","dreg":1,"key":"iifname"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"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 @@ -{"rule":{"family":"ip","table":"filter","chain":"output","handle":52,"expr":[{"type":"meta","dreg":1,"key":"oif"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x00000001"}}},{"type":"counter","pkts":0,"bytes":0}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":52,"expr":[{"type":"meta","dreg":1,"key":"oif"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x00000001"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}
tests/jsonfiles/53-rule-real.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"output","handle":53,"expr":[{"type":"meta","dreg":1,"key":"oifname"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":16,"data0":"0x00000000","data1":"0x00000000","data2":"0x65000000","data3":"0x00306874"}}},{"type":"counter","pkts":0,"bytes":0}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":53,"expr":[{"type":"meta","dreg":1,"key":"oifname"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"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 @@ -{"rule":{"family":"ip","table":"filter","chain":"output","handle":54,"expr":[{"type":"meta","dreg":1,"key":"skuid"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":54,"expr":[{"type":"meta","dreg":1,"key":"skuid"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}
tests/jsonfiles/55-rule-real.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"output","handle":55,"expr":[{"type":"meta","dreg":1,"key":"skgid"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":55,"expr":[{"type":"meta","dreg":1,"key":"skgid"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}
tests/jsonfiles/56-rule-real.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"output","handle":56,"expr":[{"type":"meta","dreg":1,"key":"secmark"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x00000000"}}},{"type":"counter","pkts":55,"bytes":11407}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":56,"expr":[{"type":"meta","dreg":1,"key":"secmark"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x00000000"}}},{"type":"counter","pkts":55,"bytes":11407}]}}]}
tests/jsonfiles/57-rule-real.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"output","handle":57,"expr":[{"type":"meta","dreg":1,"key":"len"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":57,"expr":[{"type":"meta","dreg":1,"key":"len"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}
tests/jsonfiles/58-rule-real.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"output","handle":58,"expr":[{"type":"meta","dreg":1,"key":"protocol"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":2,"data0":"0x00000008"}}},{"type":"counter","pkts":55,"bytes":11407}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":58,"expr":[{"type":"meta","dreg":1,"key":"protocol"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":2,"data0":"0x00000008"}}},{"type":"counter","pkts":55,"bytes":11407}]}}]}
tests/jsonfiles/59-rule-real.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"output","handle":59,"expr":[{"type":"meta","dreg":1,"key":"mark"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x00000000"}}},{"type":"counter","pkts":55,"bytes":11407}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":59,"expr":[{"type":"meta","dreg":1,"key":"mark"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x00000000"}}},{"type":"counter","pkts":55,"bytes":11407}]}}]}
tests/jsonfiles/60-rule-real.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"output","handle":60,"expr":[{"type":"meta","dreg":1,"key":"iif"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x00000001"}}},{"type":"counter","pkts":0,"bytes":0}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":60,"expr":[{"type":"meta","dreg":1,"key":"iif"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x00000001"}}},{"type":"counter","pkts":0,"bytes":0}]}}]}
tests/jsonfiles/61-rule-real.json +1 -1
@@ -1 +1 @@ -{"rule":{"family":"ip","table":"filter","chain":"output","handle":61,"expr":[{"type":"meta","dreg":1,"key":"iifname"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":16,"data0":"0x00000000","data1":"0x00000000","data2":"0x65000000","data3":"0x00306874"}}},{"type":"counter","pkts":0,"bytes":0}]}} +{"nftables":[{"rule":{"family":"ip","table":"filter","chain":"output","handle":61,"expr":[{"type":"meta","dreg":1,"key":"iifname"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"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 @@ -{"set":{"name":"set0","table":"filter","flags":3,"family":"ip","key_type":12,"key_len":2,"set_elem":[{"flags":0,"key":{"data_reg":{"type":"value","len":2,"data0":"0x00001700"}}},{"flags":0,"key":{"data_reg":{"type":"value","len":2,"data0":"0x00001600"}}}]}} +{"nftables":[{"set":{"name":"set0","table":"filter","flags":3,"family":"ip","key_type":12,"key_len":2,"set_elem":[{"flags":0,"key":{"data_reg":{"type":"value","len":2,"data0":"0x00001700"}}},{"flags":0,"key":{"data_reg":{"type":"value","len":2,"data0":"0x00001600"}}}]}}]}
tests/jsonfiles/63-set.json +1 -1
@@ -1 +1 @@ -{"set":{"name":"map0","table":"filter","flags":11,"family":"ip","key_type":12,"key_len":2,"data_type":4294967040,"data_len":16,"set_elem":[{"flags":0,"key":{"data_reg":{"type":"value","len":2,"data0":"0x00001700"}},"data":{"data_reg":{"type":"chain","chain":"forward"}}},{"flags":0,"key":{"data_reg":{"type":"value","len":2,"data0":"0x00001600"}},"data":{"data_reg":{"type":"chain","chain":"chain1"}}}]}} +{"nftables":[{"set":{"name":"map0","table":"filter","flags":11,"family":"ip","key_type":12,"key_len":2,"data_type":4294967040,"data_len":16,"set_elem":[{"flags":0,"key":{"data_reg":{"type":"value","len":2,"data0":"0x00001700"}},"data":{"data_reg":{"type":"chain","chain":"forward"}}},{"flags":0,"key":{"data_reg":{"type":"value","len":2,"data0":"0x00001600"}},"data":{"data_reg":{"type":"chain","chain":"chain1"}}}]}}]}
tests/jsonfiles/64-ruleset.json +0 -0
@@ -1,2 +1 @@ {"nftables":[{"table":{"name":"filter","family":"ip","flags":0}},{"table":{"name":"filter2","family":"ip6","flags":0}},{"chain":{"name":"input","handle":1,"bytes":10681449,"packets":16216,"family":"ip","table":"filter","use":0,"type":"filter","hooknum":"input","prio":0,"policy":"accept"}},{"chain":{"name":"forward","handle":2,"bytes":0,"packets":0,"family":"ip","table":"filter","use":0,"type":"filter","hooknum":"forward","prio":0,"policy":"accept"}},{"chain":{"name":"output","handle":3,"bytes":2375830,"packets":15184,"family":"ip","table":"filter","use":0,"type":"filter","hooknum":"output","prio":0,"policy":"accept"}},{"chain":{"name":"chain1","handle":4,"bytes":0,"packets":0,"family":"ip","table":"filter","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"," cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0},{"type":"immediate","dreg":0,"immediatedata":{"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","cmpdata":{"data_reg":{"type":"value","len":1,"data0":"0x00000006"}}},{"type":"payload","dreg":1,"offset":2,"len":2,"base":"link"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":2,"data0":"0x00001600"}}},{"type":"counter","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":"c mp","sreg":1,"op":"eq","cmpdata":{"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","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x0100a8c0"}}},{"type":"counter","pkts":0,"bytes":0},{"type":"immediate","dreg":0,"immediatedata":{"data_reg":{"type":"verdict","verdict":"drop"}}}]}}]}
-
tests/nft-parsing-test.c +34 -166
275 lines not on this page · raw message
tests/xmlfiles/01-table.xml +1 -1
@@ -1 +1 @@ -<table><name>filter</name><family>ip</family><flags>0</flags></table> +<nftables><table><name>filter</name><family>ip</family><flags>0</flags></table></nftables>
tests/xmlfiles/02-table.xml +1 -1
@@ -1 +1 @@ -<table><name>nat</name><family>ip6</family><flags>0</flags></table> +<nftables><table><name>nat</name><family>ip6</family><flags>0</flags></table></nftables>
tests/xmlfiles/10-chain.xml +1 -1
@@ -1 +1 @@ -<chain><name>test</name><handle>0</handle><bytes>0</bytes><packets>0</packets><table>filter</table><type>filter</type><hooknum>input</hooknum><prio>0</prio><policy>accept</policy><family>ip</family></chain> +<nftables><chain><name>test</name><handle>0</handle><bytes>0</bytes><packets>0</packets><table>filter</table><type>filter</type><hooknum>input</hooknum><prio>0</prio><policy>accept</policy><family>ip</family></chain></nftables>
tests/xmlfiles/11-chain.xml +1 -1
@@ -1 +1 @@ -<chain><name>test</name><handle>0</handle><bytes>59</bytes><packets>1</packets><table>filter</table><type>filter</type><hooknum>forward</hooknum><prio>0</prio><policy>drop</policy><family>ip6</family></chain> +<nftables><chain><name>test</name><handle>0</handle><bytes>59</bytes><packets>1</packets><table>filter</table><type>filter</type><hooknum>forward</hooknum><prio>0</prio><policy>drop</policy><family>ip6</family></chain></nftables>
tests/xmlfiles/12-chain.xml +1 -1
@@ -1 +1 @@ -<chain><name>foo</name><handle>100</handle><bytes>59264154979</bytes><packets>2548796325</packets><table>nat</table><type>nat</type><hooknum>postrouting</hooknum><prio>0</prio><policy>accept</policy><family>ip</family></chain> +<nftables><chain><name>foo</name><handle>100</handle><bytes>59264154979</bytes><packets>2548796325</packets><table>nat</table><type>nat</type><hooknum>postrouting</hooknum><prio>0</prio><policy>accept</policy><family>ip</family></chain></nftables>
tests/xmlfiles/20-rule-bitwise.xml +1 -1
@@ -1,2 +1,2 @@ -<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><data_reg type="value"><len>4</len><data0>0x0000000a</data0></data_reg></mask><xor><data_reg type="value"><len>4</len><data0>0x00000000</data0></data_reg></xor></expr></rule> +<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><data_reg type="value"><len>4</len><data0>0x0000000a</data0></data_reg></mask><xor><data_reg type="value"><len>4</len><data0>0x00000000</data0></data_reg></xor></expr></rule></nftables> <!-- nft add rule filter input ct state new,established accept -->
tests/xmlfiles/21-rule-byteorder.xml +1 -1
@@ -1 +1 @@ -<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><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>
tests/xmlfiles/22-rule-cmp.xml +1 -1
@@ -1,2 +1,2 @@ -<rule><family>ip6</family><table>filter</table><chain>test</chain><handle>36</handle><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x6e6f6200</data1><data2>0x2e303164</data2><data3>0x00393331</data3></data_reg></cmpdata></expr></rule> +<nftables><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>36</handle><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x6e6f6200</data1><data2>0x2e303164</data2><data3>0x00393331</data3></data_reg></cmpdata></expr></rule></nftables> <!-- nft add rule ip6 filter test meta iifname bond10.139 accept -->
tests/xmlfiles/23-rule-counter.xml +1 -1
@@ -1,2 +1,2 @@ -<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><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> <!-- nft add rule ip6 filter test udp dport 53 counter accept -->
tests/xmlfiles/24-rule-ct.xml +1 -1
@@ -1,2 +1,2 @@ -<rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="ct"><dreg>1</dreg><key>state</key><dir>0</dir></expr></rule> +<nftables><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="ct"><dreg>1</dreg><key>state</key><dir>0</dir></expr></rule></nftables> <!-- nft add rule filter input ct state new,established accept -->
tests/xmlfiles/25-rule-exthdr.xml +1 -1
@@ -1 +1 @@ -<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><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>
tests/xmlfiles/26-rule-immediate.xml +1 -1
@@ -1,2 +1,2 @@ -<rule><family>ip</family><table>filter</table><chain>input</chain><handle>32</handle><expr type="immediate"><dreg>0</dreg><immediatedata><data_reg type="verdict"><verdict>accept</verdict></data_reg></immediatedata></expr></rule> +<nftables><rule><family>ip</family><table>filter</table><chain>input</chain><handle>32</handle><expr type="immediate"><dreg>0</dreg><immediatedata><data_reg type="verdict"><verdict>accept</verdict></data_reg></immediatedata></expr></rule></nftables> <!-- nft add rule filter input ct state new,established accept -->
tests/xmlfiles/27-rule-limit.xml +1 -1
@@ -1 +1 @@ -<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><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>
tests/xmlfiles/28-rule-log.xml +1 -1
@@ -1,2 +1,2 @@ -<rule><family>ip6</family><table>filter</table><chain>test</chain><handle>96</handle><expr type="log"><prefix>test_chain</prefix><group>1</group><snaplen>0</snaplen><qthreshold>0</qthreshold></expr></rule> +<nftables><rule><family>ip6</family><table>filter</table><chain>test</chain><handle>96</handle><expr type="log"><prefix>test_chain</prefix><group>1</group><snaplen>0</snaplen><qthreshold>0</qthreshold></expr></rule></nftables> <!-- nft add rule ip6 filter test log prefix test_chain group 1 -->
tests/xmlfiles/29-rule-lookup.xml +1 -1
@@ -1,2 +1,2 @@ -<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><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> <!-- nft add rule ip6 filter test ip6 saddr { ::2 , ::3 } drop -->
tests/xmlfiles/30-rule-match.xml +1 -1
@@ -1 +1 @@ -<rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="match"><name>state</name></expr></rule> +<nftables><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="match"><name>state</name></expr></rule></nftables>
tests/xmlfiles/31-rule-meta.xml +1 -1
@@ -1,2 +1,2 @@ -<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><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> <!-- nft add rule ip6 filter test meta iifname bond10.139 accept -->
tests/xmlfiles/32-rule-nat6.xml +1 -1
@@ -1 +1 @@ -<rule><family>ip6</family><table>nat</table><chain>OUTPUT</chain><handle>100</handle><expr type="nat"><type>snat</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><rule><family>ip6</family><table>nat</table><chain>OUTPUT</chain><handle>100</handle><expr type="nat"><type>snat</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>
tests/xmlfiles/33-rule-nat4.xml +1 -1
@@ -1 +1 @@ -<rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="nat"><type>dnat</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></expr></rule> +<nftables><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="nat"><type>dnat</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></expr></rule></nftables>
tests/xmlfiles/34-rule-payload.xml +1 -1
@@ -1,2 +1,2 @@ -<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><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> <!-- nft add rule ip6 filter test tcp dport 22 accept -->
tests/xmlfiles/35-rule-target.xml +1 -1
@@ -1 +1 @@ -<rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="target"><name>LOG</name></expr></rule> +<nftables><rule><family>ip</family><table>filter</table><chain>INPUT</chain><handle>100</handle><expr type="target"><name>LOG</name></expr></rule></nftables>
tests/xmlfiles/36-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>8</len><data0>0x0100a8c0</data0><data1>0x6400a8c0</data1></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule> +<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><cmpdata><data_reg type="value"><len>8</len><data0>0x0100a8c0</data0><data1>0x6400a8c0</data1></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> <!-- nft add rule filter INPUT ip saddr 192.168.0.1 ip daddr 192.168.0.100 counter -->
tests/xmlfiles/37-rule-real.xml +0 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x00000000</data1><data2>0x65000000</data2><data3>0x00306874</data3></data_reg></cmpdata></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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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><cmpdata><data_reg type="value"><len>2</len><data0>0x00001600</data0></data _reg></cmpdata></expr><expr type="ct"><dreg>1</dreg><key>state</key><dir>0</dir></expr><expr type="bitwise"><sreg>1</sreg><dreg>1</dreg><len>4</len><mask><data_reg type="value"><len>4</len><
data0>0x0000000a</data0></data_reg></mask><xor><data_reg type="value"><len>4</len><data0>0x00000000</data0></data_reg></xor></expr><expr type="cmp"><sreg>1</sreg><op>neq</op><cmpdata><data_reg type="value"><len>4</len><data0>0x00000000</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="log"><prefix>testprefix</prefix><group>1</group><snaplen>0</snaplen><qthreshold>0</qthreshold></expr></rule>
+<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><cmpdata><data_reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x00000000</data1><data2>0x65000000</data2><data3>0x00306874</data3></data_reg></cmpdata></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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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><cmpdata><data_reg type="value"><len>2</len><data0>0x00001600</da
ta0></data_reg></cmpdata></expr><expr type="ct"><dreg>1</dreg><key>state</key><dir>0</dir></expr><expr type="bitwise"><sreg>1</sreg><dreg>1</dreg><len>4</len><mask><data_reg type="value"><le
n>4</len><data0>0x0000000a</data0></data_reg></mask><xor><data_reg type="value"><len>4</len><data0>0x00000000</data0></data_reg></xor></expr><expr type="cmp"><sreg>1</sreg><op>neq</op><cmpdata><data_reg type="value"><len>4</len><data0>0x00000000</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="log"><prefix>testprefix</prefix><group>1</group><snaplen>0</snaplen><qthreshold>0</qthreshold></expr></rule></nftables>
<!-- nft add rule filter INPUT meta iifname "eth0" tcp dport 22 ct state new,established counter log prefix testprefix group 1 -->
tests/xmlfiles/38-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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><cmpdata><data_reg type="value"><len>2</len><data0>0x0000bb01</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="immediate"><dreg> 0</dreg><immediatedata><data_reg type="verdict"><verdict>accept</verdict></data_reg></immediatedata></expr></rule> +<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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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><cmpdata><data_reg type="value"><len>2</len><data0>0x0000bb01</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="immedia
te"><dreg>0</dreg><immediatedata><data_reg type="verdict"><verdict>accept</verdict></data_reg></immediatedata></expr></rule></nftables> <!-- nft add rule ip filter INPUT ip daddr { 192.168.0.1, 192.168.0.2, 192.168.0.3 } tcp dport 443 counter accept -->
tests/xmlfiles/39-rule-real.xml +0 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x00000000</data1><data2>0x6f620000</data2><data3>0x0030646e</data3></data_reg></cmpdata></expr><expr type="meta"><dreg>1</dreg><key>oifname</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x62000000</data1><data2>0x31646e6f</data2><data3>0x0037322e</data3></data_reg></cmpdata></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><cmpdata><data_reg type="value"><le n>16</len><data0>0xc09a002a</data0><data1>0x2700cac1</data1><data2>0x00000000</data2><data3>0x50010000</data3></data_reg></cmpdata></expr><expr type="payload"><dreg>1</dreg><offset>6</offset
Quoted 1 line
<len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>1</len><data0>0x00000011</data0></data_reg></cmpdata></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><cmpdata><data_reg type="value"><len>2</len><data0>0x00003500</data0></data_reg></cmpdata></expr><expr type="ct"><dreg>1</dreg><key>status</key><dir>0</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>4</len><data0>0x00000001</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="log"><prefix>dns_drop</prefix><group>2</group><snaplen>0</snaplen><qthreshold>0</qthreshold></expr><expr type="i
mmediate"><dreg>0</dreg><immediatedata><data_reg type="verdict"><verdict>drop</verdict></data_reg></immediatedata></expr></rule>
+<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><cmpdata><data_reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x00000000</data1><data2>0x6f620000</data2><data3>0x0030646e</data3></data_reg></cmpdata></expr><expr type="meta"><dreg>1</dreg><key>oifname</key></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x62000000</data1><data2>0x31646e6f</data2><data3>0x0037322e</data3></data_reg></cmpdata></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><cmpdata><data_reg type="
value"><len>16</len><data0>0xc09a002a</data0><data1>0x2700cac1</data1><data2>0x00000000</data2><data3>0x50010000</data3></data_reg></cmpdata></expr><expr type="payload"><dreg>1</dreg><offset
Quoted 1 line
6</offset><len>1</len><base>network</base></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>1</len><data0>0x00000011</data0></data_reg></cmpdata></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><cmpdata><data_reg type="value"><len>2</len><data0>0x00003500</data0></data_reg></cmpdata></expr><expr type="ct"><dreg>1</dreg><key>status</key><dir>0</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>4</len><data0>0x00000001</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="log"><prefix>dns_drop</prefix><group>2</group><snaplen>0</snaplen><qthreshold>0</qthreshold></expr><ex
pr type="immediate"><dreg>0</dreg><immediatedata><data_reg type="verdict"><verdict>drop</verdict></data_reg></immediatedata></expr></rule></nftables>
<!-- nft add rule ip6 filter test meta iifname "bond0" meta oifname "bond1.27" ip6 saddr 2a00:9ac0:c1ca:27::150 udp dport 53 ct status expected counter log prefix dns_drop group 2 drop -->
tests/xmlfiles/40-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>4</len><data0>0x0100a8c0</data0></data_reg></cmpdata></expr></rule> +<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><cmpdata><data_reg type="value"><len>4</len><data0>0x0100a8c0</data0></data_reg></cmpdata></expr></rule></nftables> <!-- nft add rule filter output ip daddr 192.168.0.1 -->
tests/xmlfiles/41-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>4</len><data0>0x0100a8c0</data0></data_reg></cmpdata></expr><expr type="cmp"><sreg>1</sreg><op>lte</op><cmpdata><data_reg type="value"><len>4</len><data0>0xfa00a8c0</data0></data_reg></cmpdata></expr></rule> +<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><cmpdata><data_reg type="value"><len>4</len><data0>0x0100a8c0</data0></data_reg></cmpdata></expr><expr type="cmp"><sreg>1</sreg><op>lte</op><cmpdata><data_reg type="value"><len>4</len><data0>0xfa00a8c0</data0></data_reg></cmpdata></expr></rule></nftables> <!-- nft add rule filter output ip daddr 192.168.0.1-192.168.0.250 -->
tests/xmlfiles/42-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>4</len><data0>0x0100a8c0</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule> +<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><cmpdata><data_reg type="value"><len>4</len><data0>0x0100a8c0</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> <!-- nft add rule filter output ip daddr 192.168.0.1 counter -->
tests/xmlfiles/43-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>4</len><data0>0x0100a8c0</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="immediate"><dreg>0</dreg><immediatedata><data_reg type="verdict"><verdict>drop</verdict></data_reg></immediatedata></expr></rule> +<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><cmpdata><data_reg type="value"><len>4</len><data0>0x0100a8c0</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="immediate"><dreg>0</dreg><immediatedata><data_reg type="verdict"><verdict>drop</verdict></data_reg></immediatedata></expr></rule></nftables> <!-- nft add rule filter output ip daddr 192.168.0.1 counter drop -->
tests/xmlfiles/44-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>4</len><data0>0x0100a8c0</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="log"><prefix>(null)</prefix><group>0</group><snaplen>0</snaplen><qthreshold>0</qthreshold></expr></rule> +<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><cmpdata><data_reg type="value"><len>4</len><data0>0x0100a8c0</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr><expr type="log"><prefix>(null)</prefix><group>0</group><snaplen>0</snaplen><qthreshold>0</qthreshold></expr></rule></nftables> <!-- nft add rule filter output ip daddr 192.168.0.1 counter log -->
tests/xmlfiles/45-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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><cmpdata><data_reg type="value"><len>2</len><data0>0x00001600</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule> +<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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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><cmpdata><data_reg type="value"><len>2</len><data0>0x00001600</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> <!-- nft add rule filter output tcp dport 22 counter -->
tests/xmlfiles/46-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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><cmpdata><data_reg type="value"><len>4</len><data0>0x16000004</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule> +<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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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><cmpdata><data_reg type="value"><len>4</len><data0>0x16000004</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> <!-- nft add rule filter output tcp sport 1024 tcp dport 22 counter -->
tests/xmlfiles/47-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>8</len><data0>0x0100a8c0</data0><data1>0x6400a8c0</data1></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule> +<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><cmpdata><data_reg type="value"><len>8</len><data0>0x0100a8c0</data0><data1>0x6400a8c0</data1></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> <!-- nft add rule filter output ip saddr 192.168.0.1 ip daddr 192.168.0.100 counter -->
tests/xmlfiles/48-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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><cmpdata><data_reg type="value"><len>8</len><data0>0x16000004</data0><data1>0x00000000</data1></data_reg></cmpdata></expr></rule> +<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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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><cmpdata><data_reg type="value"><len>8</len><data0>0x16000004</data0><data1>0x00000000</data1></data_reg></cmpdata></expr></rule></nftables> <!-- nft add rule filter output tcp sequence 0 tcp sport 1024 tcp dport 22 -->
tests/xmlfiles/49-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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><cmpdata><data_reg type="value"><len>8</len><data0>0x16000004</data0><data1>0x00000000</data1></data_reg></cmpdata></expr></rule> +<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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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><cmpdata><data_reg type="value"><len>8</len><data0>0x16000004</data0><data1>0x00000000</data1></data_reg></cmpdata></expr></rule></nftables> <!-- nft add rule filter output tcp sport 1024 tcp dport 22 tcp sequence 0 -->
tests/xmlfiles/50-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<rule><family>ip</family><table>filter</table><chain>output</chain><handle>12</handle><expr type="ct"><dreg>1</dreg><key>state</key><dir>0</dir></expr><expr type="bitwise"><sreg>1</sreg><dreg>1</dreg><len>4</len><mask><data_reg type="value"><len>4</len><data0>0x0000000a</data0></data_reg></mask><xor><data_reg type="value"><len>4</len><data0>0x00000000</data0></data_reg></xor></expr><expr type="cmp"><sreg>1</sreg><op>neq</op><cmpdata><data_reg type="value"><len>4</len><data0>0x00000000</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule> +<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>12</handle><expr type="ct"><dreg>1</dreg><key>state</key><dir>0</dir></expr><expr type="bitwise"><sreg>1</sreg><dreg>1</dreg><len>4</len><mask><data_reg type="value"><len>4</len><data0>0x0000000a</data0></data_reg></mask><xor><data_reg type="value"><len>4</len><data0>0x00000000</data0></data_reg></xor></expr><expr type="cmp"><sreg>1</sreg><op>neq</op><cmpdata><data_reg type="value"><len>4</len><data0>0x00000000</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule></nftables> <!-- nft add rule filter output ct state new,established counter -->
tests/xmlfiles/51-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<rule><family>ip</family><table>filter</table><chain>output</chain><handle>13</handle><expr type="ct"><dreg>1</dreg><key>direction</key><dir>0</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>1</len><data0>0x00000000</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>5</pkts><bytes>160</bytes></expr></rule> +<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>13</handle><expr type="ct"><dreg>1</dreg><key>direction</key><dir>0</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>1</len><data0>0x00000000</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>5</pkts><bytes>160</bytes></expr></rule></nftables> <!-- nft add rule filter output ct direction original counter -->
tests/xmlfiles/52-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<rule><family>ip</family><table>filter</table><chain>output</chain><handle>14</handle><expr type="ct"><dreg>1</dreg><key>direction</key><dir>0</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>1</len><data0>0x00000001</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>50</pkts><bytes>11247</bytes></expr></rule> +<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>14</handle><expr type="ct"><dreg>1</dreg><key>direction</key><dir>0</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>1</len><data0>0x00000001</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>50</pkts><bytes>11247</bytes></expr></rule></nftables> <!-- nft add rule filter output ct direction reply counter -->
tests/xmlfiles/53-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<rule><family>ip</family><table>filter</table><chain>output</chain><handle>15</handle><expr type="ct"><dreg>1</dreg><key>status</key><dir>0</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>4</len><data0>0x00000001</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule> +<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>15</handle><expr type="ct"><dreg>1</dreg><key>status</key><dir>0</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>4</len><data0>0x00000001</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> <!-- nft add rule filter output ct status expected counter -->
tests/xmlfiles/54-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<rule><family>ip</family><table>filter</table><chain>output</chain><handle>16</handle><expr type="ct"><dreg>1</dreg><key>mark</key><dir>0</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>4</len><data0>0x00000064</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule> +<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>16</handle><expr type="ct"><dreg>1</dreg><key>mark</key><dir>0</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>4</len><data0>0x00000064</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> <!-- nft rule add filter output ct mark 100 counter -->
tests/xmlfiles/55-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<rule><family>ip</family><table>filter</table><chain>output</chain><handle>17</handle><expr type="ct"><dreg>1</dreg><key>secmark</key><dir>0</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>4</len><data0>0x00000000</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule> +<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>17</handle><expr type="ct"><dreg>1</dreg><key>secmark</key><dir>0</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>4</len><data0>0x00000000</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule></nftables> <!-- nft add rule filter output ct secmark 0 counter -->
tests/xmlfiles/56-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<rule><family>ip</family><table>filter</table><chain>output</chain><handle>18</handle><expr type="ct"><dreg>1</dreg><key>expiration</key><dir>0</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>4</len><data0>0x0000001e</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule> +<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>18</handle><expr type="ct"><dreg>1</dreg><key>expiration</key><dir>0</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>4</len><data0>0x0000001e</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> <!-- nft add rule filter output ct expiration 30 counter -->
tests/xmlfiles/57-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<rule><family>ip</family><table>filter</table><chain>output</chain><handle>19</handle><expr type="ct"><dreg>1</dreg><key>helper</key><dir>0</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>4</len><data0>0x00707466</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule> +<nftables><rule><family>ip</family><table>filter</table><chain>output</chain><handle>19</handle><expr type="ct"><dreg>1</dreg><key>helper</key><dir>0</dir></expr><expr type="cmp"><sreg>1</sreg><op>eq</op><cmpdata><data_reg type="value"><len>4</len><data0>0x00707466</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> <!-- nft add rule filter output ct helper "ftp" counter -->
tests/xmlfiles/58-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>4</len><data0>0x000003e8</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule> +<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><cmpdata><data_reg type="value"><len>4</len><data0>0x000003e8</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> <!-- nft add rule ip filter output meta length 1000 counter -->
tests/xmlfiles/59-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>2</len><data0>0x00000008</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule> +<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><cmpdata><data_reg type="value"><len>2</len><data0>0x00000008</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule></nftables> <!-- nft add rule ip filter output meta protocol 0x0800 counter -->
tests/xmlfiles/60-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>4</len><data0>0x00000000</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule> +<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><cmpdata><data_reg type="value"><len>4</len><data0>0x00000000</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule></nftables> <!-- nft add rule ip filter output meta mark 0 counter -->
tests/xmlfiles/61-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>4</len><data0>0x00000001</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule> +<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><cmpdata><data_reg type="value"><len>4</len><data0>0x00000001</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> <!-- nft add rule ip filter output meta iif lo counter -->
tests/xmlfiles/62-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x00000000</data1><data2>0x65000000</data2><data3>0x00306874</data3></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule> +<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><cmpdata><data_reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x00000000</data1><data2>0x65000000</data2><data3>0x00306874</data3></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> <!-- nft add rule ip filter output meta iifname "eth0" counter -->
tests/xmlfiles/63-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>4</len><data0>0x00000001</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule> +<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><cmpdata><data_reg type="value"><len>4</len><data0>0x00000001</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> <!-- nft add rule ip filter output meta oif lo counter -->
tests/xmlfiles/64-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x00000000</data1><data2>0x65000000</data2><data3>0x00306874</data3></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule> +<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><cmpdata><data_reg type="value"><len>16</len><data0>0x00000000</data0><data1>0x00000000</data1><data2>0x65000000</data2><data3>0x00306874</data3></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> <!-- nft add rule ip filter output meta oifname "eth0" counter -->
tests/xmlfiles/65-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>4</len><data0>0x000003e8</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule> +<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><cmpdata><data_reg type="value"><len>4</len><data0>0x000003e8</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> <!-- nft add rule ip filter output meta skuid 1000 counter -->
tests/xmlfiles/66-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>4</len><data0>0x000003e8</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule> +<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><cmpdata><data_reg type="value"><len>4</len><data0>0x000003e8</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>0</pkts><bytes>0</bytes></expr></rule></nftables> <!-- nft add rule ip filter output meta skgid 1000 counter -->
tests/xmlfiles/67-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>4</len><data0>0x00000000</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule> +<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><cmpdata><data_reg type="value"><len>4</len><data0>0x00000000</data0></data_reg></cmpdata></expr><expr type="counter"><pkts>55</pkts><bytes>11407</bytes></expr></rule></nftables> <!-- nft add rule ip filter output meta secmark 0 counter -->
tests/xmlfiles/68-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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><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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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> <!-- nft add rule filter output tcp dport { 22, 23 } counter -->
tests/xmlfiles/69-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><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> <!-- nft add rule ip filter output ip daddr { 192.168.0.1, 192.168.0.2, 192.168.0.3 } -->
tests/xmlfiles/70-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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><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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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> <!-- nft add rule ip filter output tcp dport vmap { 22 => jump chain1, 23 => jump chain2, } -->
tests/xmlfiles/71-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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><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><cmpdata><data_reg type="value"><len>1</len><data0>0x00000006</data0></data_reg></cmpdata></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> <!-- nft add rule ip filter output tcp dport vmap { 22 => accept, 23 => drop, } -->
tests/xmlfiles/72-rule-real.xml +1 -1
@@ -1,2 +1,2 @@ -<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><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> <!-- nft add rule ip filter output ip daddr vmap { 192.168.1.1 => accept, 192.168.1.2 => drop, } -->
tests/xmlfiles/73-set.xml +1 -1
@@ -1,2 +1,2 @@ -<set><family>ip</family><table>filter</table><name>set0</name><flags>0</flags><key_type>0</key_type><key_len>0</key_len><data_type>0</data_type><data_len>0</data_len><set_elem><flags>0</flags><key><data_reg type="value"><len>4</len><data0>0x0300a8c0</data0></data_reg></key></set_elem><set_elem><flags>0</flags><key><data_reg type="value"><len>4</len><data0>0x0200a8c0</data0></data_reg></key></set_elem><set_elem><flags>0</flags><key><data_reg type="value"><len>4</len><data0>0x0100a8c0</data0></data_reg></key></set_elem></set> +<nftables><set><family>ip</family><table>filter</table><name>set0</name><flags>0</flags><key_type>0</key_type><key_len>0</key_len><data_type>0</data_type><data_len>0</data_len><set_elem><flags>0</flags><key><data_reg type="value"><len>4</len><data0>0x0300a8c0</data0></data_reg></key></set_elem><set_elem><flags>0</flags><key><data_reg type="value"><len>4</len><data0>0x0200a8c0</data0></data_reg></key></set_elem><set_elem><flags>0</flags><key><data_reg type="value"><len>4</len><data0>0x0100a8c0</data0></data_reg></key></set_elem></set></nftables> <!-- nft add rule ip filter test ip daddr { 192.168.0.1, 192.168.0.2, 192.168.0.3 } tcp dport 443 counter accept -->
tests/xmlfiles/74-set.xml +1 -1
@@ -1,2 +1,2 @@ -<set><family>ip6</family><table>filter</table><name>set0</name><flags>0</flags><key_type>0</key_type><key_len>0</key_len><data_type>0</data_type><data_len>0</data_len><set_elem><flags>0</flags><key><data_reg type="value"><len>16</len><data0>0xc09a002a</data0><data1>0x2700cac1</data1><data2>0x00000000</data2><data3>0x70010000</data3></data_reg></key></set_elem><set_elem><flags>0</flags><key><data_reg type="value"><len>16</len><data0>0xc09a002a</data0><data1>0x2700cac1</data1><data2>0x00000000</data2><data3>0x50010000</data3></data_reg></key></set_elem></set> +<nftables><set><family>ip6</family><table>filter</table><name>set0</name><flags>0</flags><key_type>0</key_type><key_len>0</key_len><data_type>0</data_type><data_len>0</data_len><set_elem><flags>0</flags><key><data_reg type="value"><len>16</len><data0>0xc09a002a</data0><data1>0x2700cac1</data1><data2>0x00000000</data2><data3>0x70010000</data3></data_reg></key></set_elem><set_elem><flags>0</flags><key><data_reg type="value"><len>16</len><data0>0xc09a002a</data0><data1>0x2700cac1</data1><data2>0x00000000</data2><data3>0x50010000</data3></data_reg></key></set_elem></set></nftables> <!-- nft add rule ip6 filter test ip6 daddr { 2a00:9ac0:c1ca:27::150, 2a00:9ac0:c1ca:27::170, } counter accept -->
Pablo Neira Ayuso
maintainerQuoted 2 lines · Arturo Borrero Gonzalez
The intention behind this patch is to allow adding more input sources in the near future.
This looks more simple and easier to read which is what I needed, thanks. Applied with minor glitches, see below.
Quoted 29 lines
For this to happen without duplicating many code, we need to generalize the build/parse system.
The path flow is now as follow:
* API func: here we decide what kind of input we have.nft_table_parse()* Common function to decide what format to parse (JSON/XML).
nft_table_do_parse()* Common function per format to order the build of the tree and launch the parsing:
nft_table_xml_parse()
nft_table_json_parse()* Common function per format to build the tree (here more builders can be easily implemented):
nft_mxml_build_tree()
nft_jansson_create_root()Signed-off-by Arturo Borrero Gonzalez <[email protected]>---
0 files changedsrc/chain.c +0
-0
src/chain.c err: · line 595
Quoted 7 lines
src/chain.c +2
-2@@ -591,14 +591,14 @@ err: }#endif -static int nft_chain_json_parse (struct nft_chain *c,const char *json, -struct nft_parse_err *err) +static int nft_chain_json_parse (struct nft_chain *c,const void *json, +struct nft_parse_err *err,uint32_t buildsrc)
Comestical: I have added enum nft_parse_input, I think this improves readability instead of buildsrc.
Pablo Neira Ayuso
maintainerRe: [libnftables PATCH 2/3] parsing: add interface to parse from file
In reply to Arturo Borrero GonzalezQuoted 4 lines · Arturo Borrero Gonzalez
This patch adds API interfaces to parse nft objects from a given stream. I found this useful in `nft', where I'm trying to parse XML/JSON from a file.
In addition to the API functions, a new builder is added to handle a file.
Also applied, thanks.
Re: [libnftables PATCH 3/3] tests: update tests with nft_*_parse_file()
In reply to Arturo Borrero GonzalezQuoted 6 lines · Arturo Borrero Gonzalez
Lets do testing with
nft_ruleset_parse_file()functions.For this to work, all testfiles are enclosed in the corresponding format top element:
* XML: <nftables>*</nftables>
* JSON: {"nftables":[*]}
Applied this with changes. Thanks Arturo.
Quoted 9 lines
tests/nft-parsing-test.c +0
-1@@ -12,14 +12,6 @@#include <libnftables/rule.h> #include <libnftables/set.h> -#ifdef XML_PARSING
tests/nft-parsing-test.c line 17
Quoted 10 lines
tests/nft-parsing-test.c +0
-7-#include <mxml.h> -#endif - -#ifdef JSON_PARSING -#include <jansson.h> -#endif -enum {TEST_XML_TABLE =0 ,TEST_XML_CHAIN ,
TEST_XML_TABLE, _CHAIN, ... are not used anymore after this change. I removed them.
Quoted 92 lines
tests/nft-parsing-test.c +9
-42@@ -33,7 +25,6 @@ enum { TEST_JSON_RULESET, }; -#if defined(XML_PARSING ) || defined(JSON_PARSING )static void print_detail_error (char *a,char *b) {int i;@@ -73,7 +64,8 @@ static void print_detail_error(char *a, char *b) } } -static int compare_test (uint32_t type,void *input,const char *filename) +static int compare_test (uint32_t type,void *input,const char *filename, +FILE *fp) {struct nft_table *t =NULL ;struct nft_chain *c =NULL ;@@ -82,7 +74,6 @@ static int compare_test(uint32_t type, void *input, const char *filename)struct nft_ruleset *rs =NULL ;char orig[4096 ];char out[4096 ]; -FILE *fp;switch (type) {case TEST_XML_TABLE :@@ -148,14 +139,8 @@ static int compare_test(uint32_t type, void *input, const char *filename)return -1 ; } - fp =fopen (filename,"r" ); -if (fp ==NULL ) { -perror ("open" ); -exit (EXIT_FAILURE ); - } - +rewind (fp);fgets (orig,sizeof (orig), fp); -fclose (fp);if (strncmp (orig, out,strlen (out)) ==0 )return 0 ;@@ -165,192 +150,75 @@ static int compare_test(uint32_t type, void *input, const char *filename)print_detail_error (orig, out);return -1 ; } -#endif static int test_json (const char *filename,struct nft_parse_err *err) { -#ifdef JSON_PARSING int ret =-1 ; -struct nft_table *t; -struct nft_chain *c; -struct nft_rule *r; -struct nft_set *s;struct nft_ruleset *rs; -json_t *root; -json_error_t error; -char *json; +FILE *fp; - root =json_load_file (filename,0 , &error); -if (!root) + fp =fopen (filename,"r" ); +if (fp ==NULL ) { +printf ("unable to open file %s: %s\n" , filename, +strerror (errno));return -1 ; + } - json =json_dumps (root,JSON_INDENT (0 )); - -if (json_object_get (root,"table" ) !=NULL ) { - t =nft_table_alloc (); -if (t !=NULL ) { -if (nft_table_parse (t,NFT_PARSE_JSON , json, err) ==0 ) - ret =compare_test (TEST_JSON_TABLE , t, filename); -else - goto failparsing; - -nft_table_free (t); - } - }else if (json_object_get (root,"chain" ) !=NULL ) { - c =nft_chain_alloc (); -if (c !=NULL ) { -if (nft_chain_parse (c,NFT_PARSE_JSON , json, err) ==0 ) - ret =compare_test (TEST_JSON_CHAIN , c, filename); -else - goto failparsing; - -nft_chain_free (c);
tests/nft-parsing-test.c static int compare_test(uint32_t type, void *input, const char *filename) · line 168
Quoted 10 lines
tests/nft-parsing-test.c +2
-8- } - }else if (json_object_get (root,"rule" ) !=NULL ) { - r =nft_rule_alloc (); -if (r !=NULL ) { -if (nft_rule_parse (r,NFT_PARSE_JSON , json, err) ==0 ) - ret =compare_test (TEST_JSON_RULE , r, filename); -else - goto failparsing; + rs =nft_ruleset_alloc (); +if (rs !=NULL ) {
The typical policy is to check for errors instead, I have changed this:
if (rs == NULL {
perror("nft_ruleset_alloc");
return -1;
}tests/nft-parsing-test.c static int compare_test(uint32_t type, void *input, const char *filename) · line 172
Quoted 4 lines
tests/nft-parsing-test.c +4
-0+if (nft_ruleset_parse_file (rs,NFT_PARSE_JSON , + fp, err) ==0 ) + ret =compare_test (TEST_JSON_RULESET , rs, + filename, fp);
And we save one indent and we don't need to break lines anymore.
Quoted 6 lines
tests/nft-parsing-test.c +3
-1+else + goto failparsing; -nft_rule_free (r); +nft_ruleset_free (rs); }