* [PATCH] ebtables printing of ipv6 masks
@ 2014-04-11 13:28 Mariusz Mazur
2014-04-14 20:14 ` Bart De Schuymer
0 siblings, 1 reply; 2+ messages in thread
From: Mariusz Mazur @ 2014-04-11 13:28 UTC (permalink / raw)
To: netfilter-devel
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
Currently ebtables is smart enough to not print /255.255.255.255 for ipv4
addresses, not so however for ipv6 addresses. The attached patch fixes that.
(Not sure my kmail won't mangle it, so here it is uploaded:
http://u.42.pl/2T8O )
--mmazur
[-- Attachment #2: ipv6_netmask_printing_fix.patch --]
[-- Type: text/x-patch, Size: 2009 bytes --]
diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c
index 0465e77..52a8448 100644
--- a/extensions/ebt_ip6.c
+++ b/extensions/ebt_ip6.c
@@ -445,14 +445,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->smsk));
}
if (ipinfo->bitmask & EBT_IP6_TCLASS) {
printf("--ip6-tclass ");
diff --git a/include/ebtables_u.h b/include/ebtables_u.h
index ab615c1..35a5bcc 100644
--- a/include/ebtables_u.h
+++ b/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/useful_functions.c b/useful_functions.c
index d20b68e..2f73589 100644
--- a/useful_functions.c
+++ b/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;
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ebtables printing of ipv6 masks
2014-04-11 13:28 [PATCH] ebtables printing of ipv6 masks Mariusz Mazur
@ 2014-04-14 20:14 ` Bart De Schuymer
0 siblings, 0 replies; 2+ messages in thread
From: Bart De Schuymer @ 2014-04-14 20:14 UTC (permalink / raw)
To: Mariusz Mazur, netfilter-devel
Mariusz Mazur schreef op 11/04/2014 15:28:
> Currently ebtables is smart enough to not print /255.255.255.255 for ipv4
> addresses, not so however for ipv6 addresses. The attached patch fixes that.
>
> (Not sure my kmail won't mangle it, so here it is uploaded:
> http://u.42.pl/2T8O )
>
> --mmazur
>
Your patch introduces a bug when printing the IPv6 destination mask.
I've applied a fixed version.
cheers,
Bart
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-04-14 20:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-11 13:28 [PATCH] ebtables printing of ipv6 masks Mariusz Mazur
2014-04-14 20:14 ` Bart De Schuymer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.