Fernando Fernandez Mancera (1): tests: extend tests for destroy command Florian Westphal (17): meta: don't crash if meta key isn't known src: fix enum/integer mismatches doc: list set/map flag keywords in a table doc: add nat examples netlink: restore typeof interval map data type mnl: support bpf id decode in nft list hooks src: permit use of constant values in set lookup keys tests: shell: add test case for chain-in-use-splat cache: include set elements in "nft set list" json: dccp: remove erroneous const qualifier evaluate: do not abort when prefix map has non-map element parser: don't assert on scope underflows parser: reject zero-length interface names parser: reject zero-length interface names in flowtables ct timeout: fix 'list object x' vs. 'list objects in table' confusion src: avoid IPPROTO_MAX for array definitions tests: json: add missing/expected json output Jeremy Sowden (9): evaluate: insert byte-order conversions for expressions between 9 and 15 bits evaluate: don't eval unary arguments tests: py: add test-cases for ct and packet mark payload expressions tests: shell: rename and move bitwise test-cases tests: shell: add test-cases for ct and packet mark payload expressions netlink_delinearize: correct type and byte-order of shifts json: formatting fixes doc: correct NAT statement description exthdr: add boolean DCCP option matching Jose M. Guisado Gomez (1): py: replace distutils with setuptools Pablo Neira Ayuso (45): Revert "evaluate: relax type-checking for integer arguments in mark statements" parser_bison: simplify reset syntax evaluate: support shifts larger than the width of the left operand evaluate: relax type-checking for integer arguments in mark statements evaluate: set up integer type to shift expression evaluate: honor statement length in integer evaluation evaluate: honor statement length in bitwise evaluation netlink_delinerize: incorrect byteorder in mark statement listing tests: py: extend test-cases for mark statements with bitwise expressions payload: set byteorder when completing expression intervals: use expression location when translating to intervals optimize: assert nat type on nat statement helper evaluate: bogus missing transport protocol netlink_delinearize: do not reset protocol context for nat protocol expression optimize: support for redirect and masquerade main: Error out when combining -i/--interactive and -f/--file mnl: set SO_SNDBUF before SO_SNDBUFFORCE mnl: flowtable support for extended netlink error reporting src: allow for updating devices on existing netdev chain evaluate: bail out if new flowtable does not specify hook and priority meta: skip protocol context update for nfproto with same table family json: allow to specify comment on table json: allow to specify comment on chain mnl: handle singleton element in netdevice set mnl: incomplete extended error reporting for singleton device in chain tests: py: missing json updates on ct and meta mark payload expression evaluate: allow stateful statements with anonymous verdict maps evaluate: skip optimization if anonymous set uses stateful statement optimize: do not remove counter in verdict maps datatype: misspell support with symbol table parser for error reporting datatype: add hint error handler evaluate: set NFT_SET_EVAL flag if dynamic set already exists tests: shell: fix spurious errors in terse listing in json tests: shell: bogus EBUSY errors in transactions src: add json support for last statement json: add inner payload support tests: shell: coverage for simple port knocking ruleset tests: shell: cover refcount leak of mapping rhs expression: define .clone for catchall set element tests: shell: refcount memleak in map rhs with timeouts netlink_linearize: use div_round_up in byteorder length evaluate: place byteorder conversion before rshift in payload statement tests: shell: cover old scanner bug include: missing dccpopt.h breaks make distcheck build: Bump version to 1.0.8 Phil Sutter (12): Reduce signature of do_list_table() Avoid a memleak with 'reset rules' command xt: Fix translation error path tests: shell: Fix for unstable sets/0043concatenated_ranges_0 tests: py: Document JSON mode in README main: Make 'buf' variable branch-local main: Call nft_ctx_free() before exiting cli: Make cli_init() return to caller tests: shell: Introduce valgrind mode evaluate: Merge some cases in cmd_evaluate_list() evaluate: Cache looked up set for list commands Implement 'reset {set,map,element}' commands Sriram Yagnaraman (1): meta: introduce meta broute support Thomas Haller (4): libnftables: always initialize netlink socket in nft_ctx_new() libnftables: drop unused argument nf_sock from nft_netlink() libnftables: inline creation of nf_sock in nft_ctx_new() libnftables: drop check for nf_sock in nft_ctx_free()