Alvaro Neira (12): ruleset: clean up the variable names in the xml/json parsing functions src: don't create iterator with empty list ruleset: refactor nft_ruleset_*_parse_ruleset() set: refactor code in json parse function rule: don't release the tree parameter from nft_jansson_parse_rule() ruleset: fix leak in json/xml in set lists ruleset: fix crash if we free sets included in the set_list ruleset: crash from error path when we build the xml/json tree xml: test if the root node name is initialized examples: add nft-ruleset-parse-file ruleset: add nft_ruleset_ctx_free parser: Add operation not supported error message Alvaro Neira Ayuso (4): buffer: fix missing XML string tag in nft_buf_close src: add command tag in JSON/XML export support src: add support to import JSON/XML with the new command tag tests: update JSON/XML tests with the new syntax Arturo Borrero Gonzalez (1): expr: dynset: fix json/xml parsing Balazs Scheidler (1): expr: redir: fix snprintf to return the number of bytes printed Carlos Falgueras GarcĂ­a (1): src: fix memory leaks at nft_[object]_nlmsg_parse Pablo Neira Ayuso (17): src: add missing include in utils.c ruleset: fix more leaks in error path src: split internal.h is smaller files Makefile: internal.h now resides in include src: restore static array with expression operations src: add batch abstraction table: add netdev family support chain: add netdev family support expr: immediate: fix leak in expression destroy path src: introduce nftnl_* aliases for all existing functions src: rename existing functions to use the nftnl_ prefix src: add compat header file definitions src: rename nftnl_rule_expr to nftnl_expr src: rename NFTNL_RULE_EXPR_ATTR to NFTNL_EXPR_ src: get rid of _ATTR_ infix in new nfntl_ definitions src: get rid of _attr_ infix in new nftnl_ definitions bump version to 1.0.4 Patrick McHardy (11): list: fix prefetch dummy set: add support for set timeouts set_elem: add timeout support set: print set elem timeout information set_elem: add support for userdata expr: add support for the dynset expr headers: resync headers for new register definitions data: increase maximum possible data size expr: seperate expression parsing and building functions set_elem: support expressions attached to set elements dynset: support expression templates