summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart De Schuymer <bdschuym@pandora.be>2014-04-14 22:04:55 +0200
committerBart De Schuymer <bdschuym@pandora.be>2014-04-14 22:04:55 +0200
commitddde4755deda89c061b7f5dcca2883291fd7ef03 (patch)
tree154fe0bcdb434cef8550e7e5e7b44e31d3b6b0ae
parentba6234638d04400cf94adf350ccfa7005d078b4a (diff)
don't print IPv6 mask if it's all ones (based on patch by Mariusz Mazur <mmazur at axeos.com>)
-rw-r--r--userspace/ebtables2/extensions/ebt_ip6.c4
-rw-r--r--userspace/ebtables2/include/ebtables_u.h1
-rw-r--r--userspace/ebtables2/useful_functions.c13
3 files changed, 16 insertions, 2 deletions
diff --git a/userspace/ebtables2/extensions/ebt_ip6.c b/userspace/ebtables2/extensions/ebt_ip6.c
index bbdc4ae..e3e0956 100644
--- a/userspace/ebtables2/extensions/ebt_ip6.c
+++ b/userspace/ebtables2/extensions/ebt_ip6.c
@@ -449,14 +449,14 @@ static void print(const struct ebt_u_entry *entry,
if (ipinfo->invflags & EBT_IP6_SOURCE)
printf("! ");
printf("%s", ebt_ip6_to_numeric(&ipinfo->saddr));
- printf("/%s ", ebt_ip6_to_numeric(&ipinfo->smsk));
+ printf("%s ", ebt_ip6_mask_to_string(&ipinfo->smsk));
}
if (ipinfo->bitmask & EBT_IP6_DEST) {
printf("--ip6-dst ");
if (ipinfo->invflags & EBT_IP6_DEST)
printf("! ");
printf("%s", ebt_ip6_to_numeric(&ipinfo->daddr));
- printf("/%s ", ebt_ip6_to_numeric(&ipinfo->dmsk));
+ printf("%s ", ebt_ip6_mask_to_string(&ipinfo->dmsk));
}
if (ipinfo->bitmask & EBT_IP6_TCLASS) {
printf("--ip6-tclass ");
diff --git a/userspace/ebtables2/include/ebtables_u.h b/userspace/ebtables2/include/ebtables_u.h
index ab615c1..35a5bcc 100644
--- a/userspace/ebtables2/include/ebtables_u.h
+++ b/userspace/ebtables2/include/ebtables_u.h
@@ -303,6 +303,7 @@ char *ebt_mask_to_dotted(uint32_t mask);
void ebt_parse_ip6_address(char *address, struct in6_addr *addr,
struct in6_addr *msk);
char *ebt_ip6_to_numeric(const struct in6_addr *addrp);
+char *ebt_ip6_mask_to_string(const struct in6_addr *msk);
int do_command(int argc, char *argv[], int exec_style,
diff --git a/userspace/ebtables2/useful_functions.c b/userspace/ebtables2/useful_functions.c
index d20b68e..d14cbe9 100644
--- a/userspace/ebtables2/useful_functions.c
+++ b/userspace/ebtables2/useful_functions.c
@@ -411,3 +411,16 @@ char *ebt_ip6_to_numeric(const struct in6_addr *addrp)
static char buf[50+1];
return (char *)inet_ntop(AF_INET6, addrp, buf, sizeof(buf));
}
+
+char *ebt_ip6_mask_to_string(const struct in6_addr *msk)
+{
+ /* /0000:0000:0000:0000:0000:000.000.000.000
+ * /0000:0000:0000:0000:0000:0000:0000:0000 */
+ static char buf[51+1];
+ if (msk->s6_addr32[0] == 0xFFFFFFFFL && msk->s6_addr32[1] == 0xFFFFFFFFL &&
+ msk->s6_addr32[2] == 0xFFFFFFFFL && msk->s6_addr32[3] == 0xFFFFFFFFL)
+ *buf = '\0';
+ else
+ sprintf(buf, "/%s", ebt_ip6_to_numeric(msk));
+ return buf;
+}