X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=iptables.c;h=694dd4f6ab9a94bf58863a5acd9b1e11c8390239;hp=df0d70425eaf4cc48dd9c382f2a88d83477ea01e;hb=93aea77092b0c178fefe3ab95fc040534eda90a3;hpb=9e7b8360c3f9c7d518322e732e6d8ddfbbf43c60

diff --git a/iptables.c b/iptables.c
index df0d704..694dd4f 100644
--- a/iptables.c
+++ b/iptables.c
@@ -609,7 +609,10 @@ fw3_ipt_rule_in_out(struct fw3_ipt_rule *r,
 static void
 ip4prefix2mask(int prefix, struct in_addr *mask)
 {
-	mask->s_addr = htonl(~((1 << (32 - prefix)) - 1));
+	if (prefix > 0)
+		mask->s_addr = htonl(~((1 << (32 - prefix)) - 1));
+	else
+		mask->s_addr = 0;
 }
 
 #ifndef DISABLE_IPV6
@@ -743,11 +746,17 @@ fw3_ipt_rule_sport_dport(struct fw3_ipt_rule *r,
 void
 fw3_ipt_rule_mac(struct fw3_ipt_rule *r, struct fw3_mac *mac)
 {
+	char buf[sizeof("ff:ff:ff:ff:ff:ff\0")];
+	uint8_t *addr = mac->mac.ether_addr_octet;
+
 	if (!mac)
 		return;
 
+	sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x",
+	        addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+
 	fw3_ipt_rule_addarg(r, false, "-m", "mac");
-	fw3_ipt_rule_addarg(r, mac->invert, "--mac-source", ether_ntoa(&mac->mac));
+	fw3_ipt_rule_addarg(r, mac->invert, "--mac-source", buf);
 }
 
 void