From: Florian Westphal <fw@strlen.de>
Date: Fri, 13 Apr 2018 12:43:28 +0000 (+0200)
Subject: nft-bridge: fix mac address printing
X-Git-Tag: v1.8.0~121
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3063c3799b03b967615d90f955a94c9baab96779;p=thirdparty%2Fiptables.git

nft-bridge: fix mac address printing

Mask needs to be all-ones, else we print
<macaddr>/ff:ff:ff:ff:ff:ff

but such a mask is redundant, we can omit the mask.
ebtables does this correctly.

Signed-off-by: Florian Westphal <fw@strlen.de>
---

diff --git a/iptables/nft-bridge.c b/iptables/nft-bridge.c
index 22940cf7..04567a1f 100644
--- a/iptables/nft-bridge.c
+++ b/iptables/nft-bridge.c
@@ -57,7 +57,7 @@ static void ebt_print_mac(const unsigned char *mac)
 /* Put the mac address into 6 (ETH_ALEN) bytes returns 0 on success. */
 static void ebt_print_mac_and_mask(const unsigned char *mac, const unsigned char *mask)
 {
-	char hlpmsk[6] = {};
+	char hlpmsk[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
 	if (!memcmp(mac, eb_mac_type_unicast, 6) &&
 	    !memcmp(mask, eb_msk_type_unicast, 6))