Fix iptables-save not printing -s !0/0 and -d !0/0 as well as ip6tables

unnecessarily printing the address. Base on patch by Daniel De Graaf.

diff --git a/ip6tables-save.c b/ip6tables-save.c
index 37b1f197ef9ac89698482d14bafc70e2d48d98e2..486c522432092c81f305b2ee00c6e8c48d2df87b 100644 (file)
--- a/ip6tables-save.c
+++ b/ip6tables-save.c
@@ -125,7 +125,7 @@ static void print_ip(char *prefix, const struct in6_addr *ip, const struct in6_a
        char buf[51];
        int l = ipv6_prefix_length(mask);
 
-       if (!mask && !ip)
+       if (l == 0 && !invert)
                return;
 
        printf("%s %s%s",

diff --git a/iptables-save.c b/iptables-save.c
index 79b5dc7fbd34848b53a3ff9696496bb64336a522..ee189182388fad76478fadbaa93a89be910f6ec3 100644 (file)
--- a/iptables-save.c
+++ b/iptables-save.c
@@ -141,7 +141,7 @@ static int print_match(const struct ipt_entry_match *e,
 /* print a given ip including mask if neccessary */
 static void print_ip(char *prefix, u_int32_t ip, u_int32_t mask, int invert)
 {
-       if (!mask && !ip)
+       if (!mask && !ip && !invert)
                return;
 
        printf("%s %s%u.%u.%u.%u",