X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vpp%2Fvpp-api%2Fcustom_dump.c;h=98598ce3b77d0a5e5a5f3387403190d96c97ee0c;hb=refs%2Fchanges%2F92%2F3092%2F2;hp=e97a2c179c4aea5be8fe1198c3dc9bae082d2c98;hpb=d1408c86834bcace2069aa2915522eda22be12ec;p=vpp.git diff --git a/vpp/vpp-api/custom_dump.c b/vpp/vpp-api/custom_dump.c index e97a2c179c4..98598ce3b77 100644 --- a/vpp/vpp-api/custom_dump.c +++ b/vpp/vpp-api/custom_dump.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include @@ -728,6 +728,16 @@ static void *vl_api_create_subif_t_print foreach_create_subif_bit; #undef _ + FINISH; +} + +static void *vl_api_delete_subif_t_print + (vl_api_delete_subif_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: delete_subif "); + s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); FINISH; } @@ -1264,6 +1274,7 @@ static void *vl_api_classify_set_interface_l2_tables_t_print s = format (s, "ip4-table %d ", ntohl (mp->ip4_table_index)); s = format (s, "ip6-table %d ", ntohl (mp->ip6_table_index)); s = format (s, "other-table %d ", ntohl (mp->other_table_index)); + s = format (s, "is-input %d ", mp->is_input); FINISH; } @@ -1380,13 +1391,20 @@ static void *vl_api_vxlan_add_del_tunnel_t_print s = format (0, "SCRIPT: vxlan_add_del_tunnel "); - s = format (s, "dst %U ", format_ip46_address, - (ip46_address_t *) & (mp->dst_address), - mp->is_ipv6 ? IP46_TYPE_IP6 : IP46_TYPE_IP4); - - s = format (s, "src %U ", format_ip46_address, - (ip46_address_t *) & (mp->src_address), - mp->is_ipv6 ? IP46_TYPE_IP6 : IP46_TYPE_IP4); + if (mp->is_ipv6) + { + s = format (s, "src %U ", format_ip6_address, + (ip6_address_t *) mp->src_address); + s = format (s, "dst %U ", format_ip6_address, + (ip6_address_t *) mp->dst_address); + } + else + { + s = format (s, "src %U ", format_ip4_address, + (ip4_address_t *) mp->src_address); + s = format (s, "dst %U ", format_ip4_address, + (ip4_address_t *) mp->dst_address); + } if (mp->encap_vrf_id) s = format (s, "encap-vrf-id %d ", ntohl (mp->encap_vrf_id)); @@ -1395,6 +1413,9 @@ static void *vl_api_vxlan_add_del_tunnel_t_print s = format (s, "vni %d ", ntohl (mp->vni)); + if (mp->is_add == 0) + s = format (s, "del "); + if (mp->is_add == 0) s = format (s, "del "); @@ -1428,6 +1449,9 @@ static void *vl_api_gre_add_del_tunnel_t_print (ip46_address_t *) & (mp->src_address), mp->is_ipv6 ? IP46_TYPE_IP6 : IP46_TYPE_IP4); + if (mp->teb) + s = format (s, "teb "); + if (mp->outer_fib_id) s = format (s, "outer-fib-id %d ", ntohl (mp->outer_fib_id)); @@ -1603,6 +1627,16 @@ static void *vl_api_cli_request_t_print FINISH; } +static void *vl_api_cli_inband_t_print + (vl_api_cli_inband_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: cli_inband "); + + FINISH; +} + static void *vl_api_memclnt_create_t_print (vl_api_memclnt_create_t * mp, void *handle) { @@ -1691,6 +1725,20 @@ static void *vl_api_want_ip4_arp_events_t_print FINISH; } +static void *vl_api_want_ip6_nd_events_t_print + (vl_api_want_ip6_nd_events_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: want_ip6_nd_events "); + s = format (s, "pid %d address %U ", mp->pid, + format_ip6_address, mp->address); + if (mp->enable_disable == 0) + s = format (s, "del "); + + FINISH; +} + static void *vl_api_input_acl_set_interface_t_print (vl_api_input_acl_set_interface_t * mp, void *handle) { @@ -2051,12 +2099,12 @@ static void *vl_api_classify_session_dump_t_print FINISH; } -static void *vl_api_ipfix_enable_t_print - (vl_api_ipfix_enable_t * mp, void *handle) +static void *vl_api_set_ipfix_exporter_t_print + (vl_api_set_ipfix_exporter_t * mp, void *handle) { u8 *s; - s = format (0, "SCRIPT: ipfix_enable "); + s = format (0, "SCRIPT: set_ipfix_exporter "); s = format (s, "collector-address %U ", format_ip4_address, (ip4_address_t *) mp->collector_address); @@ -2066,16 +2114,64 @@ static void *vl_api_ipfix_enable_t_print s = format (s, "vrf-id %d ", ntohl (mp->vrf_id)); s = format (s, "path-mtu %d ", ntohl (mp->path_mtu)); s = format (s, "template-interval %d ", ntohl (mp->template_interval)); + s = format (s, "udp-checksum %d ", mp->udp_checksum); + + FINISH; +} + +static void *vl_api_ipfix_exporter_dump_t_print + (vl_api_ipfix_exporter_dump_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: ipfix_exporter_dump "); + + FINISH; +} + +static void *vl_api_set_ipfix_classify_stream_t_print + (vl_api_set_ipfix_classify_stream_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: set_ipfix_classify_stream "); + + s = format (s, "domain-id %d ", ntohl (mp->domain_id)); + s = format (s, "src-port %d ", ntohs (mp->src_port)); + + FINISH; +} + +static void *vl_api_ipfix_classify_stream_dump_t_print + (vl_api_ipfix_classify_stream_dump_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: ipfix_classify_stream_dump "); FINISH; } -static void *vl_api_ipfix_dump_t_print - (vl_api_ipfix_dump_t * mp, void *handle) +static void *vl_api_ipfix_classify_table_add_del_t_print + (vl_api_ipfix_classify_table_add_del_t * mp, void *handle) { u8 *s; - s = format (0, "SCRIPT: ipfix_dump "); + s = format (0, "SCRIPT: ipfix_classify_table_add_del "); + + s = format (s, "table-id %d ", ntohl (mp->table_id)); + s = format (s, "ip-version %d ", mp->ip_version); + s = format (s, "transport-protocol %d ", mp->transport_protocol); + + FINISH; +} + +static void *vl_api_ipfix_classify_table_dump_t_print + (vl_api_ipfix_classify_table_dump_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: ipfix_classify_table_dump "); FINISH; } @@ -2189,20 +2285,20 @@ static void *vl_api_ip_source_and_port_range_check_interface_add_del_t_print } static void *vl_api_lisp_enable_disable_t_print - (vl_api_lisp_enable_disable_t * mp, void * handle) + (vl_api_lisp_enable_disable_t * mp, void *handle) { - u8 * s; + u8 *s; s = format (0, "SCRIPT: lisp_enable_disable %s", - mp->is_en ? "enable" : "disable"); + mp->is_en ? "enable" : "disable"); FINISH; } static void *vl_api_lisp_gpe_add_del_iface_t_print - (vl_api_lisp_gpe_add_del_iface_t * mp, void * handle) + (vl_api_lisp_gpe_add_del_iface_t * mp, void *handle) { - u8 * s; + u8 *s; s = format (0, "SCRIPT: lisp_gpe_add_del_iface "); @@ -2214,9 +2310,9 @@ static void *vl_api_lisp_gpe_add_del_iface_t_print } static void *vl_api_lisp_pitr_set_locator_set_t_print - (vl_api_lisp_pitr_set_locator_set_t * mp, void * handle) + (vl_api_lisp_pitr_set_locator_set_t * mp, void *handle) { - u8 * s; + u8 *s; s = format (0, "SCRIPT: lisp_pitr_set_locator_set "); @@ -2228,10 +2324,11 @@ static void *vl_api_lisp_pitr_set_locator_set_t_print FINISH; } -static u8 * format_lisp_flat_eid (u8 * s, va_list * args) +static u8 * +format_lisp_flat_eid (u8 * s, va_list * args) { u32 type = va_arg (*args, u32); - u8 * eid = va_arg (*args, u8 *); + u8 *eid = va_arg (*args, u8 *); u32 eid_len = va_arg (*args, u32); switch (type) @@ -2246,35 +2343,23 @@ static u8 * format_lisp_flat_eid (u8 * s, va_list * args) return 0; } -static u8 * format_lisp_eid_vat (u8 * s, va_list * args) -{ - u32 type = va_arg (*args, u32); - u8 * eid = va_arg (*args, u8 *); - u32 eid_len = va_arg (*args, u32); - u8 * seid = va_arg (*args, u8 *); - u32 seid_len = va_arg (*args, u32); - u32 is_src_dst = va_arg (*args, u32); - - if (is_src_dst) - s = format (s, "%U|", format_lisp_flat_eid, type, seid, seid_len); - - s = format (s, "%U", format_lisp_flat_eid, type, eid, eid_len); - - return s; -} - /** Used for transferring locators via VPP API */ -typedef CLIB_PACKED(struct -{ - u8 is_ip4; /**< is locator an IPv4 address */ - u8 priority; /**< locator priority */ - u8 weight; /**< locator weight */ - u8 addr[16]; /**< IPv4/IPv6 address */ -}) rloc_t; +typedef CLIB_PACKED (struct + { + u8 is_ip4; + /**< is locator an IPv4 address */ + u8 priority; + /**< locator priority */ + u8 weight; + /**< locator weight */ + u8 addr[16]; + /**< IPv4/IPv6 address */ + }) rloc_t; -static u8 * format_rloc (u8 * s, va_list * args) +static u8 * +format_rloc (u8 * s, va_list * args) { - rloc_t * rloc = va_arg (*args, rloc_t *); + rloc_t *rloc = va_arg (*args, rloc_t *); if (rloc->is_ip4) s = format (s, "%U ", format_ip4_address, rloc->addr); @@ -2287,9 +2372,9 @@ static u8 * format_rloc (u8 * s, va_list * args) } static void *vl_api_lisp_add_del_remote_mapping_t_print - (vl_api_lisp_add_del_remote_mapping_t * mp, void * handle) + (vl_api_lisp_add_del_remote_mapping_t * mp, void *handle) { - u8 * s; + u8 *s; u32 i, rloc_num = 0; s = format (0, "SCRIPT: lisp_add_del_remote_mapping "); @@ -2300,44 +2385,49 @@ static void *vl_api_lisp_add_del_remote_mapping_t_print s = format (s, "%s ", mp->is_add ? "add" : "del"); s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni)); - s = format (s, "deid %U ", format_lisp_eid_vat, - mp->eid_type, mp->eid, mp->eid_len, mp->seid, mp->seid_len, - mp->is_src_dst); + s = format (s, "eid %U ", format_lisp_flat_eid, + mp->eid_type, mp->eid, mp->eid_len); - rloc_num = mp->rloc_num; + if (mp->is_src_dst) + { + s = format (s, "seid %U ", format_lisp_flat_eid, + mp->eid_type, mp->seid, mp->seid_len); + } + + rloc_num = clib_net_to_host_u32 (mp->rloc_num); if (0 == rloc_num) s = format (s, "action %d", mp->action); else { - rloc_t * rloc = (rloc_t *) mp->rlocs; + rloc_t *rloc = (rloc_t *) mp->rlocs; for (i = 0; i < rloc_num; i++) - s = format (s, "%U ", format_rloc, &rloc[i]); + s = format (s, "%U ", format_rloc, &rloc[i]); } FINISH; } static void *vl_api_lisp_add_del_adjacency_t_print - (vl_api_lisp_add_del_adjacency_t * mp, void * handle) + (vl_api_lisp_add_del_adjacency_t * mp, void *handle) { - u8 * s; + u8 *s; s = format (0, "SCRIPT: lisp_add_del_adjacency "); s = format (s, "%s ", mp->is_add ? "add" : "del"); s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni)); s = format (s, "deid %U seid %U ", - format_lisp_flat_eid, mp->eid_type, mp->deid, mp->deid_len, - format_lisp_flat_eid, mp->eid_type, mp->seid, mp->seid_len); + format_lisp_flat_eid, mp->eid_type, mp->deid, mp->deid_len, + format_lisp_flat_eid, mp->eid_type, mp->seid, mp->seid_len); FINISH; } static void *vl_api_lisp_add_del_map_request_itr_rlocs_t_print - (vl_api_lisp_add_del_map_request_itr_rlocs_t * mp, void * handle) + (vl_api_lisp_add_del_map_request_itr_rlocs_t * mp, void *handle) { - u8 * s; + u8 *s; s = format (0, "SCRIPT: lisp_add_del_map_request_itr_rlocs "); @@ -2350,9 +2440,9 @@ static void *vl_api_lisp_add_del_map_request_itr_rlocs_t_print } static void *vl_api_lisp_eid_table_add_del_map_t_print - (vl_api_lisp_eid_table_add_del_map_t * mp, void * handle) + (vl_api_lisp_eid_table_add_del_map_t * mp, void *handle) { - u8 * s; + u8 *s; s = format (0, "SCRIPT: lisp_eid_table_add_del_map "); @@ -2361,15 +2451,15 @@ static void *vl_api_lisp_eid_table_add_del_map_t_print s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni)); s = format (s, "%s %d ", - mp->is_l2 ? "bd_index" : "vrf", - clib_net_to_host_u32 (mp->dp_table)); + mp->is_l2 ? "bd_index" : "vrf", + clib_net_to_host_u32 (mp->dp_table)); FINISH; } static void *vl_api_lisp_add_del_local_eid_t_print - (vl_api_lisp_add_del_local_eid_t * mp, void * handle) + (vl_api_lisp_add_del_local_eid_t * mp, void *handle) { - u8 * s; + u8 *s; s = format (0, "SCRIPT: lisp_add_del_local_eid "); @@ -2378,15 +2468,15 @@ static void *vl_api_lisp_add_del_local_eid_t_print s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni)); s = format (s, "eid %U ", format_lisp_flat_eid, mp->eid_type, mp->eid, - mp->prefix_len); + mp->prefix_len); s = format (s, "locator-set %s ", mp->locator_set_name); FINISH; } static void *vl_api_lisp_gpe_add_del_fwd_entry_t_print - (vl_api_lisp_gpe_add_del_fwd_entry_t * mp, void * handle) + (vl_api_lisp_gpe_add_del_fwd_entry_t * mp, void *handle) { - u8 * s; + u8 *s; s = format (0, "SCRIPT: lisp_gpe_add_del_fwd_entry TODO"); @@ -2394,9 +2484,9 @@ static void *vl_api_lisp_gpe_add_del_fwd_entry_t_print } static void *vl_api_lisp_add_del_map_resolver_t_print - (vl_api_lisp_add_del_map_resolver_t * mp, void * handle) + (vl_api_lisp_add_del_map_resolver_t * mp, void *handle) { - u8 * s; + u8 *s; s = format (0, "SCRIPT: lisp_add_del_map_resolver "); @@ -2412,9 +2502,9 @@ static void *vl_api_lisp_add_del_map_resolver_t_print } static void *vl_api_lisp_gpe_enable_disable_t_print - (vl_api_lisp_gpe_enable_disable_t * mp, void * handle) + (vl_api_lisp_gpe_enable_disable_t * mp, void *handle) { - u8 * s; + u8 *s; s = format (0, "SCRIPT: lisp_gpe_enable_disable "); @@ -2423,28 +2513,31 @@ static void *vl_api_lisp_gpe_enable_disable_t_print FINISH; } -typedef CLIB_PACKED(struct -{ - u32 sw_if_index; /**< locator sw_if_index */ - u8 priority; /**< locator priority */ - u8 weight; /**< locator weight */ -}) ls_locator_t; +typedef CLIB_PACKED (struct + { + u32 sw_if_index; + /**< locator sw_if_index */ + u8 priority; + /**< locator priority */ + u8 weight; + /**< locator weight */ + }) ls_locator_t; static u8 * format_locator (u8 * s, va_list * args) { - ls_locator_t * l = va_arg (*args, ls_locator_t *); + ls_locator_t *l = va_arg (*args, ls_locator_t *); return format (s, "sw_if_index %d p %d w %d", - l->sw_if_index, l->priority, l->weight); + l->sw_if_index, l->priority, l->weight); } static void *vl_api_lisp_add_del_locator_set_t_print - (vl_api_lisp_add_del_locator_set_t * mp, void * handle) + (vl_api_lisp_add_del_locator_set_t * mp, void *handle) { - u8 * s; + u8 *s; u32 loc_num = 0, i; - ls_locator_t * locs; + ls_locator_t *locs; s = format (0, "SCRIPT: lisp_add_del_locator_set "); @@ -2453,7 +2546,7 @@ static void *vl_api_lisp_add_del_locator_set_t_print s = format (s, "locator-set %s ", mp->locator_set_name); - loc_num = mp->locator_num; + loc_num = clib_net_to_host_u32 (mp->locator_num); locs = (ls_locator_t *) mp->locators; for (i = 0; i < loc_num; i++) @@ -2463,9 +2556,9 @@ static void *vl_api_lisp_add_del_locator_set_t_print } static void *vl_api_lisp_add_del_locator_t_print - (vl_api_lisp_add_del_locator_t * mp, void * handle) + (vl_api_lisp_add_del_locator_t * mp, void *handle) { - u8 * s; + u8 *s; s = format (0, "SCRIPT: lisp_add_del_locator "); @@ -2480,21 +2573,37 @@ static void *vl_api_lisp_add_del_locator_t_print } static void *vl_api_lisp_locator_set_dump_t_print - (vl_api_lisp_locator_set_dump_t * mp, void * handle) + (vl_api_lisp_locator_set_dump_t * mp, void *handle) { - u8 * s; + u8 *s; s = format (0, "SCRIPT: lisp_locator_set_dump "); + if (mp->filter == 1) + s = format (s, "local"); + else if (mp->filter == 2) + s = format (s, "remote"); - /* not possible to reconstruct original VAT command */ + FINISH; +} + +static void *vl_api_lisp_locator_dump_t_print + (vl_api_lisp_locator_dump_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: lisp_locator_dump "); + if (mp->is_index_set) + s = format (s, "ls_index %d", clib_net_to_host_u32 (mp->ls_index)); + else + s = format (s, "ls_name %s", mp->ls_name); FINISH; } static void *vl_api_lisp_eid_table_dump_t_print - (vl_api_lisp_eid_table_dump_t * mp, void * handle) + (vl_api_lisp_eid_table_dump_t * mp, void *handle) { - u8 * s; + u8 *s; s = format (0, "SCRIPT: lisp_eid_table_dump "); @@ -2502,23 +2611,74 @@ static void *vl_api_lisp_eid_table_dump_t_print { s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni)); s = format (s, "eid %U ", format_lisp_flat_eid, mp->eid_type, - mp->eid, mp->prefix_length); + mp->eid, mp->prefix_length); switch (mp->filter) - { - case 1: - s = format (s, "local "); - break; - case 2: - s = format (s, "remote "); - break; - } + { + case 1: + s = format (s, "local "); + break; + case 2: + s = format (s, "remote "); + break; + } } FINISH; } +static void *vl_api_lisp_eid_table_map_dump_t_print + (vl_api_lisp_eid_table_map_dump_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: lisp_eid_table_map_dump "); + + if (mp->is_l2) + s = format (s, "l2"); + else + s = format (s, "l3"); + + FINISH; +} + +static void *vl_api_ipsec_gre_add_del_tunnel_t_print + (vl_api_ipsec_gre_add_del_tunnel_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: ipsec_gre_add_del_tunnel "); + + s = format (s, "dst %U ", format_ip4_address, + (ip4_address_t *) & (mp->dst_address)); + + s = format (s, "src %U ", format_ip4_address, + (ip4_address_t *) & (mp->src_address)); + + s = format (s, "local_sa %d ", ntohl (mp->local_sa_id)); + + s = format (s, "remote_sa %d ", ntohl (mp->remote_sa_id)); + + if (mp->is_add == 0) + s = format (s, "del "); + + FINISH; +} + +static void *vl_api_ipsec_gre_tunnel_dump_t_print + (vl_api_ipsec_gre_tunnel_dump_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: ipsec_gre_tunnel_dump "); + + if (mp->sw_if_index != ~0) + s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); + + FINISH; +} + #define foreach_custom_print_no_arg_function \ -_(lisp_eid_table_map_dump) \ +_(lisp_eid_table_vni_dump) \ _(lisp_map_resolver_dump) \ _(lisp_gpe_tunnel_dump) @@ -2532,7 +2692,6 @@ static void * vl_api_ ## f ## _t_print \ } foreach_custom_print_no_arg_function #undef _ - #define foreach_custom_print_function \ _(CREATE_LOOPBACK, create_loopback) \ _(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags) \ @@ -2603,6 +2762,7 @@ _(SW_INTERFACE_DUMP, sw_interface_dump) \ _(CONTROL_PING, control_ping) \ _(WANT_INTERFACE_EVENTS, want_interface_events) \ _(CLI_REQUEST, cli_request) \ +_(CLI_INBAND, cli_inband) \ _(MEMCLNT_CREATE, memclnt_create) \ _(SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump) \ _(SHOW_VERSION, show_version) \ @@ -2611,6 +2771,7 @@ _(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel) \ _(VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump) \ _(INTERFACE_NAME_RENUMBER, interface_name_renumber) \ _(WANT_IP4_ARP_EVENTS, want_ip4_arp_events) \ +_(WANT_IP6_ND_EVENTS, want_ip6_nd_events) \ _(INPUT_ACL_SET_INTERFACE, input_acl_set_interface) \ _(IP_ADDRESS_DUMP, ip_address_dump) \ _(IP_DUMP, ip_dump) \ @@ -2629,8 +2790,12 @@ _(CLASSIFY_TABLE_IDS,classify_table_ids) \ _(CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface) \ _(CLASSIFY_TABLE_INFO,classify_table_info) \ _(CLASSIFY_SESSION_DUMP,classify_session_dump) \ -_(IPFIX_ENABLE,ipfix_enable) \ -_(IPFIX_DUMP,ipfix_dump) \ +_(SET_IPFIX_EXPORTER, set_ipfix_exporter) \ +_(IPFIX_EXPORTER_DUMP, ipfix_exporter_dump) \ +_(SET_IPFIX_CLASSIFY_STREAM, set_ipfix_classify_stream) \ +_(IPFIX_CLASSIFY_STREAM_DUMP, ipfix_classify_stream_dump) \ +_(IPFIX_CLASSIFY_TABLE_ADD_DEL, ipfix_classify_table_add_del) \ +_(IPFIX_CLASSIFY_TABLE_DUMP, ipfix_classify_table_dump) \ _(GET_NEXT_INDEX, get_next_index) \ _(PG_CREATE_INTERFACE,pg_create_interface) \ _(PG_CAPTURE, pg_capture) \ @@ -2659,12 +2824,15 @@ _(LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver) \ _(LISP_ADD_DEL_LOCATOR, lisp_add_del_locator) \ _(LISP_EID_TABLE_DUMP, lisp_eid_table_dump) \ _(LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump) \ +_(LISP_EID_TABLE_VNI_DUMP, lisp_eid_table_vni_dump) \ _(LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump) \ _(LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump) \ -_(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump) - - -void +_(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump) \ +_(LISP_LOCATOR_DUMP, lisp_locator_dump) \ +_(IPSEC_GRE_ADD_DEL_TUNNEL, ipsec_gre_add_del_tunnel) \ +_(IPSEC_GRE_TUNNEL_DUMP, ipsec_gre_tunnel_dump) \ +_(DELETE_SUBIF, delete_subif) + void vl_msg_api_custom_dump_configure (api_main_t * am) { #define _(n,f) am->msg_print_handlers[VL_API_##n] \