From: Phil Sutter Date: Fri, 28 Apr 2023 12:37:47 +0000 (+0200) Subject: arptables: Don't omit standard matches if inverted X-Git-Tag: v1.8.10~60 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79f93b0943fa0e46ba29bb476362634509eb594e;p=thirdparty%2Fiptables.git arptables: Don't omit standard matches if inverted Inverted --h-len and --h-type matches were omitted from output by accident if they matched on their standard value. Fixes: 84331e3ed3f8e ("arptables-nft: Don't print default h-len/h-type values") Signed-off-by: Phil Sutter --- diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c index a8e49f44..3236e2f5 100644 --- a/iptables/nft-arp.c +++ b/iptables/nft-arp.c @@ -408,7 +408,8 @@ after_devsrc: after_devdst: - if (fw->arp.arhln_mask != 255 || fw->arp.arhln != 6) { + if (fw->arp.arhln_mask != 255 || fw->arp.arhln != 6 || + fw->arp.invflags & IPT_INV_ARPHLN) { printf("%s%s", sep, fw->arp.invflags & IPT_INV_ARPHLN ? "! " : ""); printf("--h-length %d", fw->arp.arhln); @@ -432,7 +433,8 @@ after_devdst: sep = " "; } - if (fw->arp.arhrd_mask != 65535 || fw->arp.arhrd != htons(1)) { + if (fw->arp.arhrd_mask != 65535 || fw->arp.arhrd != htons(1) || + fw->arp.invflags & IPT_INV_ARPHRD) { uint16_t tmp = ntohs(fw->arp.arhrd); printf("%s%s", sep, fw->arp.invflags & IPT_INV_ARPHRD