]> git.ipfire.org Git - thirdparty/nftables.git/commit
netlink_delinearize: fix wrong conversion to "list" in ct mark
authorFernando Fernandez Mancera <ffmancera@riseup.net>
Mon, 9 Sep 2019 19:52:47 +0000 (21:52 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 10 Sep 2019 19:59:23 +0000 (21:59 +0200)
commit805969ec63f22303d89a25dd8aa23d54dc65bf73
treed82724a4d7097da391e8c1a165dca2c0a49cee06
parent860671662d3f7aeec156932aff648e04f0e2ec92
netlink_delinearize: fix wrong conversion to "list" in ct mark

We only prefer "list" representation in "ct event". For any other type of "ct"
use the "or" representation so nft prints "ct mark set ct mark | 0x00000001"
instead of "ct mark set ct mark,0x00000001".

Link: https://bugzilla.netfilter.org/show_bug.cgi?id=1364
Fixes: cb8f81ac3079 ("netlink_delinearize: prefer ct event set foo,bar over 'set foo|bar'")
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
src/netlink_delinearize.c
tests/py/any/ct.t
tests/py/any/ct.t.payload