zebra: add icmpv6 table of type / code

this table contains the list of icmp type/code for icmpv6.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/zebra/zebra_pbr.c b/zebra/zebra_pbr.c
index 166689385c82a2a1b50a3cea96f51be0f3cb12f8..1bed0b48bbcc472526937689b2ad6986ce7ef4bd 100644 (file)
--- a/zebra/zebra_pbr.c
+++ b/zebra/zebra_pbr.c
@@ -83,6 +83,27 @@ const struct message icmp_typecode_str[] = {
        {0}
 };
 
+const struct message icmpv6_typecode_str[] = {
+       { 128 << 8, "echo-request"},
+       { 129 << 8, "echo-reply"},
+       { 1 << 8, "no-route"},
+       { (1 << 8) + 1, "communication-prohibited"},
+       { (1 << 8) + 3, "address-unreachable"},
+       { (1 << 8) + 4, "port-unreachable"},
+       { (2 << 8), "packet-too-big"},
+       { 3 << 0, "ttl-zero-during-transit"},
+       { (3 << 8) + 1, "ttl-zero-during-reassembly"},
+       { 4 << 0, "bad-header"},
+       { (4 << 0) + 1, "unknown-header-type"},
+       { (4 << 0) + 2, "unknown-option"},
+       { 133 << 8, "router-solicitation"},
+       { 134 << 8, "router-advertisement"},
+       { 135 << 8, "neighbor-solicitation"},
+       { 136 << 8, "neighbor-advertisement"},
+       { 137 << 8, "redirect"},
+       {0}
+};
+
 /* definitions */
 static const struct message tcp_value_str[] = {
        {TCP_HEADER_FIN, "FIN"},
@@ -900,6 +921,9 @@ static void zebra_pbr_display_icmp(struct vty *vty,
 {
        char decoded_str[20];
        uint16_t port;
+       struct zebra_pbr_ipset *zpi;
+
+       zpi = zpie->backpointer;
 
        /* range icmp type */
        if (zpie->src_port_max || zpie->dst_port_max) {
@@ -912,8 +936,10 @@ static void zebra_pbr_display_icmp(struct vty *vty,
                memset(decoded_str, 0, sizeof(decoded_str));
                snprintf(decoded_str, sizeof(decoded_str), "%u/%u",
                         zpie->src_port_min, zpie->dst_port_min);
-               vty_out(vty, ":icmp:%s",
-                       lookup_msg(icmp_typecode_str,
+               vty_out(vty, ":%s:%s",
+                       zpi->family == AF_INET6 ? "ipv6-icmp" : "icmp",
+                       lookup_msg(zpi->family == AF_INET6 ?
+                                  icmpv6_typecode_str : icmp_typecode_str,
                                   port, decoded_str));
        }
 }
@@ -1115,7 +1141,7 @@ static void zebra_pbr_show_iptable_unit(struct zebra_pbr_iptable *iptable,
 
        vty_out(vty, "IPtable %s family %s action %s (%u)\n",
                iptable->ipset_name,
-               iptable->family == AF_INET ? "AF_INET" : "AF_INET6",
+               family2str(iptable->family),
                iptable->action == ZEBRA_IPTABLES_DROP ? "drop" : "redirect",
                iptable->unique);
        if (iptable->type == IPSET_NET_PORT ||

diff --git a/zebra/zebra_pbr.h b/zebra/zebra_pbr.h
index c84e603723e51dad74437c09a8f671a82cfa08fb..e7504a35476517ad5a0b918083d47f5ef9934667 100644 (file)
--- a/zebra/zebra_pbr.h
+++ b/zebra/zebra_pbr.h
@@ -163,6 +163,7 @@ struct zebra_pbr_iptable {
 };
 
 extern const struct message icmp_typecode_str[];
+extern const struct message icmpv6_typecode_str[];
 
 const char *zebra_pbr_ipset_type2str(uint32_t type);