X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fapi%2Fcustom_dump.c;h=622bd66a02c4cc30ecb970ef7a36a1d5b8bf402e;hb=43b512cac;hp=41a24ef5a345e99393c44a57e897d0b422bdb067;hpb=e88865d7bc9cd45b044f8aeadf1916c38e0eb165;p=vpp.git diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c index 41a24ef5a34..622bd66a02c 100644 --- a/src/vpp/api/custom_dump.c +++ b/src/vpp/api/custom_dump.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -35,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -43,6 +45,7 @@ #include #include +#include #include #include @@ -515,78 +518,23 @@ static void *vl_api_bd_ip_mac_add_del_t_print FINISH; } -static void *vl_api_bd_ip_mac_dump_t_print - (vl_api_bd_ip_mac_dump_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: bd_ip_mac_dump "); - - FINISH; -} - -static void *vl_api_tap_connect_t_print - (vl_api_tap_connect_t * mp, void *handle) -{ - u8 *s; - u8 null_mac[6]; - - clib_memset (null_mac, 0, sizeof (null_mac)); - - s = format (0, "SCRIPT: tap_connect "); - s = format (s, "tapname %s ", mp->tap_name); - if (mp->use_random_mac) - s = format (s, "random-mac "); - if (mp->tag[0]) - s = format (s, "tag %s ", mp->tag); - if (memcmp (mp->mac_address, null_mac, 6)) - s = format (s, "mac %U ", format_ethernet_address, mp->mac_address); - if (mp->ip4_address_set) - s = format (s, "address %U/%d ", format_ip4_address, mp->ip4_address, - mp->ip4_mask_width); - if (mp->ip6_address_set) - s = format (s, "address %U/%d ", format_ip6_address, mp->ip6_address, - mp->ip6_mask_width); - FINISH; -} - -static void *vl_api_tap_modify_t_print - (vl_api_tap_modify_t * mp, void *handle) -{ - u8 *s; - u8 null_mac[6]; - - clib_memset (null_mac, 0, sizeof (null_mac)); - - s = format (0, "SCRIPT: tap_modify "); - s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); - s = format (s, "tapname %s ", mp->tap_name); - if (mp->use_random_mac) - s = format (s, "random-mac "); - - if (memcmp (mp->mac_address, null_mac, 6)) - s = format (s, "mac %U ", format_ethernet_address, mp->mac_address); - - FINISH; -} - -static void *vl_api_tap_delete_t_print - (vl_api_tap_delete_t * mp, void *handle) +static void *vl_api_bd_ip_mac_flush_t_print + (vl_api_bd_ip_mac_flush_t * mp, void *handle) { u8 *s; - s = format (0, "SCRIPT: tap_delete "); - s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); + s = format (0, "SCRIPT: bd_ip_mac_flush "); + s = format (s, "bd_id %d ", ntohl (mp->bd_id)); FINISH; } -static void *vl_api_sw_interface_tap_dump_t_print - (vl_api_sw_interface_tap_dump_t * mp, void *handle) +static void *vl_api_bd_ip_mac_dump_t_print + (vl_api_bd_ip_mac_dump_t * mp, void *handle) { u8 *s; - s = format (0, "SCRIPT: sw_interface_tap_dump "); + s = format (0, "SCRIPT: bd_ip_mac_dump "); FINISH; } @@ -651,6 +599,45 @@ static void *vl_api_sw_interface_tap_v2_dump_t_print FINISH; } +static void *vl_api_virtio_pci_create_t_print + (vl_api_virtio_pci_create_t * mp, void *handle) +{ + u8 *s; + u8 null_mac[6]; + + clib_memset (null_mac, 0, sizeof (null_mac)); + + s = format (0, "SCRIPT: virtio_pci_create "); + s = format (s, "pci_addr %U ", format_vlib_pci_addr, ntohl (mp->pci_addr)); + if (memcmp (mp->mac_address, null_mac, 6)) + s = format (s, "mac-address %U ", + format_ethernet_address, mp->mac_address); + if (mp->features) + s = format (s, "features 0x%llx ", clib_net_to_host_u64 (mp->features)); + FINISH; +} + +static void *vl_api_virtio_pci_delete_t_print + (vl_api_virtio_pci_delete_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: virtio_pci_delete "); + s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); + + FINISH; +} + +static void *vl_api_sw_interface_virtio_pci_dump_t_print + (vl_api_sw_interface_virtio_pci_dump_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: sw_interface_virtio_pci_dump "); + + FINISH; +} + static void *vl_api_bond_create_t_print (vl_api_bond_create_t * mp, void *handle) { @@ -664,9 +651,11 @@ static void *vl_api_bond_create_t_print s = format (s, "mac-address %U ", format_ethernet_address, mp->mac_address); if (mp->mode) - s = format (s, "mode %U", format_bond_mode, mp->mode); + s = format (s, "mode %U ", format_bond_mode, mp->mode); if (mp->lb) - s = format (s, "lb %U", format_bond_load_balance, mp->lb); + s = format (s, "lb %U ", format_bond_load_balance, mp->lb); + if (mp->id != ~0) + s = format (s, "id %u ", ntohl (mp->id)); FINISH; } @@ -906,11 +895,10 @@ static void *vl_api_proxy_arp_add_del_t_print s = format (0, "SCRIPT: proxy_arp_add_del "); s = format (s, "%U - %U ", - format_ip4_address, mp->proxy.low_address, - format_ip4_address, mp->proxy.hi_address); + format_vl_api_ip4_address, mp->proxy.low, + format_vl_api_ip4_address, mp->proxy.hi); - if (mp->proxy.vrf_id) - s = format (s, "vrf %d ", ntohl (mp->proxy.vrf_id)); + s = format (s, "table %d ", ntohl (mp->proxy.table_id)); if (mp->is_add == 0) s = format (s, "del "); @@ -1029,31 +1017,21 @@ static void *vl_api_ip_neighbor_add_del_t_print (vl_api_ip_neighbor_add_del_t * mp, void *handle) { u8 *s; - u8 null_mac[6]; - - clib_memset (null_mac, 0, sizeof (null_mac)); s = format (0, "SCRIPT: ip_neighbor_add_del "); - s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); + s = format (s, "sw_if_index %d ", ntohl (mp->neighbor.sw_if_index)); - if (mp->is_static) + if (IP_API_NEIGHBOR_FLAG_STATIC & ntohl (mp->neighbor.flags)) s = format (s, "is_static "); - if (mp->is_no_adj_fib) + if (IP_API_NEIGHBOR_FLAG_NO_FIB_ENTRY & ntohl (mp->neighbor.flags)) s = format (s, "is_no_fib_entry "); - if (memcmp (mp->mac_address, null_mac, 6)) - s = format (s, "mac %U ", format_ethernet_address, mp->mac_address); + s = format (s, "mac %U ", format_vl_api_mac_address, + &mp->neighbor.mac_address); - if (mp->is_ipv6) - s = - format (s, "dst %U ", format_ip6_address, - (ip6_address_t *) mp->dst_address); - else - s = - format (s, "dst %U ", format_ip4_address, - (ip4_address_t *) mp->dst_address); + s = format (s, "dst %U ", format_vl_api_address, &mp->neighbor.ip_address); if (mp->is_add == 0) s = format (s, "del "); @@ -1061,6 +1039,7 @@ static void *vl_api_ip_neighbor_add_del_t_print FINISH; } + static void *vl_api_create_vlan_subif_t_print (vl_api_create_vlan_subif_t * mp, void *handle) { @@ -1278,8 +1257,7 @@ static void *vl_api_sw_interface_ip6nd_ra_prefix_t_print s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); - s = format (s, "%U/%d ", format_ip6_address, mp->address, - mp->address_length); + s = format (s, "%U ", format_vl_api_prefix, &mp->prefix); s = format (s, "val_life %d ", ntohl (mp->val_lifetime)); @@ -1856,6 +1834,55 @@ static void *vl_api_vxlan_tunnel_dump_t_print FINISH; } +static void *vl_api_vxlan_gbp_tunnel_add_del_t_print + (vl_api_vxlan_gbp_tunnel_add_del_t * mp, void *handle) +{ + u8 *s; + s = format (0, "SCRIPT: vxlan_gbp_tunnel_add_del "); + + if (mp->is_add) + s = format (s, "add "); + else + s = format (s, "del "); + + s = format (s, "instance %d ", ntohl (mp->tunnel.instance)); + s = format (s, "src %U ", format_vl_api_address, &mp->tunnel.src); + s = format (s, "dst %U ", format_vl_api_address, &mp->tunnel.dst); + s = + format (s, "mcast_sw_if_index %d ", ntohl (mp->tunnel.mcast_sw_if_index)); + s = format (s, "encap_table_id %d ", ntohl (mp->tunnel.encap_table_id)); + s = format (s, "vni %d ", ntohl (mp->tunnel.vni)); + s = format (s, "sw_if_index %d ", ntohl (mp->tunnel.sw_if_index)); + + FINISH; +} + +static void *vl_api_vxlan_gbp_tunnel_dump_t_print + (vl_api_vxlan_gbp_tunnel_dump_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: vxlan_gbp_tunnel_dump "); + + s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); + + FINISH; +} + +static void *vl_api_sw_interface_set_vxlan_gbp_bypass_t_print + (vl_api_sw_interface_set_vxlan_gbp_bypass_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: sw_interface_set_vxlan_gbp_bypass "); + + s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); + s = format (s, "%s ", (mp->is_ipv6 != 0) ? "ipv6" : "ipv4"); + s = format (s, "%s ", (mp->enable != 0) ? "enable" : "disable"); + + FINISH; +} + static void *vl_api_geneve_add_del_tunnel_t_print (vl_api_geneve_add_del_tunnel_t * mp, void *handle) { @@ -1900,31 +1927,26 @@ static void *vl_api_geneve_tunnel_dump_t_print FINISH; } -static void *vl_api_gre_add_del_tunnel_t_print - (vl_api_gre_add_del_tunnel_t * mp, void *handle) +static void *vl_api_gre_tunnel_add_del_t_print + (vl_api_gre_tunnel_add_del_t * mp, void *handle) { u8 *s; - s = format (0, "SCRIPT: gre_add_del_tunnel "); + s = format (0, "SCRIPT: gre_tunnel_add_del "); - 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, "dst %U ", format_vl_api_address, &mp->tunnel.dst); + s = format (s, "src %U ", format_vl_api_address, &mp->tunnel.src); - s = format (s, "src %U ", format_ip46_address, - (ip46_address_t *) & (mp->src_address), - mp->is_ipv6 ? IP46_TYPE_IP6 : IP46_TYPE_IP4); - - s = format (s, "instance %d ", ntohl (mp->instance)); + s = format (s, "instance %d ", ntohl (mp->tunnel.instance)); - if (mp->tunnel_type == GRE_TUNNEL_TYPE_TEB) + if (mp->tunnel.type == GRE_TUNNEL_TYPE_TEB) s = format (s, "teb "); - if (mp->tunnel_type == GRE_TUNNEL_TYPE_ERSPAN) - s = format (s, "erspan %d ", ntohs (mp->session_id)); + if (mp->tunnel.type == GRE_TUNNEL_TYPE_ERSPAN) + s = format (s, "erspan %d ", ntohs (mp->tunnel.session_id)); - if (mp->outer_fib_id) - s = format (s, "outer-fib-id %d ", ntohl (mp->outer_fib_id)); + if (mp->tunnel.outer_fib_id) + s = format (s, "outer-fib-id %d ", ntohl (mp->tunnel.outer_fib_id)); if (mp->is_add == 0) s = format (s, "del "); @@ -2109,10 +2131,10 @@ static void *vl_api_cli_inband_t_print { u8 *s; u8 *cmd = 0; - u32 length = ntohl (mp->length); + u32 length = vl_api_string_len (&mp->cmd); vec_validate (cmd, length); - clib_memcpy (cmd, mp->cmd, length); + clib_memcpy (cmd, vl_api_from_api_string (&mp->cmd), length); s = format (0, "SCRIPT: exec %v ", cmd); @@ -2229,10 +2251,7 @@ static void *vl_api_ip_probe_neighbor_t_print s = format (0, "SCRIPT: ip_probe_neighbor "); s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); - if (mp->is_ipv6) - s = format (s, "address %U ", format_ip6_address, &mp->dst_address); - else - s = format (s, "address %U ", format_ip4_address, &mp->dst_address); + s = format (s, "address %U ", format_vl_api_address, &mp->dst); FINISH; } @@ -2275,7 +2294,7 @@ static void *vl_api_want_ip4_arp_events_t_print s = format (0, "SCRIPT: want_ip4_arp_events "); s = format (s, "pid %d address %U ", ntohl (mp->pid), - format_ip4_address, &mp->address); + format_ip4_address, mp->ip); if (mp->enable_disable == 0) s = format (s, "del "); @@ -2289,7 +2308,7 @@ static void *vl_api_want_ip6_nd_events_t_print s = format (0, "SCRIPT: want_ip6_nd_events "); s = format (s, "pid %d address %U ", ntohl (mp->pid), - format_ip6_address, mp->address); + format_vl_api_ip6_address, mp->ip); if (mp->enable_disable == 0) s = format (s, "del "); @@ -2879,12 +2898,7 @@ static void *vl_api_ip_source_and_port_range_check_add_del_t_print int i; s = format (0, "SCRIPT: ip_source_and_port_range_check_add_del "); - if (mp->is_ipv6) - s = format (s, "%U/%d ", format_ip6_address, mp->address, - mp->mask_length); - else - s = format (s, "%U/%d ", format_ip4_address, mp->address, - mp->mask_length); + s = format (s, "%U ", format_vl_api_prefix, &mp->prefix); for (i = 0; i < mp->number_of_ranges; i++) { @@ -3287,22 +3301,62 @@ static void *vl_api_lisp_eid_table_map_dump_t_print FINISH; } -static void *vl_api_ipsec_gre_add_del_tunnel_t_print - (vl_api_ipsec_gre_add_del_tunnel_t * mp, void *handle) +static void *vl_api_ipsec_tunnel_if_add_del_t_print + (vl_api_ipsec_tunnel_if_add_del_t * mp, void *handle) { u8 *s; - s = format (0, "SCRIPT: ipsec_gre_add_del_tunnel "); + s = format (0, "SCRIPT: ipsec_tunnel_if_add_del "); - s = format (s, "dst %U ", format_ip4_address, - (ip4_address_t *) & (mp->dst_address)); + if (mp->esn) + s = format (s, "esn"); + if (mp->anti_replay) + s = format (s, "anti-replay"); + if (mp->udp_encap) + s = format (s, "udp-encap"); - s = format (s, "src %U ", format_ip4_address, - (ip4_address_t *) & (mp->src_address)); + s = format (s, "local-ip %U ", format_vl_api_address, &mp->remote_ip); - s = format (s, "local_sa %d ", ntohl (mp->local_sa_id)); + s = format (s, "remote-ip %U ", format_vl_api_address, &mp->local_ip); + s = format (s, "tx-table-id %d ", ntohl (mp->tx_table_id)); - s = format (s, "remote_sa %d ", ntohl (mp->remote_sa_id)); + s = format (s, "local-spi %d ", ntohl (mp->local_spi)); + + s = format (s, "remote-spi %d ", ntohl (mp->remote_spi)); + + s = format (s, "local-crypto-key-len %d ", mp->local_crypto_key_len); + s = format (s, "local-crypto-key %U ", format_hex_bytes, + mp->local_crypto_key, mp->local_crypto_key_len, 0); + s = format (s, "remote-crypto-key-len %d ", mp->remote_crypto_key_len); + s = format (s, "remote-crypto-key %U ", format_hex_bytes, + mp->remote_crypto_key, mp->remote_crypto_key_len, 0); + s = format (s, "local-integ-key-len %d ", mp->local_integ_key_len); + s = format (s, "local-integ-key %U ", format_hex_bytes, + mp->local_integ_key, mp->local_integ_key_len, 0); + s = format (s, "remote-integ-key-len %d ", mp->remote_integ_key_len); + s = format (s, "remote-integ-key %U ", format_hex_bytes, + mp->remote_integ_key, mp->remote_integ_key_len, 0); + + if (mp->is_add == 0) + s = format (s, "del "); + + FINISH; +} + +static void *vl_api_ipsec_gre_tunnel_add_del_t_print + (vl_api_ipsec_gre_tunnel_add_del_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: ipsec_gre_tunnel_add_del "); + + s = format (s, "dst %U ", format_vl_api_ip4_address, mp->tunnel.dst); + + s = format (s, "src %U ", format_vl_api_ip4_address, mp->tunnel.src); + + s = format (s, "local_sa %d ", ntohl (mp->tunnel.local_sa_id)); + + s = format (s, "remote_sa %d ", ntohl (mp->tunnel.remote_sa_id)); if (mp->is_add == 0) s = format (s, "del "); @@ -3674,14 +3728,9 @@ static void *vl_api_ip_container_proxy_add_del_t_print { u8 *s; s = format (0, "SCRIPT: ip_container_proxy_add_del "); - if (mp->is_ip4) - s = format (s, "is_add %d address %U/%d sw_if_index %d", - mp->is_add, format_ip4_address, - (ip4_address_t *) mp->ip, mp->plen, mp->sw_if_index); - else - s = format (s, "is_add %d address %U/%d sw_if_index %d", - mp->is_add, format_ip6_address, - (ip6_address_t *) mp->ip, mp->plen, mp->sw_if_index); + s = format (s, "is_add %d prefix %U sw_if_index %d", + mp->is_add, format_vl_api_prefix, mp->sw_if_index); + FINISH; } @@ -3692,9 +3741,8 @@ static void *vl_api_qos_record_enable_disable_t_print s = format (0, "SCRIPT: qos_record_enable_disable "); s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); - s = - format (s, "input_source %U ", format_qos_source, - ntohl (mp->input_source)); + s = format (s, "input_source %U ", format_qos_source, + ntohl (mp->input_source)); if (!mp->enable) s = format (s, "disable "); @@ -3731,10 +3779,6 @@ _(SW_INTERFACE_SET_MPLS_ENABLE, sw_interface_set_mpls_enable) \ _(SW_INTERFACE_SET_VPATH, sw_interface_set_vpath) \ _(SW_INTERFACE_SET_VXLAN_BYPASS, sw_interface_set_vxlan_bypass) \ _(SW_INTERFACE_SET_GENEVE_BYPASS, sw_interface_set_geneve_bypass) \ -_(TAP_CONNECT, tap_connect) \ -_(TAP_MODIFY, tap_modify) \ -_(TAP_DELETE, tap_delete) \ -_(SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump) \ _(BOND_CREATE, bond_create) \ _(BOND_DELETE, bond_delete) \ _(BOND_ENSLAVE, bond_enslave) \ @@ -3796,7 +3840,7 @@ _(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump) \ _(VXLAN_OFFLOAD_RX, vxlan_offload_rx) \ _(GENEVE_ADD_DEL_TUNNEL, geneve_add_del_tunnel) \ _(GENEVE_TUNNEL_DUMP, geneve_tunnel_dump) \ -_(GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel) \ +_(GRE_TUNNEL_ADD_DEL, gre_tunnel_add_del) \ _(GRE_TUNNEL_DUMP, gre_tunnel_dump) \ _(L2_FIB_CLEAR_TABLE, l2_fib_clear_table) \ _(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter) \ @@ -3816,6 +3860,9 @@ _(SHOW_VERSION, show_version) \ _(L2_FIB_TABLE_DUMP, l2_fib_table_dump) \ _(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel) \ _(VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump) \ +_(VXLAN_GBP_TUNNEL_ADD_DEL, vxlan_gbp_tunnel_add_del) \ +_(VXLAN_GBP_TUNNEL_DUMP, vxlan_gbp_tunnel_dump) \ +_(SW_INTERFACE_SET_VXLAN_GBP_BYPASS, sw_interface_set_vxlan_gbp_bypass) \ _(INTERFACE_NAME_RENUMBER, interface_name_renumber) \ _(IP_PROBE_NEIGHBOR, ip_probe_neighbor) \ _(IP_SCAN_NEIGHBOR_ENABLE_DISABLE, ip_scan_neighbor_enable_disable) \ @@ -3827,6 +3874,7 @@ _(IP_ADDRESS_DUMP, ip_address_dump) \ _(IP_DUMP, ip_dump) \ _(DELETE_LOOPBACK, delete_loopback) \ _(BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del) \ +_(BD_IP_MAC_FLUSH, bd_ip_mac_flush) \ _(COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable) \ _(COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable) \ _(AF_PACKET_CREATE, af_packet_create) \ @@ -3887,7 +3935,8 @@ _(SHOW_LISP_RLOC_PROBE_STATE, show_lisp_rloc_probe_state) \ _(SHOW_LISP_MAP_REGISTER_STATE, show_lisp_map_register_state) \ _(LISP_RLOC_PROBE_ENABLE_DISABLE, lisp_rloc_probe_enable_disable) \ _(LISP_MAP_REGISTER_ENABLE_DISABLE, lisp_map_register_enable_disable) \ -_(IPSEC_GRE_ADD_DEL_TUNNEL, ipsec_gre_add_del_tunnel) \ +_(IPSEC_TUNNEL_IF_ADD_DEL, ipsec_tunnel_if_add_del) \ +_(IPSEC_GRE_TUNNEL_ADD_DEL, ipsec_gre_tunnel_add_del) \ _(IPSEC_GRE_TUNNEL_DUMP, ipsec_gre_tunnel_dump) \ _(DELETE_SUBIF, delete_subif) \ _(L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite) \