X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fapi%2Fcustom_dump.c;h=32354e77e59ce6aef95610f63ae0a326891b6b77;hb=50f0ac0f0;hp=99ad18978e5561aac75f39cb667a83b5c308c636;hpb=04e0bb2ff0f39dab45da01ecdbc7914035a36897;p=vpp.git diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c index 99ad18978e5..32354e77e59 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,18 +36,19 @@ #include #include #include +#include #include #include #include #include #include -#include -#include #include +#include #include #include +#include #include @@ -117,6 +119,37 @@ static void *vl_api_sw_interface_set_flags_t_print FINISH; } +static void *vl_api_sw_interface_set_rx_placement_t_print + (vl_api_sw_interface_set_rx_placement_t * mp, void *handle) +{ + u8 *s; + s = format (0, "SCRIPT: sw_interface_set_rx_placement "); + + s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); + + s = format (s, "queue %d ", ntohl (mp->queue_id)); + if (mp->is_main) + s = format (s, "main "); + else + s = format (s, "worker %d ", ntohl (mp->worker_id)); + + FINISH; +} + +static void *vl_api_sw_interface_rx_placement_dump_t_print + (vl_api_sw_interface_rx_placement_dump_t * mp, void *handle) +{ + u8 *s; + u32 sw_if_index = ntohl (mp->sw_if_index); + + s = format (0, "SCRIPT: sw_interface_rx_placement_dump "); + + if (sw_if_index != ~0) + s = format (s, "sw_if_index %d ", sw_if_index); + + FINISH; +} + static void *vl_api_sw_interface_event_t_print (vl_api_sw_interface_event_t * mp, void *handle) { @@ -285,8 +318,12 @@ static void *vl_api_sw_interface_set_l2_bridge_t_print if (mp->enable) { - s = format (s, "bd_id %d shg %d %senable ", ntohl (mp->bd_id), - mp->shg, ((mp->bvi) ? "bvi " : " ")); + s = format (s, "bd_id %d shg %d ", ntohl (mp->bd_id), mp->shg); + if (L2_API_PORT_TYPE_BVI == ntohl (mp->port_type)) + s = format (s, "bvi "); + if (L2_API_PORT_TYPE_UU_FWD == ntohl (mp->port_type)) + s = format (s, "uu-fwd "); + s = format (s, "enable"); } else s = format (s, "disable "); @@ -441,21 +478,21 @@ static void *vl_api_bridge_flags_t_print (vl_api_bridge_flags_t * mp, void *handle) { u8 *s; - u32 flags = ntohl (mp->feature_bitmap); + u32 flags = ntohl (mp->flags); s = format (0, "SCRIPT: bridge_flags "); s = format (s, "bd_id %d ", ntohl (mp->bd_id)); - if (flags & L2_LEARN) + if (flags & BRIDGE_API_FLAG_LEARN) s = format (s, "learn "); - if (flags & L2_FWD) + if (flags & BRIDGE_API_FLAG_FWD) s = format (s, "forward "); - if (flags & L2_FLOOD) + if (flags & BRIDGE_API_FLAG_FLOOD) s = format (s, "flood "); - if (flags & L2_UU_FLOOD) + if (flags & BRIDGE_API_FLAG_UU_FLOOD) s = format (s, "uu-flood "); - if (flags & L2_ARP_TERM) + if (flags & BRIDGE_API_FLAG_ARP_TERM) s = format (s, "arp-term "); if (mp->is_set == 0) @@ -472,82 +509,31 @@ static void *vl_api_bd_ip_mac_add_del_t_print s = format (0, "SCRIPT: bd_ip_mac_add_del "); s = format (s, "bd_id %d ", ntohl (mp->bd_id)); - if (mp->is_ipv6) - s = format (s, "%U ", format_ip6_address, - (ip6_address_t *) mp->ip_address); - else - s = format (s, "%U ", format_ip4_address, - (ip4_address_t *) mp->ip_address); - - s = format (s, "%U ", format_ethernet_address, mp->mac_address); + s = format (s, "%U ", format_vl_api_address, &mp->ip); + s = format (s, "%U ", format_vl_api_mac_address, &mp->mac); if (mp->is_add == 0) s = format (s, "del "); FINISH; } -static void *vl_api_tap_connect_t_print - (vl_api_tap_connect_t * mp, void *handle) -{ - u8 *s; - u8 null_mac[6]; - - 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) +static void *vl_api_bd_ip_mac_flush_t_print + (vl_api_bd_ip_mac_flush_t * mp, void *handle) { u8 *s; - u8 null_mac[6]; - - 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) -{ - 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; } @@ -558,10 +544,10 @@ static void *vl_api_tap_create_v2_t_print u8 *s; u8 null_mac[6]; - memset (null_mac, 0, sizeof (null_mac)); + clib_memset (null_mac, 0, sizeof (null_mac)); s = format (0, "SCRIPT: tap_create_v2 "); - s = format (s, "id %u ", mp->id); + s = format (s, "id %u ", ntohl (mp->id)); if (memcmp (mp->mac_address, null_mac, 6)) s = format (s, "mac-address %U ", format_ethernet_address, mp->mac_address); @@ -585,9 +571,9 @@ static void *vl_api_tap_create_v2_t_print if (mp->host_ip6_gw_set) s = format (s, "host-ip6-gw %U ", format_ip6_address, mp->host_ip6_addr); if (mp->tx_ring_sz) - s = format (s, "tx-ring-size %d ", mp->tx_ring_sz); + s = format (s, "tx-ring-size %u ", ntohs (mp->tx_ring_sz)); if (mp->rx_ring_sz) - s = format (s, "rx-ring-size %d ", mp->rx_ring_sz); + s = format (s, "rx-ring-size %u ", ntohs (mp->rx_ring_sz)); FINISH; } @@ -612,22 +598,65 @@ 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)); + if (mp->gso_enabled) + s = format (s, "gso-enabled"); + 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) { u8 *s; u8 null_mac[6]; - memset (null_mac, 0, sizeof (null_mac)); + clib_memset (null_mac, 0, sizeof (null_mac)); s = format (0, "SCRIPT: bond_create "); if (memcmp (mp->mac_address, null_mac, 6)) 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; } @@ -699,37 +728,37 @@ static void *vl_api_ip_add_del_route_t_print if (mp->is_add == 0) s = format (s, "del "); - if (mp->next_hop_sw_if_index) - s = format (s, "sw_if_index %d ", ntohl (mp->next_hop_sw_if_index)); - if (mp->is_ipv6) s = format (s, "%U/%d ", format_ip6_address, mp->dst_address, mp->dst_address_length); else s = format (s, "%U/%d ", format_ip4_address, mp->dst_address, mp->dst_address_length); + + if (mp->table_id != 0) + s = format (s, "vrf %d ", ntohl (mp->table_id)); + if (mp->is_local) s = format (s, "local "); else if (mp->is_drop) s = format (s, "drop "); else if (mp->is_classify) s = format (s, "classify %d", ntohl (mp->classify_table_index)); + else if (mp->next_hop_via_label != htonl (MPLS_LABEL_INVALID)) + s = format (s, "via via_label %d ", ntohl (mp->next_hop_via_label)); else { if (mp->is_ipv6) s = format (s, "via %U ", format_ip6_address, mp->next_hop_address); else s = format (s, "via %U ", format_ip4_address, mp->next_hop_address); - } + if (mp->next_hop_sw_if_index != ~0) + s = format (s, "sw_if_index %d ", ntohl (mp->next_hop_sw_if_index)); - if (mp->table_id != 0) - s = format (s, "vrf %d ", ntohl (mp->table_id)); + } if (mp->next_hop_weight != 1) - s = format (s, "weight %d ", mp->next_hop_weight); - - if (mp->is_multipath) - s = format (s, "multipath "); + s = format (s, "weight %d ", (u32) mp->next_hop_weight); if (mp->is_multipath) s = format (s, "multipath "); @@ -737,6 +766,125 @@ static void *vl_api_ip_add_del_route_t_print if (mp->next_hop_table_id) s = format (s, "lookup-in-vrf %d ", ntohl (mp->next_hop_table_id)); + if (mp->next_hop_n_out_labels) + { + u8 i; + for (i = 0; i < mp->next_hop_n_out_labels; i++) + { + s = format (s, "out-label %d ", + ntohl (mp->next_hop_out_label_stack[i].label)); + } + } + + FINISH; +} + +static void *vl_api_mpls_route_add_del_t_print + (vl_api_mpls_route_add_del_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: mpls_route_add_del "); + + if (mp->mr_is_add) + s = format (s, "add "); + else + s = format (s, "del "); + + s = format (s, "%d ", ntohl (mp->mr_label)); + + if (mp->mr_eos) + s = format (s, "eos "); + else + s = format (s, "non-eos "); + + + if (mp->mr_next_hop_proto == DPO_PROTO_IP4) + { + ip4_address_t ip4_null = {.as_u32 = 0, }; + if (memcmp (mp->mr_next_hop, &ip4_null, sizeof (ip4_null))) + s = format (s, "via %U ", format_ip4_address, mp->mr_next_hop); + else + s = format (s, "via lookup-in-ip4-table %d ", + ntohl (mp->mr_next_hop_table_id)); + } + else if (mp->mr_next_hop_proto == DPO_PROTO_IP6) + { + ip6_address_t ip6_null = { {0} + }; + if (memcmp (mp->mr_next_hop, &ip6_null, sizeof (ip6_null))) + s = format (s, "via %U ", format_ip6_address, mp->mr_next_hop); + else + s = format (s, "via lookup-in-ip6-table %d ", + ntohl (mp->mr_next_hop_table_id)); + } + else if (mp->mr_next_hop_proto == DPO_PROTO_ETHERNET) + { + s = format (s, "via l2-input-on "); + } + else if (mp->mr_next_hop_proto == DPO_PROTO_MPLS) + { + if (mp->mr_next_hop_via_label != htonl (MPLS_LABEL_INVALID)) + s = + format (s, "via via-label %d ", ntohl (mp->mr_next_hop_via_label)); + else + s = format (s, "via next-hop-table %d ", + ntohl (mp->mr_next_hop_table_id)); + } + if (mp->mr_next_hop_sw_if_index != ~0) + s = format (s, "sw_if_index %d ", ntohl (mp->mr_next_hop_sw_if_index)); + + if (mp->mr_next_hop_weight != 1) + s = format (s, "weight %d ", (u32) mp->mr_next_hop_weight); + + if (mp->mr_is_multipath) + s = format (s, "multipath "); + + if (mp->mr_is_classify) + s = format (s, "classify %d", ntohl (mp->mr_classify_table_index)); + + if (mp->mr_next_hop_n_out_labels) + { + u8 i; + for (i = 0; i < mp->mr_next_hop_n_out_labels; i++) + { + s = format (s, "out-label %d ", + ntohl (mp->mr_next_hop_out_label_stack[i].label)); + } + } + + FINISH; +} + +static void *vl_api_ip_table_add_del_t_print + (vl_api_ip_table_add_del_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: ip_table_add_del "); + if (mp->is_add) + s = format (s, "add "); + else + s = format (s, "del "); + if (mp->is_ipv6) + s = format (s, "ip6 "); + s = format (s, "table %d ", ntohl (mp->table_id)); + + FINISH; +} + +static void *vl_api_mpls_table_add_del_t_print + (vl_api_mpls_table_add_del_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: mpls_table_add_del "); + if (mp->mt_is_add) + s = format (s, "add "); + else + s = format (s, "del "); + s = format (s, "table %d ", ntohl (mp->mt_table_id)); + FINISH; } @@ -748,11 +896,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 "); @@ -781,19 +928,71 @@ static void *vl_api_mpls_tunnel_add_del_t_print s = format (0, "SCRIPT: mpls_tunnel_add_del "); - if (mp->mt_next_hop_sw_if_index) - s = format (s, "sw_if_index %d ", ntohl (mp->mt_next_hop_sw_if_index)); + if (mp->mt_is_add == 0) + s = format (s, "del sw_if_index %d ", ntohl (mp->mt_sw_if_index)); - if (mp->mt_next_hop_proto_is_ip4) - s = format (s, "%U ", format_ip4_address, mp->mt_next_hop); + mpls_label_t label = ntohl (mp->mt_next_hop_via_label); + if (label != MPLS_LABEL_INVALID) + s = format (s, "via-label %d ", label); + else if (mp->mt_next_hop_proto_is_ip4) + s = format (s, "via %U ", format_ip4_address, mp->mt_next_hop); else - s = format (s, "%U ", format_ip6_address, mp->mt_next_hop); + s = format (s, "via %U ", format_ip6_address, mp->mt_next_hop); + + if (mp->mt_next_hop_sw_if_index != ~0) + s = format (s, "sw_if_index %d ", ntohl (mp->mt_next_hop_sw_if_index)); + else if (mp->mt_next_hop_table_id) + s = format (s, "next-hop-table %d ", ntohl (mp->mt_next_hop_table_id)); if (mp->mt_l2_only) s = format (s, "l2-only "); - if (mp->mt_is_add == 0) - s = format (s, "del "); + if (mp->mt_next_hop_n_out_labels) + { + u8 i; + for (i = 0; i < mp->mt_next_hop_n_out_labels; i++) + { + s = format (s, "out-label %d ", + ntohl (mp->mt_next_hop_out_label_stack[i].label)); + } + } + + FINISH; +} + +static void *vl_api_sr_mpls_policy_add_t_print + (vl_api_sr_mpls_policy_add_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: sr_mpls_policy_add "); + + s = format (s, "bsid %d ", ntohl (mp->bsid)); + + if (mp->weight != htonl ((u32) 1)) + s = format (s, "%d ", ntohl (mp->weight)); + + if (mp->type) + s = format (s, "spray "); + + if (mp->n_segments) + { + int i; + for (i = 0; i < mp->n_segments; i++) + s = format (s, "next %d ", ntohl (mp->segments[i])); + } + + FINISH; +} + +static void *vl_api_sr_mpls_policy_del_t_print + (vl_api_sr_mpls_policy_del_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: sr_mpls_policy_del "); + + s = format (s, "bsid %d ", ntohl (mp->bsid)); FINISH; } @@ -819,31 +1018,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]; - - 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 "); @@ -851,6 +1040,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) { @@ -912,26 +1102,6 @@ static void *vl_api_delete_subif_t_print FINISH; } -static void *vl_api_oam_add_del_t_print - (vl_api_oam_add_del_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: oam_add_del "); - - if (mp->vrf_id) - s = format (s, "vrf %d ", ntohl (mp->vrf_id)); - - s = format (s, "src %U ", format_ip4_address, mp->src_address); - - s = format (s, "dst %U ", format_ip4_address, mp->dst_address); - - if (mp->is_add == 0) - s = format (s, "del "); - - FINISH; -} - static void * vl_api_reset_fib_t_print (vl_api_reset_fib_t * mp, void *handle) { @@ -1011,13 +1181,13 @@ static void *vl_api_dhcp_client_config_t_print s = format (0, "SCRIPT: dhcp_client_config "); - s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); + s = format (s, "sw_if_index %d ", ntohl (mp->client.sw_if_index)); - s = format (s, "hostname %s ", mp->hostname); + s = format (s, "hostname %s ", mp->client.hostname); - s = format (s, "want_dhcp_event %d ", mp->want_dhcp_event); + s = format (s, "want_dhcp_event %d ", mp->client.want_dhcp_event); - s = format (s, "pid %d ", ntohl (mp->pid)); + s = format (s, "pid %d ", ntohl (mp->client.pid)); if (mp->is_add == 0) s = format (s, "del "); @@ -1059,20 +1229,6 @@ static void *vl_api_set_ip_flow_hash_t_print FINISH; } -static void *vl_api_sw_interface_ip6_set_link_local_address_t_print - (vl_api_sw_interface_ip6_set_link_local_address_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: sw_interface_ip6_set_link_local_address "); - - s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); - - s = format (s, "%U ", format_ip6_address, mp->address); - - FINISH; -} - static void *vl_api_sw_interface_ip6nd_ra_prefix_t_print (vl_api_sw_interface_ip6nd_ra_prefix_t * mp, void *handle) { @@ -1082,8 +1238,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)); @@ -1200,7 +1355,7 @@ static void *vl_api_sr_localsid_add_del_t_print { case SR_BEHAVIOR_END: s = format (s, "Address: %U\nBehavior: End", - format_ip6_address, (ip6_address_t *) mp->localsid_addr); + format_ip6_address, (ip6_address_t *) mp->localsid.addr); s = format (s, (mp->end_psp ? "End.PSP: True" : "End.PSP: False")); break; case SR_BEHAVIOR_X: @@ -1208,9 +1363,9 @@ static void *vl_api_sr_localsid_add_del_t_print format (s, "Address: %U\nBehavior: X (Endpoint with Layer-3 cross-connect)" "\nIface: %U\nNext hop: %U", format_ip6_address, - (ip6_address_t *) mp->localsid_addr, + (ip6_address_t *) mp->localsid.addr, format_vnet_sw_if_index_name, vnm, ntohl (mp->sw_if_index), - format_ip6_address, (ip6_address_t *) mp->nh_addr); + format_ip6_address, (ip6_address_t *) mp->nh_addr6); s = format (s, (mp->end_psp ? "End.PSP: True" : "End.PSP: False")); break; case SR_BEHAVIOR_DX4: @@ -1218,25 +1373,25 @@ static void *vl_api_sr_localsid_add_del_t_print format (s, "Address: %U\nBehavior: DX4 (Endpoint with decapsulation with IPv4 cross-connect)" "\nIface: %U\nNext hop: %U", format_ip6_address, - (ip6_address_t *) mp->localsid_addr, + (ip6_address_t *) mp->localsid.addr, format_vnet_sw_if_index_name, vnm, ntohl (mp->sw_if_index), - format_ip4_address, (ip4_address_t *) mp->nh_addr); + format_ip4_address, (ip4_address_t *) mp->nh_addr4); break; case SR_BEHAVIOR_DX6: s = format (s, "Address: %U\nBehavior: DX6 (Endpoint with decapsulation with IPv6 cross-connect)" "\nIface: %UNext hop: %U", format_ip6_address, - (ip6_address_t *) mp->localsid_addr, + (ip6_address_t *) mp->localsid.addr, format_vnet_sw_if_index_name, vnm, ntohl (mp->sw_if_index), - format_ip6_address, (ip6_address_t *) mp->nh_addr); + format_ip6_address, (ip6_address_t *) mp->nh_addr6); break; case SR_BEHAVIOR_DX2: s = format (s, "Address: %U\nBehavior: DX2 (Endpoint with decapulation and Layer-2 cross-connect)" "\nIface: %U", format_ip6_address, - (ip6_address_t *) mp->localsid_addr, + (ip6_address_t *) mp->localsid.addr, format_vnet_sw_if_index_name, vnm, ntohl (mp->sw_if_index)); break; case SR_BEHAVIOR_DT6: @@ -1244,20 +1399,20 @@ static void *vl_api_sr_localsid_add_del_t_print format (s, "Address: %U\nBehavior: DT6 (Endpoint with decapsulation and specific IPv6 table lookup)" "\nTable: %u", format_ip6_address, - (ip6_address_t *) mp->localsid_addr, ntohl (mp->fib_table)); + (ip6_address_t *) mp->localsid.addr, ntohl (mp->fib_table)); break; case SR_BEHAVIOR_DT4: s = format (s, "Address: %U\nBehavior: DT4 (Endpoint with decapsulation and specific IPv4 table lookup)" "\nTable: %u", format_ip6_address, - (ip6_address_t *) mp->localsid_addr, ntohl (mp->fib_table)); + (ip6_address_t *) mp->localsid.addr, ntohl (mp->fib_table)); break; default: if (mp->behavior >= SR_BEHAVIOR_LAST) { s = format (s, "Address: %U\n Behavior: %u", - format_ip6_address, (ip6_address_t *) mp->localsid_addr, + format_ip6_address, (ip6_address_t *) mp->localsid.addr, mp->behavior); } else @@ -1310,10 +1465,10 @@ static void *vl_api_sr_policy_add_t_print u8 *s; ip6_address_t *segments = 0, *seg; - ip6_address_t *this_address = (ip6_address_t *) mp->segments; + ip6_address_t *this_address = (ip6_address_t *) mp->sids.sids; int i; - for (i = 0; i < mp->n_segments; i++) + for (i = 0; i < mp->sids.num_sids; i++) { vec_add2 (segments, seg, 1); clib_memcpy (seg->as_u8, this_address->as_u8, sizeof (*this_address)); @@ -1352,10 +1507,10 @@ static void *vl_api_sr_policy_mod_t_print u8 *s; ip6_address_t *segments = 0, *seg; - ip6_address_t *this_address = (ip6_address_t *) mp->segments; + ip6_address_t *this_address = (ip6_address_t *) mp->sids.sids; int i; - for (i = 0; i < mp->n_segments; i++) + for (i = 0; i < mp->sids.num_sids; i++) { vec_add2 (segments, seg, 1); clib_memcpy (seg->as_u8, this_address->as_u8, sizeof (*this_address)); @@ -1634,6 +1789,20 @@ static void *vl_api_vxlan_add_del_tunnel_t_print FINISH; } +static void *vl_api_vxlan_offload_rx_t_print + (vl_api_vxlan_offload_rx_t * mp, void *handle) +{ + u8 *s; + s = format (0, "SCRIPT: vxlan_offload_rx "); + + s = format (s, "hw hw_if_index %d ", ntohl (mp->hw_if_index)); + s = format (s, "rx sw_if_index %d ", ntohl (mp->sw_if_index)); + if (!mp->enable) + s = format (s, "del "); + + FINISH; +} + static void *vl_api_vxlan_tunnel_dump_t_print (vl_api_vxlan_tunnel_dump_t * mp, void *handle) { @@ -1646,6 +1815,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) { @@ -1690,31 +1908,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->tunnel.instance)); - s = format (s, "instance %d ", ntohl (mp->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 "); @@ -1788,6 +2001,10 @@ static void *vl_api_create_vhost_user_if_t_print s = format (s, "server "); if (mp->renumber) s = format (s, "renumber %d ", ntohl (mp->custom_dev_instance)); + if (mp->disable_mrg_rxbuf) + s = format (s, "disable_mrg_rxbuf "); + if (mp->disable_indirect_desc) + s = format (s, "disable_indirect_desc "); if (mp->tag[0]) s = format (s, "tag %s", mp->tag); @@ -1895,10 +2112,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); @@ -1936,6 +2153,16 @@ static void *vl_api_show_version_t_print FINISH; } +static void *vl_api_show_threads_t_print + (vl_api_show_threads_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: show_threads "); + + FINISH; +} + static void *vl_api_vxlan_gpe_add_del_tunnel_t_print (vl_api_vxlan_gpe_add_del_tunnel_t * mp, void *handle) { @@ -2005,10 +2232,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; } @@ -2051,7 +2275,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 "); @@ -2065,7 +2289,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 "); @@ -2391,7 +2615,7 @@ static void *vl_api_mpls_tunnel_dump_t_print s = format (0, "SCRIPT: mpls_tunnel_dump "); - s = format (s, "tunnel_index %d ", ntohl (mp->tunnel_index)); + s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); FINISH; } @@ -2655,12 +2879,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++) { @@ -3063,22 +3282,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_tunnel_if_add_del "); + + 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, "local-ip %U ", format_vl_api_address, &mp->remote_ip); + + 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, "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_add_del_tunnel "); + s = format (0, "SCRIPT: ipsec_gre_tunnel_add_del "); - s = format (s, "dst %U ", format_ip4_address, - (ip4_address_t *) & (mp->dst_address)); + s = format (s, "dst %U ", format_vl_api_ip4_address, mp->tunnel.dst); - s = format (s, "src %U ", format_ip4_address, - (ip4_address_t *) & (mp->src_address)); + s = format (s, "src %U ", format_vl_api_ip4_address, mp->tunnel.src); - s = format (s, "local_sa %d ", ntohl (mp->local_sa_id)); + s = format (s, "local_sa %d ", ntohl (mp->tunnel.local_sa_id)); - s = format (s, "remote_sa %d ", ntohl (mp->remote_sa_id)); + s = format (s, "remote_sa %d ", ntohl (mp->tunnel.remote_sa_id)); if (mp->is_add == 0) s = format (s, "del "); @@ -3139,19 +3398,23 @@ static void *vl_api_flow_classify_set_interface_t_print } static void * -vl_api_punt_t_print (vl_api_punt_t * mp, void *handle) +vl_api_set_punt_t_print (vl_api_set_punt_t * mp, void *handle) { u8 *s; s = format (0, "SCRIPT: punt "); - if (mp->ipv != (u8) ~ 0) - s = format (s, "ip %d ", mp->ipv); + switch (clib_net_to_host_u32 (mp->punt.type)) + { + case PUNT_API_TYPE_L4: + s = format (s, "%U", format_vl_api_address_family, mp->punt.punt.l4.af); - s = format (s, "protocol %d ", mp->l4_protocol); + s = format (s, "protocol %d ", mp->punt.punt.l4.protocol); - if (mp->l4_port != (u16) ~ 0) - s = format (s, "port %d ", ntohs (mp->l4_port)); + if (mp->punt.punt.l4.port != (u16) ~ 0) + s = format (s, "port %d ", ntohs (mp->punt.punt.l4.port)); + break; + } if (!mp->is_add) s = format (s, "del "); @@ -3256,8 +3519,8 @@ static void *vl_api_sw_interface_tag_add_del_t_print FINISH; } -static void *vl_api_sw_interface_set_mtu_t_print - (vl_api_sw_interface_set_mtu_t * mp, void *handle) +static void *vl_api_hw_interface_set_mtu_t_print + (vl_api_hw_interface_set_mtu_t * mp, void *handle) { u8 *s; @@ -3358,7 +3621,7 @@ static void *vl_api_sw_interface_set_lldp_t_print u8 *s; u8 null_data[256]; - memset (null_data, 0, sizeof (null_data)); + clib_memset (null_data, 0, sizeof (null_data)); s = format (0, "SCRIPT: sw_interface_set_lldp "); s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); @@ -3450,14 +3713,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; } @@ -3468,7 +3726,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, mp->input_source); + s = format (s, "input_source %U ", format_qos_source, + ntohl (mp->input_source)); if (!mp->enable) s = format (s, "disable "); @@ -3505,10 +3764,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) \ @@ -3517,20 +3772,22 @@ _(TAP_CREATE_V2, tap_create_v2) \ _(TAP_DELETE_V2, tap_delete_v2) \ _(SW_INTERFACE_TAP_V2_DUMP, sw_interface_tap_v2_dump) \ _(IP_ADD_DEL_ROUTE, ip_add_del_route) \ +_(IP_TABLE_ADD_DEL, ip_table_add_del) \ +_(MPLS_ROUTE_ADD_DEL, mpls_route_add_del) \ +_(MPLS_TABLE_ADD_DEL, mpls_table_add_del) \ _(PROXY_ARP_ADD_DEL, proxy_arp_add_del) \ _(PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable) \ _(MPLS_TUNNEL_ADD_DEL, mpls_tunnel_add_del) \ +_(SR_MPLS_POLICY_ADD, sr_mpls_policy_add) \ +_(SR_MPLS_POLICY_DEL, sr_mpls_policy_del) \ _(SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered) \ _(IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del) \ _(CREATE_VLAN_SUBIF, create_vlan_subif) \ _(CREATE_SUBIF, create_subif) \ -_(OAM_ADD_DEL, oam_add_del) \ _(RESET_FIB, reset_fib) \ _(DHCP_PROXY_CONFIG, dhcp_proxy_config) \ _(DHCP_PROXY_SET_VSS, dhcp_proxy_set_vss) \ _(SET_IP_FLOW_HASH, set_ip_flow_hash) \ -_(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS, \ - sw_interface_ip6_set_link_local_address) \ _(SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix) \ _(SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config) \ _(SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit) \ @@ -3564,9 +3821,10 @@ _(L2TPV3_SET_LOOKUP_KEY, l2tpv3_set_lookup_key) \ _(SW_IF_L2TPV3_TUNNEL_DUMP, sw_if_l2tpv3_tunnel_dump) \ _(VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel) \ _(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) \ @@ -3586,6 +3844,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) \ @@ -3597,6 +3858,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) \ @@ -3657,11 +3919,12 @@ _(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) \ -_(PUNT, punt) \ +_(SET_PUNT, set_punt) \ _(FLOW_CLASSIFY_SET_INTERFACE, flow_classify_set_interface) \ _(FLOW_CLASSIFY_DUMP, flow_classify_dump) \ _(GET_FIRST_MSG_ID, get_first_msg_id) \ @@ -3671,7 +3934,7 @@ _(IP_FIB_DUMP, ip_fib_dump) \ _(IP6_FIB_DUMP, ip6_fib_dump) \ _(FEATURE_ENABLE_DISABLE, feature_enable_disable) \ _(SW_INTERFACE_TAG_ADD_DEL, sw_interface_tag_add_del) \ -_(SW_INTERFACE_SET_MTU, sw_interface_set_mtu) \ +_(HW_INTERFACE_SET_MTU, hw_interface_set_mtu) \ _(P2P_ETHERNET_ADD, p2p_ethernet_add) \ _(P2P_ETHERNET_DEL, p2p_ethernet_del) \ _(TCP_CONFIGURE_SRC_ADDRESSES, tcp_configure_src_addresses) \