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 <ffmanc...@riseup.net>
---
 src/netlink_delinearize.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index fc2574b..f7d328a 100644
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -2550,7 +2550,8 @@ static void rule_parse_postprocess(struct 
netlink_parse_ctx *ctx, struct rule *r
                        if (stmt->ct.expr != NULL) {
                                expr_postprocess(&rctx, &stmt->ct.expr);
 
-                               if (stmt->ct.expr->etype == EXPR_BINOP)
+                               if (stmt->ct.expr->etype == EXPR_BINOP &&
+                                   stmt->ct.key == NFT_CT_EVENTMASK)
                                        stmt->ct.expr = binop_tree_to_list(NULL,
                                                                           
stmt->ct.expr);
                        }
-- 
2.20.1

Reply via email to