src: add ruleset API
PATCH 1/1 src: add ruleset API
This patch adds a ruleset object API to libnftables.
--- include/libnftables/Makefile.am | 3 include/libnftables/ruleset.h | 45 ++ src/Makefile.am | 1 src/chain.c | 2 src/internal.h | 8 src/libnftables.map | 9 src/rule.c | 2 src/ruleset.c | 759 +++++++++++++++++++++++++++++++++++++++ src/set.c | 2 src/table.c | 2 tests/nft-parsing-test.c | 39 ++ tests/xmlfiles/75-ruleset.xml | 1 12 files changed, 868 insertions(+), 5 deletions(-) create mode 100644 include/libnftables/ruleset.h create mode 100644 src/ruleset.c create mode 100644 tests/xmlfiles/75-ruleset.xml
include/libnftables/Makefile.am +2 -1
@@ -2,4 +2,5 @@ pkginclude_HEADERS = table.h \ chain.h \ rule.h \ expr.h \ - set.h + set.h \ + ruleset.h
include/libnftables/ruleset.h new file +45 -0
45 lines not on this page · raw message
src/Makefile.am +1 -0
@@ -10,6 +10,7 @@ libnftables_la_SOURCES = utils.c \ rule.c \ set.c \ set_elem.c \ + ruleset.c \ mxml.c \ jansson.c \ expr.c \
src/chain.c +1 -1
@@ -506,7 +506,7 @@ static inline int nft_str2hooknum(int family, const char *hook) }#ifdef JSON_PARSING -static int nft_jansson_parse_chain (struct nft_chain *c,json_t *tree) +int nft_jansson_parse_chain (struct nft_chain *c,json_t *tree) {json_t *root;uint64_t uval64;
src/internal.h +8 -0
@@ -71,6 +71,14 @@ int nft_jansson_data_reg_parse(json_t *root, const char *tag, union nft_data_reg *data_reg);struct nft_set_elem ;int nft_set_elem_json_parse (struct nft_set_elem *e,json_t *root); +struct nft_table ; +int nft_jansson_parse_table (struct nft_table *t,json_t *tree); +struct nft_chain ; +int nft_jansson_parse_chain (struct nft_chain *c,json_t *tree); +struct nft_rule ; +int nft_jansson_parse_rule (struct nft_rule *r,json_t *tree); +struct nft_set ; +int nft_jansson_parse_set (struct nft_set *s,json_t *tree);#endif const char *nft_family2str (uint32_t family);
src/libnftables.map +9 -0
@@ -165,5 +165,14 @@ global: nft_set_elems_iter_next; nft_set_elems_iter_destroy; + nft_ruleset_alloc; + nft_ruleset_free; + nft_ruleset_attr_is_set; + nft_ruleset_attr_unset; + nft_ruleset_attr_set; + nft_ruleset_attr_get; + nft_ruleset_parse; + nft_ruleset_snprintf; + local: *; };
src/rule.c +1 -1
@@ -476,7 +476,7 @@ int nft_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_rule *r)EXPORT_SYMBOL (nft_rule_nlmsg_parse);#ifdef JSON_PARSING -static int nft_jansson_parse_rule (struct nft_rule *r,json_t *tree) +int nft_jansson_parse_rule (struct nft_rule *r,json_t *tree) {json_t *root, *array;struct nft_rule_expr *e;
src/ruleset.c new file +759 -0
759 lines not on this page · raw message
src/set.c +1 -1
@@ -304,7 +304,7 @@ int nft_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s)EXPORT_SYMBOL (nft_set_nlmsg_parse);#ifdef JSON_PARSING -static int nft_jansson_parse_set (struct nft_set *s,json_t *tree) +int nft_jansson_parse_set (struct nft_set *s,json_t *tree) {json_t *root, *array, *json_elem;uint32_t uval32;
src/table.c +1 -1
@@ -272,7 +272,7 @@ static int nft_table_xml_parse(struct nft_table *t, const char *xml) }#ifdef JSON_PARSING -static int nft_jansson_parse_table (struct nft_table *t,json_t *tree) +int nft_jansson_parse_table (struct nft_table *t,json_t *tree) {json_t *root;uint32_t flags;
tests/nft-parsing-test.c +39 -0
@@ -6,6 +6,7 @@#include <errno.h> #include <libmnl/libmnl.h> /*nlmsghdr*/ +#include <libnftables/ruleset.h> #include <libnftables/table.h> #include <libnftables/chain.h> #include <libnftables/rule.h>
@@ -24,10 +25,12 @@ enum {TEST_XML_CHAIN ,TEST_XML_RULE ,TEST_XML_SET , +TEST_XML_RULESET ,TEST_JSON_TABLE ,TEST_JSON_CHAIN ,TEST_JSON_RULE ,TEST_JSON_SET , + TEST_JSON_RULESET, };#if defined(XML_PARSING ) || defined(JSON_PARSING )
@@ -76,6 +79,7 @@ static int compare_test(uint32_t type, void *input, const char *filename)struct nft_chain *c =NULL ;struct nft_rule *r =NULL ;struct nft_set *s =NULL ; +struct nft_ruleset *rs =NULL ;char orig[4096 ];char out[4096 ];FILE *fp;
@@ -97,6 +101,10 @@ static int compare_test(uint32_t type, void *input, const char *filename)case TEST_JSON_SET : s = (struct nft_set *)input;break ; +case TEST_XML_RULESET : +case TEST_JSON_RULESET : + rs = (struct nft_ruleset *)input; +break ;default : errno =EINVAL ;return -1 ;
@@ -127,6 +135,14 @@ static int compare_test(uint32_t type, void *input, const char *filename)case TEST_JSON_SET :nft_set_snprintf (out,sizeof (out), s,NFT_SET_O_JSON ,0 );break ; +case TEST_XML_RULESET : +nft_ruleset_snprintf (out,sizeof (out), rs, +NFT_RULESET_O_XML ,0 ); +break ; +case TEST_JSON_RULESET : +nft_ruleset_snprintf (out,sizeof (out), rs, +NFT_RULESET_O_JSON ,0 ); +break ;default : errno =EINVAL ;return -1 ;
@@ -211,6 +227,16 @@ static int test_json(const char *filename)nft_set_free (s); } + }else if (json_object_get (root,"nftables" ) !=NULL ) { + s =nft_set_alloc (); +if (s !=NULL ) { +if (nft_set_parse (s,NFT_SET_PARSE_JSON , json) ==0 ) + ret =compare_test (TEST_JSON_SET , s, filename); +else + goto failparsing; + +nft_set_free (s); + } }free (json);
@@ -237,6 +263,7 @@ static int test_xml(const char *filename)struct nft_chain *c;struct nft_rule *r;struct nft_set *s; +struct nft_ruleset *rs;FILE *fp;mxml_node_t *tree;char *xml;
@@ -293,6 +320,18 @@ static int test_xml(const char *filename)nft_set_free (s); } + }else if (strcmp (tree->value.opaque,"nftables" ) ==0 ) { + rs =nft_ruleset_alloc (); +if (rs !=NULL ) { +if (nft_ruleset_parse (rs,NFT_RULESET_PARSE_XML , + xml) ==0 ) + ret =compare_test (TEST_XML_RULESET , rs, + filename); +else + goto failparsing; + +nft_ruleset_free (rs); + } }return ret;
tests/xmlfiles/75-ruleset.xml new file +1 -0
@@ -0,0 +1 @@ +<nftables><table><name>filter</name><family>ip</family><flags>0</flags></table><table><name>nat</name><family>ip</family><flags>0</flags></table><chain><name>input</name><handle>1</handle><bytes>0</bytes><packets>0</packets><table>filter</table><family>ip</family></chain><chain><name>pre</name><handle>1</handle><bytes>0</bytes><packets>0</packets><table>nat</table><family>ip</family></chain><set><family>ip</family><table>filter</table><name>set0</name><flags>3</flags><key_type>12</key_type><key_len>2</key_len><data_type>0</data_type><data_len>0</data_len><set_elem><flags>0</flags><key><data_reg type="value"><len>2</len><data0>0x000001bb</data0></data_reg></key></set_elem><set_elem><flags>0</flags><key><data_reg type="value"><len>2</len><data0>0x00000019</data0></data_reg></key></set_elem>
<set_elem><flags>0</flags><key><data_reg type="value"><len>2</len><data0>0x00000016</data0></data_reg></key></set_elem></set><set><family>ip</family><table>nat</table><name>set0</name><flags
Quoted 1 line
3</flags><key_type>12</key_type><key_len>2</key_len><data_type>0</data_type><data_len>0</data_len><set_elem><flags>0</flags><key><data_reg type="value"><len>2</len><data0>0x00001f90</data0></data_reg></key></set_elem><set_elem><flags>0</flags><key><data_reg type="value"><len>2</len><data0>0x00000050</data0></data_reg></key></set_elem></set><rule><family>ip</family><table>filter</table><chain>input</chain><handle>2</handle><flags>0</flags><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="immediate"><dreg>0</dreg><immediatedata><data_reg type="verdict"><verdict>accept</verdict></data_reg></immediatedata></expr></rule><rule><f
amily>ip</family><table>nat</table><chain>pre</chain><handle>3</handle><flags>0</flags><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="immediate"><dreg>0</dreg><immediatedata><data_reg type="verdict"><verdict>drop</verdict></data_reg></immediatedata></expr></rule></nftables>