projects / packages / ebtables.git / blame
| Commit | Line | Data |
|---|---|---|
| ac0f3519 MM |
1 | diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c |
| 2 | index 0465e77..52a8448 100644 | |
| 3 | --- a/extensions/ebt_ip6.c | |
| 4 | +++ b/extensions/ebt_ip6.c | |
| 5 | @@ -445,14 +445,14 @@ static void print(const struct ebt_u_entry *entry, | |
| 6 | if (ipinfo->invflags & EBT_IP6_SOURCE) | |
| 7 | printf("! "); | |
| 8 | printf("%s", ebt_ip6_to_numeric(&ipinfo->saddr)); | |
| 9 | - printf("/%s ", ebt_ip6_to_numeric(&ipinfo->smsk)); | |
| 10 | + printf("%s ", ebt_ip6_mask_to_string(&ipinfo->smsk)); | |
| 11 | } | |
| 12 | if (ipinfo->bitmask & EBT_IP6_DEST) { | |
| 13 | printf("--ip6-dst "); | |
| 14 | if (ipinfo->invflags & EBT_IP6_DEST) | |
| 15 | printf("! "); | |
| 16 | printf("%s", ebt_ip6_to_numeric(&ipinfo->daddr)); | |
| 17 | - printf("/%s ", ebt_ip6_to_numeric(&ipinfo->dmsk)); | |
| 85a46319 | 18 | + printf("%s ", ebt_ip6_mask_to_string(&ipinfo->dmsk)); |
| ac0f3519 MM |
19 | } |
| 20 | if (ipinfo->bitmask & EBT_IP6_TCLASS) { | |
| 21 | printf("--ip6-tclass "); | |
| 22 | diff --git a/include/ebtables_u.h b/include/ebtables_u.h | |
| 23 | index ab615c1..35a5bcc 100644 | |
| 24 | --- a/include/ebtables_u.h | |
| 25 | +++ b/include/ebtables_u.h | |
| 26 | @@ -303,6 +303,7 @@ char *ebt_mask_to_dotted(uint32_t mask); | |
| 27 | void ebt_parse_ip6_address(char *address, struct in6_addr *addr, | |
| 28 | struct in6_addr *msk); | |
| 29 | char *ebt_ip6_to_numeric(const struct in6_addr *addrp); | |
| 30 | +char *ebt_ip6_mask_to_string(const struct in6_addr *msk); | |
| 31 | ||
| 32 | ||
| 33 | int do_command(int argc, char *argv[], int exec_style, | |
| 34 | diff --git a/useful_functions.c b/useful_functions.c | |
| 35 | index d20b68e..2f73589 100644 | |
| 36 | --- a/useful_functions.c | |
| 37 | +++ b/useful_functions.c | |
| 38 | @@ -411,3 +411,16 @@ char *ebt_ip6_to_numeric(const struct in6_addr *addrp) | |
| 39 | static char buf[50+1]; | |
| 40 | return (char *)inet_ntop(AF_INET6, addrp, buf, sizeof(buf)); | |
| 41 | } | |
| 42 | + | |
| 43 | +char *ebt_ip6_mask_to_string(const struct in6_addr *msk) | |
| 44 | +{ | |
| 45 | + /* /0000:0000:0000:0000:0000:000.000.000.000 | |
| 46 | + * /0000:0000:0000:0000:0000:0000:0000:0000 */ | |
| 47 | + static char buf[51+1]; | |
| 48 | + if (msk->s6_addr32[0] == 0xFFFFFFFFL && msk->s6_addr32[1] == 0xFFFFFFFFL && | |
| 85a46319 | 49 | + msk->s6_addr32[2] == 0xFFFFFFFFL && msk->s6_addr32[3] == 0xFFFFFFFFL) |
| ac0f3519 MM |
50 | + *buf = '\0'; |
| 51 | + else | |
| 52 | + sprintf(buf, "/%s", ebt_ip6_to_numeric(msk)); | |
| 53 | + return buf; | |
| 54 | +} |