X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Facl%2Fmanual_fns.h;h=700fb682cb8f659c7d1589c423e06d04b279a558;hb=aad1ee149403994194cf37cef4530b042ba7df3a;hp=a2620fb2f5197d75d947e7ca894c6eeb39fc531c;hpb=07b5913ec168245b1a926f7e77948db3c40693ce;p=vpp.git diff --git a/src/plugins/acl/manual_fns.h b/src/plugins/acl/manual_fns.h index a2620fb2f51..700fb682cb8 100644 --- a/src/plugins/acl/manual_fns.h +++ b/src/plugins/acl/manual_fns.h @@ -18,6 +18,11 @@ #include #include +#include + +#define vl_endianfun /* define message structures */ +#include +#undef vl_endianfun /* Macro to finish up custom dump fns */ #define PRINT_S \ @@ -25,6 +30,24 @@ vl_print (handle, (char *)s); \ vec_free (s); +static inline void +vl_api_acl_rule_t_array_endian(vl_api_acl_rule_t *rules, u32 count) +{ + u32 i; + for(i=0; iacl_index = clib_net_to_host_u32 (a->acl_index); /* a->tag[0..63] = a->tag[0..63] (no-op) */ a->count = clib_net_to_host_u32 (a->count); - vl_api_acl_rule_t_endian (a->r); + vl_api_acl_rule_t_array_endian (a->r, a->count); } static inline void @@ -44,7 +67,7 @@ vl_api_macip_acl_details_t_endian (vl_api_macip_acl_details_t * a) a->acl_index = clib_net_to_host_u32 (a->acl_index); /* a->tag[0..63] = a->tag[0..63] (no-op) */ a->count = clib_net_to_host_u32 (a->count); - vl_api_macip_acl_rule_t_endian (a->r); + vl_api_macip_acl_rule_t_array_endian (a->r, a->count); } @@ -57,7 +80,7 @@ vl_api_acl_add_replace_t_endian (vl_api_acl_add_replace_t * a) a->acl_index = clib_net_to_host_u32 (a->acl_index); /* a->tag[0..63] = a->tag[0..63] (no-op) */ a->count = clib_net_to_host_u32 (a->count); - vl_api_acl_rule_t_endian (a->r); + vl_api_acl_rule_t_array_endian (a->r, a->count); } static inline void @@ -68,7 +91,19 @@ vl_api_macip_acl_add_t_endian (vl_api_macip_acl_add_t * a) a->context = clib_net_to_host_u32 (a->context); /* a->tag[0..63] = a->tag[0..63] (no-op) */ a->count = clib_net_to_host_u32 (a->count); - vl_api_macip_acl_rule_t_endian (a->r); + vl_api_macip_acl_rule_t_array_endian (a->r, a->count); +} + +static inline void +vl_api_macip_acl_add_replace_t_endian (vl_api_macip_acl_add_replace_t * a) +{ + a->_vl_msg_id = clib_net_to_host_u16 (a->_vl_msg_id); + a->client_index = clib_net_to_host_u32 (a->client_index); + a->context = clib_net_to_host_u32 (a->context); + a->acl_index = clib_net_to_host_u32 (a->acl_index); + /* a->tag[0..63] = a->tag[0..63] (no-op) */ + a->count = clib_net_to_host_u32 (a->count); + vl_api_macip_acl_rule_t_array_endian (a->r, a->count); } static inline u8 * @@ -94,19 +129,18 @@ static inline void * vl_api_acl_rule_t_print (vl_api_acl_rule_t * a, void *handle) { u8 *s; + fib_prefix_t src, dst; - s = format (0, " %s ", a->is_ipv6 ? "ipv6" : "ipv4"); + ip_prefix_decode (&a->src_prefix, &src); + ip_prefix_decode (&a->dst_prefix, &dst); + + s = format (0, " %s ", a->src_prefix.address.af ? "ipv6" : "ipv4"); s = format_acl_action (s, a->is_permit); s = format (s, " \\\n"); - if (a->is_ipv6) - s = format (s, " src %U/%d dst %U/%d \\\n", - format_ip6_address, a->src_ip_addr, a->src_ip_prefix_len, - format_ip6_address, a->dst_ip_addr, a->dst_ip_prefix_len); - else - s = format (s, " src %U/%d dst %U/%d \\\n", - format_ip4_address, a->src_ip_addr, a->src_ip_prefix_len, - format_ip4_address, a->dst_ip_addr, a->dst_ip_prefix_len); + s = format (s, " src %U dst %U \\\n", + format_fib_prefix, &src, + format_fib_prefix, &dst); s = format (s, " proto %d \\\n", a->proto); s = format (s, " sport %d-%d dport %d-%d \\\n", clib_net_to_host_u16 (a->srcport_or_icmptype_first), @@ -120,26 +154,23 @@ vl_api_acl_rule_t_print (vl_api_acl_rule_t * a, void *handle) return handle; } - - static inline void * vl_api_macip_acl_rule_t_print (vl_api_macip_acl_rule_t * a, void *handle) { u8 *s; + fib_prefix_t src; + + ip_prefix_decode (&a->src_prefix, &src); - s = format (0, " %s %s \\\n", a->is_ipv6 ? "ipv6" : "ipv4", + s = format (0, " %s %s \\\n", a->src_prefix.address.af ? "ipv6" : "ipv4", a->is_permit ? "permit" : "deny"); s = format (s, " src mac %U mask %U \\\n", format_ethernet_address, a->src_mac, format_ethernet_address, a->src_mac_mask); - if (a->is_ipv6) - s = format (s, " src ip %U/%d, \\", - format_ip6_address, a->src_ip_addr, a->src_ip_prefix_len); - else - s = format (s, " src ip %U/%d, \\", - format_ip4_address, a->src_ip_addr, a->src_ip_prefix_len); + s = format (s, " src ip %U, \\", + format_fib_prefix, &src); PRINT_S; return handle; @@ -197,7 +228,7 @@ vl_api_acl_details_t_print (vl_api_acl_details_t * a, void *handle) u32 count = clib_net_to_host_u32 (a->count); if (count > 0x100000) { - s = format (s, "WARN: acl_defails count endianness wrong? Fixup to avoid long loop.\n"); + s = format (s, "WARN: acl_details count endianness wrong? Fixup to avoid long loop.\n"); count = a->count; } @@ -226,7 +257,7 @@ vl_api_macip_acl_details_t_print (vl_api_macip_acl_details_t * a, u32 count = clib_net_to_host_u32 (a->count); if (count > 0x100000) { - s = format (s, "WARN: macip_acl_defails count endianness wrong? Fixup to avoid long loop.\n"); + s = format (s, "WARN: macip_acl_details count endianness wrong? Fixup to avoid long loop.\n"); count = a->count; } @@ -274,6 +305,36 @@ vl_api_macip_acl_add_t_print (vl_api_macip_acl_add_t * a, void *handle) return handle; } +static inline void * +vl_api_macip_acl_add_replace_t_print (vl_api_macip_acl_add_replace_t * a, void *handle) +{ + u8 *s = 0; + int i; + u32 acl_index = clib_net_to_host_u32 (a->acl_index); + u32 count = clib_net_to_host_u32 (a->count); + if (count > 0x100000) + { + s = format (s, "WARN: macip_acl_add_replace count endianness wrong? Fixup to avoid long loop.\n"); + count = a->count; + } + + s = format (s, "SCRIPT: macip_acl_add_replace %d count %d ", + acl_index, count); + if (a->tag[0]) + s = format (s, "tag %s ", a->tag); + + s = format (s, "count %d \\\n", count); + + PRINT_S; + + for (i = 0; i < count; i++) + vl_api_macip_acl_rule_t_print (&a->r[i], handle); + + s = format (0, "\n"); + PRINT_S; + + return handle; +} static inline void * vl_api_acl_interface_set_acl_list_t_print (vl_api_acl_interface_set_acl_list_t @@ -299,6 +360,30 @@ vl_api_acl_interface_set_acl_list_t_print (vl_api_acl_interface_set_acl_list_t return handle; } +static inline void * +vl_api_acl_interface_set_etype_whitelist_t_print (vl_api_acl_interface_set_etype_whitelist_t + * a, void *handle) +{ + u8 *s; + int i; + + s = format + (0, "SCRIPT: acl_interface_set_etype_whitelist sw_if_index %d count %d\n", + clib_net_to_host_u32 (a->sw_if_index), (u32) a->count); + + s = format (s, " input "); + + for (i = 0; i < a->count; i++) + { + if (i == a->n_input) + s = format (s, "output "); + s = format (s, "%x ", clib_net_to_host_u16 (a->whitelist[i])); + } + + PRINT_S; + return handle; +} + static inline void * vl_api_acl_interface_add_del_t_print (vl_api_acl_interface_add_del_t * a, void *handle)