X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvat%2Fapi_format.c;h=d9e5b5b8b2108e23f1409c199cb98e4f138f1c0e;hb=a9e2774f5;hp=2f8218e590f59297650fe137342530fb5e7098b8;hpb=6d4af8918c8d14aa609d6488f0793152f9ed1927;p=vpp.git diff --git a/src/vat/api_format.c b/src/vat/api_format.c index 2f8218e590f..d9e5b5b8b21 100644 --- a/src/vat/api_format.c +++ b/src/vat/api_format.c @@ -2,7 +2,7 @@ *------------------------------------------------------------------ * api_format.c * - * Copyright (c) 2014-2016 Cisco and/or its affiliates. + * Copyright (c) 2014-2020 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: @@ -27,12 +27,9 @@ #include #include #include -#include #include -#include -#include #include -#include +#include #include #include @@ -43,7 +40,6 @@ #include #include #include -#include #include #include #include @@ -103,13 +99,16 @@ int vat_socket_connect (vat_main_t * vam) { int rv; + api_main_t *am = vlibapi_get_main (); vam->socket_client_main = &socket_client_main; if ((rv = vl_socket_client_connect ((char *) vam->socket_name, "vpp_api_test", 0 /* default socket rx, tx buffer */ ))) return rv; + /* vpp expects the client index in network order */ vam->my_client_index = htonl (socket_client_main.client_index); + am->my_client_index = vam->my_client_index; return 0; } #else /* vpp built-in case, we don't do sockets... */ @@ -264,6 +263,26 @@ unformat_ethernet_type_host_byte_order (unformat_input_t * input, return 0; } +/* Parse an IP46 address. */ +uword +unformat_ip46_address (unformat_input_t * input, va_list * args) +{ + ip46_address_t *ip46 = va_arg (*args, ip46_address_t *); + ip46_type_t type = va_arg (*args, ip46_type_t); + if ((type != IP46_TYPE_IP6) && + unformat (input, "%U", unformat_ip4_address, &ip46->ip4)) + { + ip46_address_mask_ip4 (ip46); + return 1; + } + else if ((type != IP46_TYPE_IP4) && + unformat (input, "%U", unformat_ip6_address, &ip46->ip6)) + { + return 1; + } + return 0; +} + /* Parse an IP6 address. */ uword unformat_ip6_address (unformat_input_t * input, va_list * args) @@ -743,9 +762,9 @@ increment_v6_address (vl_api_ip6_address_t * i) static void increment_address (vl_api_address_t * a) { - if (clib_net_to_host_u32 (a->af) == ADDRESS_IP4) + if (a->af == ADDRESS_IP4) increment_v4_address (&a->un.ip4); - else if (clib_net_to_host_u32 (a->af) == ADDRESS_IP6) + else if (a->af == ADDRESS_IP6) increment_v6_address (&a->un.ip6); } @@ -759,6 +778,16 @@ set_ip4_address (vl_api_address_t * a, u32 v) } } +void +ip_set (ip46_address_t * dst, void *src, u8 is_ip4) +{ + if (is_ip4) + dst->ip4.as_u32 = ((ip4_address_t *) src)->as_u32; + else + clib_memcpy_fast (&dst->ip6, (ip6_address_t *) src, + sizeof (ip6_address_t)); +} + static void increment_mac_address (u8 * mac) { @@ -1127,18 +1156,12 @@ vl_api_cli_inband_reply_t_handler (vl_api_cli_inband_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); - u32 length = vl_api_string_len (&mp->reply); vec_reset_length (vam->cmd_reply); vam->retval = retval; if (retval == 0) - { - vec_validate (vam->cmd_reply, length); - clib_memcpy ((char *) (vam->cmd_reply), - vl_api_from_api_string (&mp->reply), length); - vam->cmd_reply[length] = 0; - } + vam->cmd_reply = vl_api_from_api_to_new_vec (mp, &mp->reply); vam->result_ready = 1; } @@ -1147,16 +1170,18 @@ vl_api_cli_inband_reply_t_handler_json (vl_api_cli_inband_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; + u8 *reply = 0; /* reply vector */ + reply = vl_api_from_api_to_new_vec (mp, &mp->reply); vec_reset_length (vam->cmd_reply); vat_json_init_object (&node); vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_string_copy (&node, "reply", - vl_api_from_api_string (&mp->reply)); + vat_json_object_add_string_copy (&node, "reply", reply); vat_json_print (vam->ofp, &node); vat_json_free (&node); + vec_free (reply); vam->retval = ntohl (mp->retval); vam->result_ready = 1; @@ -1800,6 +1825,41 @@ static void vl_api_virtio_pci_create_reply_t_handler_json } +static void + vl_api_virtio_pci_create_v2_reply_t_handler + (vl_api_virtio_pci_create_v2_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + if (vam->async_mode) + { + vam->async_errors += (retval < 0); + } + else + { + vam->retval = retval; + vam->sw_if_index = ntohl (mp->sw_if_index); + vam->result_ready = 1; + } +} + +static void vl_api_virtio_pci_create_v2_reply_t_handler_json + (vl_api_virtio_pci_create_v2_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + + vat_json_init_object (&node); + vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); + vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index)); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + static void vl_api_virtio_pci_delete_reply_t_handler (vl_api_virtio_pci_delete_reply_t * mp) @@ -1868,6 +1928,41 @@ static void vl_api_bond_create_reply_t_handler_json vam->result_ready = 1; } +static void +vl_api_bond_create2_reply_t_handler (vl_api_bond_create2_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (vam->async_mode) + { + vam->async_errors += (retval < 0); + } + else + { + vam->retval = retval; + vam->sw_if_index = ntohl (mp->sw_if_index); + vam->result_ready = 1; + } +} + +static void vl_api_bond_create2_reply_t_handler_json + (vl_api_bond_create2_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + + vat_json_init_object (&node); + vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); + vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index)); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + static void vl_api_bond_delete_reply_t_handler (vl_api_bond_delete_reply_t * mp) { @@ -1902,7 +1997,7 @@ static void vl_api_bond_delete_reply_t_handler_json } static void -vl_api_bond_enslave_reply_t_handler (vl_api_bond_enslave_reply_t * mp) +vl_api_bond_add_member_reply_t_handler (vl_api_bond_add_member_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); @@ -1918,8 +2013,8 @@ vl_api_bond_enslave_reply_t_handler (vl_api_bond_enslave_reply_t * mp) } } -static void vl_api_bond_enslave_reply_t_handler_json - (vl_api_bond_enslave_reply_t * mp) +static void vl_api_bond_add_member_reply_t_handler_json + (vl_api_bond_add_member_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; @@ -1935,8 +2030,8 @@ static void vl_api_bond_enslave_reply_t_handler_json } static void -vl_api_bond_detach_slave_reply_t_handler (vl_api_bond_detach_slave_reply_t * - mp) +vl_api_bond_detach_member_reply_t_handler (vl_api_bond_detach_member_reply_t * + mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); @@ -1952,8 +2047,8 @@ vl_api_bond_detach_slave_reply_t_handler (vl_api_bond_detach_slave_reply_t * } } -static void vl_api_bond_detach_slave_reply_t_handler_json - (vl_api_bond_detach_slave_reply_t * mp) +static void vl_api_bond_detach_member_reply_t_handler_json + (vl_api_bond_detach_member_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; @@ -2011,8 +2106,8 @@ api_sw_interface_set_bond_weight (vat_main_t * vam) return ret; } -static void vl_api_sw_interface_bond_details_t_handler - (vl_api_sw_interface_bond_details_t * mp) +static void vl_api_sw_bond_interface_details_t_handler + (vl_api_sw_bond_interface_details_t * mp) { vat_main_t *vam = &vat_main; @@ -2020,11 +2115,11 @@ static void vl_api_sw_interface_bond_details_t_handler "%-16s %-12d %-12U %-13U %-14u %-14u", mp->interface_name, ntohl (mp->sw_if_index), format_bond_mode, ntohl (mp->mode), format_bond_load_balance, - ntohl (mp->lb), ntohl (mp->active_slaves), ntohl (mp->slaves)); + ntohl (mp->lb), ntohl (mp->active_members), ntohl (mp->members)); } -static void vl_api_sw_interface_bond_details_t_handler_json - (vl_api_sw_interface_bond_details_t * mp) +static void vl_api_sw_bond_interface_details_t_handler_json + (vl_api_sw_bond_interface_details_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t *node = NULL; @@ -2042,24 +2137,38 @@ static void vl_api_sw_interface_bond_details_t_handler_json mp->interface_name); vat_json_object_add_uint (node, "mode", ntohl (mp->mode)); vat_json_object_add_uint (node, "load_balance", ntohl (mp->lb)); - vat_json_object_add_uint (node, "active_slaves", ntohl (mp->active_slaves)); - vat_json_object_add_uint (node, "slaves", ntohl (mp->slaves)); + vat_json_object_add_uint (node, "active_members", + ntohl (mp->active_members)); + vat_json_object_add_uint (node, "members", ntohl (mp->members)); } static int -api_sw_interface_bond_dump (vat_main_t * vam) +api_sw_bond_interface_dump (vat_main_t * vam) { - vl_api_sw_interface_bond_dump_t *mp; + unformat_input_t *i = vam->input; + vl_api_sw_bond_interface_dump_t *mp; vl_api_control_ping_t *mp_ping; int ret; + u32 sw_if_index = ~0; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + ; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + ; + else + break; + } print (vam->ofp, "\n%-16s %-12s %-12s %-13s %-14s %-14s", "interface name", "sw_if_index", "mode", "load balance", - "active slaves", "slaves"); + "active members", "members"); /* Get list of bond interfaces */ - M (SW_INTERFACE_BOND_DUMP, mp); + M (SW_BOND_INTERFACE_DUMP, mp); + mp->sw_if_index = ntohl (sw_if_index); S (mp); /* Use a control ping for synchronization */ @@ -2070,8 +2179,8 @@ api_sw_interface_bond_dump (vat_main_t * vam) return ret; } -static void vl_api_sw_interface_slave_details_t_handler - (vl_api_sw_interface_slave_details_t * mp) +static void vl_api_sw_member_interface_details_t_handler + (vl_api_sw_member_interface_details_t * mp) { vat_main_t *vam = &vat_main; @@ -2081,8 +2190,8 @@ static void vl_api_sw_interface_slave_details_t_handler ntohl (mp->weight), mp->is_local_numa); } -static void vl_api_sw_interface_slave_details_t_handler_json - (vl_api_sw_interface_slave_details_t * mp) +static void vl_api_sw_member_interface_details_t_handler_json + (vl_api_sw_member_interface_details_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t *node = NULL; @@ -2105,10 +2214,10 @@ static void vl_api_sw_interface_slave_details_t_handler_json } static int -api_sw_interface_slave_dump (vat_main_t * vam) +api_sw_member_interface_dump (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_sw_interface_slave_dump_t *mp; + vl_api_sw_member_interface_dump_t *mp; vl_api_control_ping_t *mp_ping; u32 sw_if_index = ~0; u8 sw_if_index_set = 0; @@ -2133,11 +2242,11 @@ api_sw_interface_slave_dump (vat_main_t * vam) print (vam->ofp, "\n%-25s %-12s %-7s %-12s %-10s %-10s", - "slave interface name", "sw_if_index", "passive", "long_timeout", + "member interface name", "sw_if_index", "passive", "long_timeout", "weight", "local numa"); /* Get list of bond interfaces */ - M (SW_INTERFACE_SLAVE_DUMP, mp); + M (SW_MEMBER_INTERFACE_DUMP, mp); mp->sw_if_index = ntohl (sw_if_index); S (mp); @@ -2185,8 +2294,8 @@ static void vl_api_mpls_tunnel_add_del_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_l2tpv3_create_tunnel_reply_t_handler - (vl_api_l2tpv3_create_tunnel_reply_t * mp) +static void vl_api_vxlan_add_del_tunnel_reply_t_handler + (vl_api_vxlan_add_del_tunnel_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); @@ -2200,10 +2309,11 @@ static void vl_api_l2tpv3_create_tunnel_reply_t_handler vam->sw_if_index = ntohl (mp->sw_if_index); vam->result_ready = 1; } + vam->regenerate_interface_table = 1; } -static void vl_api_l2tpv3_create_tunnel_reply_t_handler_json - (vl_api_l2tpv3_create_tunnel_reply_t * mp) +static void vl_api_vxlan_add_del_tunnel_reply_t_handler_json + (vl_api_vxlan_add_del_tunnel_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; @@ -2219,8 +2329,8 @@ static void vl_api_l2tpv3_create_tunnel_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_gpe_add_del_fwd_entry_reply_t_handler - (vl_api_gpe_add_del_fwd_entry_reply_t * mp) +static void vl_api_vxlan_offload_rx_reply_t_handler + (vl_api_vxlan_offload_rx_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); @@ -2235,16 +2345,14 @@ static void vl_api_gpe_add_del_fwd_entry_reply_t_handler } } -static void vl_api_gpe_add_del_fwd_entry_reply_t_handler_json - (vl_api_gpe_add_del_fwd_entry_reply_t * mp) +static void vl_api_vxlan_offload_rx_reply_t_handler_json + (vl_api_vxlan_offload_rx_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; vat_json_init_object (&node); vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "fwd_entry_index", - clib_net_to_host_u32 (mp->fwd_entry_index)); vat_json_print (vam->ofp, &node); vat_json_free (&node); @@ -2253,25 +2361,8 @@ static void vl_api_gpe_add_del_fwd_entry_reply_t_handler_json vam->result_ready = 1; } -u8 * -format_lisp_transport_protocol (u8 * s, va_list * args) -{ - u32 proto = va_arg (*args, u32); - - switch (proto) - { - case 1: - return format (s, "udp"); - case 2: - return format (s, "api"); - default: - return 0; - } - return 0; -} - -static void vl_api_one_get_transport_protocol_reply_t_handler - (vl_api_one_get_transport_protocol_reply_t * mp) +static void vl_api_vxlan_gpe_add_del_tunnel_reply_t_handler + (vl_api_vxlan_gpe_add_del_tunnel_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); @@ -2281,29 +2372,23 @@ static void vl_api_one_get_transport_protocol_reply_t_handler } else { - u32 proto = mp->protocol; - print (vam->ofp, "Transport protocol: %U", - format_lisp_transport_protocol, proto); vam->retval = retval; + vam->sw_if_index = ntohl (mp->sw_if_index); vam->result_ready = 1; } + vam->regenerate_interface_table = 1; } -static void vl_api_one_get_transport_protocol_reply_t_handler_json - (vl_api_one_get_transport_protocol_reply_t * mp) +static void vl_api_vxlan_gpe_add_del_tunnel_reply_t_handler_json + (vl_api_vxlan_gpe_add_del_tunnel_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; - u8 *s; - - s = format (0, "%U", format_lisp_transport_protocol, mp->protocol); - vec_add1 (s, 0); vat_json_init_object (&node); vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_string_copy (&node, "transport-protocol", s); + vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index)); - vec_free (s); vat_json_print (vam->ofp, &node); vat_json_free (&node); @@ -2311,8 +2396,8 @@ static void vl_api_one_get_transport_protocol_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_one_add_del_locator_set_reply_t_handler - (vl_api_one_add_del_locator_set_reply_t * mp) +static void vl_api_create_vhost_user_if_reply_t_handler + (vl_api_create_vhost_user_if_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); @@ -2323,19 +2408,21 @@ static void vl_api_one_add_del_locator_set_reply_t_handler else { vam->retval = retval; + vam->sw_if_index = ntohl (mp->sw_if_index); vam->result_ready = 1; } + vam->regenerate_interface_table = 1; } -static void vl_api_one_add_del_locator_set_reply_t_handler_json - (vl_api_one_add_del_locator_set_reply_t * mp) +static void vl_api_create_vhost_user_if_reply_t_handler_json + (vl_api_create_vhost_user_if_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; vat_json_init_object (&node); vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "locator_set_index", ntohl (mp->ls_index)); + vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index)); vat_json_print (vam->ofp, &node); vat_json_free (&node); @@ -2344,46 +2431,95 @@ static void vl_api_one_add_del_locator_set_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_vxlan_add_del_tunnel_reply_t_handler - (vl_api_vxlan_add_del_tunnel_reply_t * mp) +static void vl_api_ip_address_details_t_handler + (vl_api_ip_address_details_t * mp) { vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - if (vam->async_mode) + static ip_address_details_t empty_ip_address_details = { {0} }; + ip_address_details_t *address = NULL; + ip_details_t *current_ip_details = NULL; + ip_details_t *details = NULL; + + details = vam->ip_details_by_sw_if_index[vam->is_ipv6]; + + if (!details || vam->current_sw_if_index >= vec_len (details) + || !details[vam->current_sw_if_index].present) { - vam->async_errors += (retval < 0); + errmsg ("ip address details arrived but not stored"); + errmsg ("ip_dump should be called first"); + return; } - else + + current_ip_details = vec_elt_at_index (details, vam->current_sw_if_index); + +#define addresses (current_ip_details->addr) + + vec_validate_init_empty (addresses, vec_len (addresses), + empty_ip_address_details); + + address = vec_elt_at_index (addresses, vec_len (addresses) - 1); + + clib_memcpy (&address->ip, &mp->prefix.address.un, sizeof (address->ip)); + address->prefix_length = mp->prefix.len; +#undef addresses +} + +static void vl_api_ip_address_details_t_handler_json + (vl_api_ip_address_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + + if (VAT_JSON_ARRAY != vam->json_tree.type) { - vam->retval = retval; - vam->sw_if_index = ntohl (mp->sw_if_index); - vam->result_ready = 1; + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } - vam->regenerate_interface_table = 1; + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_prefix (node, &mp->prefix); } -static void vl_api_vxlan_add_del_tunnel_reply_t_handler_json - (vl_api_vxlan_add_del_tunnel_reply_t * mp) +static void +vl_api_ip_details_t_handler (vl_api_ip_details_t * mp) { vat_main_t *vam = &vat_main; - vat_json_node_t node; + static ip_details_t empty_ip_details = { 0 }; + ip_details_t *ip = NULL; + u32 sw_if_index = ~0; - vat_json_init_object (&node); - vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index)); + sw_if_index = ntohl (mp->sw_if_index); - vat_json_print (vam->ofp, &node); - vat_json_free (&node); + vec_validate_init_empty (vam->ip_details_by_sw_if_index[vam->is_ipv6], + sw_if_index, empty_ip_details); - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; + ip = vec_elt_at_index (vam->ip_details_by_sw_if_index[vam->is_ipv6], + sw_if_index); + + ip->present = 1; } -static void vl_api_vxlan_offload_rx_reply_t_handler - (vl_api_vxlan_offload_rx_reply_t * mp) +static void +vl_api_ip_details_t_handler_json (vl_api_ip_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + vat_json_array_add_uint (&vam->json_tree, + clib_net_to_host_u32 (mp->sw_if_index)); +} + +static void vl_api_get_first_msg_id_reply_t_handler + (vl_api_get_first_msg_id_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); + if (vam->async_mode) { vam->async_errors += (retval < 0); @@ -2393,16 +2529,22 @@ static void vl_api_vxlan_offload_rx_reply_t_handler vam->retval = retval; vam->result_ready = 1; } + if (retval >= 0) + { + errmsg ("first message id %d", ntohs (mp->first_msg_id)); + } } -static void vl_api_vxlan_offload_rx_reply_t_handler_json - (vl_api_vxlan_offload_rx_reply_t * mp) +static void vl_api_get_first_msg_id_reply_t_handler_json + (vl_api_get_first_msg_id_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; vat_json_init_object (&node); vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); + vat_json_object_add_uint (&node, "first_msg_id", + (uint) ntohs (mp->first_msg_id)); vat_json_print (vam->ofp, &node); vat_json_free (&node); @@ -2411,276 +2553,16 @@ static void vl_api_vxlan_offload_rx_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_geneve_add_del_tunnel_reply_t_handler - (vl_api_geneve_add_del_tunnel_reply_t * mp) +static void vl_api_get_node_graph_reply_t_handler + (vl_api_get_node_graph_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); - if (vam->async_mode) - { - vam->async_errors += (retval < 0); - } - else - { - vam->retval = retval; - vam->sw_if_index = ntohl (mp->sw_if_index); - vam->result_ready = 1; - } -} - -static void vl_api_geneve_add_del_tunnel_reply_t_handler_json - (vl_api_geneve_add_del_tunnel_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object (&node); - vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index)); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void vl_api_vxlan_gpe_add_del_tunnel_reply_t_handler - (vl_api_vxlan_gpe_add_del_tunnel_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - if (vam->async_mode) - { - vam->async_errors += (retval < 0); - } - else - { - vam->retval = retval; - vam->sw_if_index = ntohl (mp->sw_if_index); - vam->result_ready = 1; - } - vam->regenerate_interface_table = 1; -} - -static void vl_api_vxlan_gpe_add_del_tunnel_reply_t_handler_json - (vl_api_vxlan_gpe_add_del_tunnel_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object (&node); - vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index)); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void vl_api_gre_tunnel_add_del_reply_t_handler - (vl_api_gre_tunnel_add_del_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - if (vam->async_mode) - { - vam->async_errors += (retval < 0); - } - else - { - vam->retval = retval; - vam->sw_if_index = ntohl (mp->sw_if_index); - vam->result_ready = 1; - } -} - -static void vl_api_gre_tunnel_add_del_reply_t_handler_json - (vl_api_gre_tunnel_add_del_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object (&node); - vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index)); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void vl_api_create_vhost_user_if_reply_t_handler - (vl_api_create_vhost_user_if_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - if (vam->async_mode) - { - vam->async_errors += (retval < 0); - } - else - { - vam->retval = retval; - vam->sw_if_index = ntohl (mp->sw_if_index); - vam->result_ready = 1; - } - vam->regenerate_interface_table = 1; -} - -static void vl_api_create_vhost_user_if_reply_t_handler_json - (vl_api_create_vhost_user_if_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object (&node); - vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index)); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void vl_api_ip_address_details_t_handler - (vl_api_ip_address_details_t * mp) -{ - vat_main_t *vam = &vat_main; - static ip_address_details_t empty_ip_address_details = { {0} }; - ip_address_details_t *address = NULL; - ip_details_t *current_ip_details = NULL; - ip_details_t *details = NULL; - - details = vam->ip_details_by_sw_if_index[vam->is_ipv6]; - - if (!details || vam->current_sw_if_index >= vec_len (details) - || !details[vam->current_sw_if_index].present) - { - errmsg ("ip address details arrived but not stored"); - errmsg ("ip_dump should be called first"); - return; - } - - current_ip_details = vec_elt_at_index (details, vam->current_sw_if_index); - -#define addresses (current_ip_details->addr) - - vec_validate_init_empty (addresses, vec_len (addresses), - empty_ip_address_details); - - address = vec_elt_at_index (addresses, vec_len (addresses) - 1); - - clib_memcpy (&address->ip, &mp->prefix.address.un, sizeof (address->ip)); - address->prefix_length = mp->prefix.len; -#undef addresses -} - -static void vl_api_ip_address_details_t_handler_json - (vl_api_ip_address_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_prefix (node, &mp->prefix); -} - -static void -vl_api_ip_details_t_handler (vl_api_ip_details_t * mp) -{ - vat_main_t *vam = &vat_main; - static ip_details_t empty_ip_details = { 0 }; - ip_details_t *ip = NULL; - u32 sw_if_index = ~0; - - sw_if_index = ntohl (mp->sw_if_index); - - vec_validate_init_empty (vam->ip_details_by_sw_if_index[vam->is_ipv6], - sw_if_index, empty_ip_details); - - ip = vec_elt_at_index (vam->ip_details_by_sw_if_index[vam->is_ipv6], - sw_if_index); - - ip->present = 1; -} - -static void -vl_api_ip_details_t_handler_json (vl_api_ip_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - vat_json_array_add_uint (&vam->json_tree, - clib_net_to_host_u32 (mp->sw_if_index)); -} - -static void vl_api_get_first_msg_id_reply_t_handler - (vl_api_get_first_msg_id_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (vam->async_mode) - { - vam->async_errors += (retval < 0); - } - else - { - vam->retval = retval; - vam->result_ready = 1; - } - if (retval >= 0) - { - errmsg ("first message id %d", ntohs (mp->first_msg_id)); - } -} - -static void vl_api_get_first_msg_id_reply_t_handler_json - (vl_api_get_first_msg_id_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object (&node); - vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "first_msg_id", - (uint) ntohs (mp->first_msg_id)); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void vl_api_get_node_graph_reply_t_handler - (vl_api_get_node_graph_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - u8 *pvt_copy, *reply; - void *oldheap; - vlib_node_t *node; - int i; - + u8 *pvt_copy, *reply; + void *oldheap; + vlib_node_t *node; + int i; + if (vam->async_mode) { vam->async_errors += (retval < 0); @@ -2760,201 +2642,164 @@ static void vl_api_get_node_graph_reply_t_handler_json vam->result_ready = 1; } -static void -vl_api_one_locator_details_t_handler (vl_api_one_locator_details_t * mp) -{ - vat_main_t *vam = &vat_main; - u8 *s = 0; - - if (mp->local) - { - s = format (s, "%=16d%=16d%=16d", - ntohl (mp->sw_if_index), mp->priority, mp->weight); - } - else - { - s = format (s, "%=16U%=16d%=16d", - mp->is_ipv6 ? format_ip6_address : - format_ip4_address, - mp->ip_address, mp->priority, mp->weight); - } - - print (vam->ofp, "%v", s); - vec_free (s); -} - -static void -vl_api_one_locator_details_t_handler_json (vl_api_one_locator_details_t * mp) +static u8 * +format_policer_type (u8 * s, va_list * va) { - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - struct in6_addr ip6; - struct in_addr ip4; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - - vat_json_object_add_uint (node, "local", mp->local ? 1 : 0); - vat_json_object_add_uint (node, "priority", mp->priority); - vat_json_object_add_uint (node, "weight", mp->weight); + u32 i = va_arg (*va, u32); - if (mp->local) - vat_json_object_add_uint (node, "sw_if_index", - clib_net_to_host_u32 (mp->sw_if_index)); + if (i == SSE2_QOS_POLICER_TYPE_1R2C) + s = format (s, "1r2c"); + else if (i == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697) + s = format (s, "1r3c"); + else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698) + s = format (s, "2r3c-2698"); + else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115) + s = format (s, "2r3c-4115"); + else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1) + s = format (s, "2r3c-mef5cf1"); else - { - if (mp->is_ipv6) - { - clib_memcpy (&ip6, mp->ip_address, sizeof (ip6)); - vat_json_object_add_ip6 (node, "address", ip6); - } - else - { - clib_memcpy (&ip4, mp->ip_address, sizeof (ip4)); - vat_json_object_add_ip4 (node, "address", ip4); - } - } + s = format (s, "ILLEGAL"); + return s; } -static void -vl_api_one_locator_set_details_t_handler (vl_api_one_locator_set_details_t * - mp) +static u8 * +format_policer_rate_type (u8 * s, va_list * va) { - vat_main_t *vam = &vat_main; - u8 *ls_name = 0; - - ls_name = format (0, "%s", mp->ls_name); + u32 i = va_arg (*va, u32); - print (vam->ofp, "%=10d%=15v", clib_net_to_host_u32 (mp->ls_index), - ls_name); - vec_free (ls_name); + if (i == SSE2_QOS_RATE_KBPS) + s = format (s, "kbps"); + else if (i == SSE2_QOS_RATE_PPS) + s = format (s, "pps"); + else + s = format (s, "ILLEGAL"); + return s; } -static void - vl_api_one_locator_set_details_t_handler_json - (vl_api_one_locator_set_details_t * mp) +static u8 * +format_policer_round_type (u8 * s, va_list * va) { - vat_main_t *vam = &vat_main; - vat_json_node_t *node = 0; - u8 *ls_name = 0; - - ls_name = format (0, "%s", mp->ls_name); - vec_add1 (ls_name, 0); - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); + u32 i = va_arg (*va, u32); - vat_json_init_object (node); - vat_json_object_add_string_copy (node, "ls_name", ls_name); - vat_json_object_add_uint (node, "ls_index", - clib_net_to_host_u32 (mp->ls_index)); - vec_free (ls_name); + if (i == SSE2_QOS_ROUND_TO_CLOSEST) + s = format (s, "closest"); + else if (i == SSE2_QOS_ROUND_TO_UP) + s = format (s, "up"); + else if (i == SSE2_QOS_ROUND_TO_DOWN) + s = format (s, "down"); + else + s = format (s, "ILLEGAL"); + return s; } -typedef struct -{ - u32 spi; - u8 si; -} __attribute__ ((__packed__)) lisp_nsh_api_t; - -uword -unformat_nsh_address (unformat_input_t * input, va_list * args) +static u8 * +format_policer_action_type (u8 * s, va_list * va) { - lisp_nsh_api_t *nsh = va_arg (*args, lisp_nsh_api_t *); - return unformat (input, "SPI:%d SI:%d", &nsh->spi, &nsh->si); -} + u32 i = va_arg (*va, u32); -u8 * -format_nsh_address_vat (u8 * s, va_list * args) -{ - nsh_t *a = va_arg (*args, nsh_t *); - return format (s, "SPI:%d SI:%d", clib_net_to_host_u32 (a->spi), a->si); + if (i == SSE2_QOS_ACTION_DROP) + s = format (s, "drop"); + else if (i == SSE2_QOS_ACTION_TRANSMIT) + s = format (s, "transmit"); + else if (i == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) + s = format (s, "mark-and-transmit"); + else + s = format (s, "ILLEGAL"); + return s; } static u8 * -format_lisp_flat_eid (u8 * s, va_list * args) +format_dscp (u8 * s, va_list * va) { - u32 type = va_arg (*args, u32); - u8 *eid = va_arg (*args, u8 *); - u32 eid_len = va_arg (*args, u32); + u32 i = va_arg (*va, u32); + char *t = 0; - switch (type) + switch (i) { - case 0: - return format (s, "%U/%d", format_ip4_address, eid, eid_len); - case 1: - return format (s, "%U/%d", format_ip6_address, eid, eid_len); - case 2: - return format (s, "%U", format_ethernet_address, eid); - case 3: - return format (s, "%U", format_nsh_address_vat, eid); +#define _(v,f,str) case VNET_DSCP_##f: t = str; break; + foreach_vnet_dscp +#undef _ + default: + return format (s, "ILLEGAL"); } - 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); - + s = format (s, "%s", t); return s; } static void -vl_api_one_eid_table_details_t_handler (vl_api_one_eid_table_details_t * mp) +vl_api_policer_details_t_handler (vl_api_policer_details_t * mp) { vat_main_t *vam = &vat_main; - u8 *s = 0, *eid = 0; + u8 *conform_dscp_str, *exceed_dscp_str, *violate_dscp_str; - if (~0 == mp->locator_set_index) - s = format (0, "action: %d", mp->action); + if (mp->conform_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) + conform_dscp_str = format (0, "%U", format_dscp, mp->conform_action.dscp); else - s = format (0, "%d", clib_net_to_host_u32 (mp->locator_set_index)); - - eid = format (0, "%U", format_lisp_eid_vat, - mp->eid_type, - mp->eid, - mp->eid_prefix_len, - mp->seid, mp->seid_prefix_len, mp->is_src_dst); - vec_add1 (eid, 0); - - print (vam->ofp, "[%d] %-35s%-20s%-30s%-20d%-20d%-10d%-20s", - clib_net_to_host_u32 (mp->vni), - eid, - mp->is_local ? "local" : "remote", - s, clib_net_to_host_u32 (mp->ttl), mp->authoritative, - clib_net_to_host_u16 (mp->key_id), mp->key); + conform_dscp_str = format (0, ""); - vec_free (s); - vec_free (eid); + if (mp->exceed_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) + exceed_dscp_str = format (0, "%U", format_dscp, mp->exceed_action.dscp); + else + exceed_dscp_str = format (0, ""); + + if (mp->violate_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) + violate_dscp_str = format (0, "%U", format_dscp, mp->violate_action.dscp); + else + violate_dscp_str = format (0, ""); + + print (vam->ofp, "Name \"%s\", type %U, cir %u, eir %u, cb %u, eb %u, " + "rate type %U, round type %U, %s rate, %s color-aware, " + "cir %u tok/period, pir %u tok/period, scale %u, cur lim %u, " + "cur bkt %u, ext lim %u, ext bkt %u, last update %llu" + "conform action %U%s, exceed action %U%s, violate action %U%s", + mp->name, + format_policer_type, mp->type, + ntohl (mp->cir), + ntohl (mp->eir), + clib_net_to_host_u64 (mp->cb), + clib_net_to_host_u64 (mp->eb), + format_policer_rate_type, mp->rate_type, + format_policer_round_type, mp->round_type, + mp->single_rate ? "single" : "dual", + mp->color_aware ? "is" : "not", + ntohl (mp->cir_tokens_per_period), + ntohl (mp->pir_tokens_per_period), + ntohl (mp->scale), + ntohl (mp->current_limit), + ntohl (mp->current_bucket), + ntohl (mp->extended_limit), + ntohl (mp->extended_bucket), + clib_net_to_host_u64 (mp->last_update_time), + format_policer_action_type, mp->conform_action.type, + conform_dscp_str, + format_policer_action_type, mp->exceed_action.type, + exceed_dscp_str, + format_policer_action_type, mp->violate_action.type, + violate_dscp_str); + + vec_free (conform_dscp_str); + vec_free (exceed_dscp_str); + vec_free (violate_dscp_str); } -static void -vl_api_one_eid_table_details_t_handler_json (vl_api_one_eid_table_details_t - * mp) +static void vl_api_policer_details_t_handler_json + (vl_api_policer_details_t * mp) { vat_main_t *vam = &vat_main; - vat_json_node_t *node = 0; - u8 *eid = 0; + vat_json_node_t *node; + u8 *rate_type_str, *round_type_str, *type_str; + u8 *conform_action_str, *exceed_action_str, *violate_action_str; + + rate_type_str = format (0, "%U", format_policer_rate_type, mp->rate_type); + round_type_str = + format (0, "%U", format_policer_round_type, mp->round_type); + type_str = format (0, "%U", format_policer_type, mp->type); + conform_action_str = format (0, "%U", format_policer_action_type, + mp->conform_action.type); + exceed_action_str = format (0, "%U", format_policer_action_type, + mp->exceed_action.type); + violate_action_str = format (0, "%U", format_policer_action_type, + mp->violate_action.type); if (VAT_JSON_ARRAY != vam->json_tree.type) { @@ -2964,441 +2809,377 @@ vl_api_one_eid_table_details_t_handler_json (vl_api_one_eid_table_details_t node = vat_json_array_add (&vam->json_tree); vat_json_init_object (node); - if (~0 == mp->locator_set_index) - vat_json_object_add_uint (node, "action", mp->action); - else - vat_json_object_add_uint (node, "locator_set_index", - clib_net_to_host_u32 (mp->locator_set_index)); - - vat_json_object_add_uint (node, "is_local", mp->is_local ? 1 : 0); - if (mp->eid_type == 3) + vat_json_object_add_string_copy (node, "name", mp->name); + vat_json_object_add_uint (node, "cir", ntohl (mp->cir)); + vat_json_object_add_uint (node, "eir", ntohl (mp->eir)); + vat_json_object_add_uint (node, "cb", clib_net_to_host_u64 (mp->cb)); + vat_json_object_add_uint (node, "eb", clib_net_to_host_u64 (mp->eb)); + vat_json_object_add_string_copy (node, "rate_type", rate_type_str); + vat_json_object_add_string_copy (node, "round_type", round_type_str); + vat_json_object_add_string_copy (node, "type", type_str); + vat_json_object_add_uint (node, "single_rate", mp->single_rate); + vat_json_object_add_uint (node, "color_aware", mp->color_aware); + vat_json_object_add_uint (node, "scale", ntohl (mp->scale)); + vat_json_object_add_uint (node, "cir_tokens_per_period", + ntohl (mp->cir_tokens_per_period)); + vat_json_object_add_uint (node, "eir_tokens_per_period", + ntohl (mp->pir_tokens_per_period)); + vat_json_object_add_uint (node, "current_limit", ntohl (mp->current_limit)); + vat_json_object_add_uint (node, "current_bucket", + ntohl (mp->current_bucket)); + vat_json_object_add_uint (node, "extended_limit", + ntohl (mp->extended_limit)); + vat_json_object_add_uint (node, "extended_bucket", + ntohl (mp->extended_bucket)); + vat_json_object_add_uint (node, "last_update_time", + ntohl (mp->last_update_time)); + vat_json_object_add_string_copy (node, "conform_action", + conform_action_str); + if (mp->conform_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) { - vat_json_node_t *nsh_json = vat_json_object_add (node, "eid"); - vat_json_init_object (nsh_json); - lisp_nsh_api_t *nsh = (lisp_nsh_api_t *) mp->eid; - vat_json_object_add_uint (nsh_json, "spi", - clib_net_to_host_u32 (nsh->spi)); - vat_json_object_add_uint (nsh_json, "si", nsh->si); + u8 *dscp_str = format (0, "%U", format_dscp, mp->conform_action.dscp); + vat_json_object_add_string_copy (node, "conform_dscp", dscp_str); + vec_free (dscp_str); } - else + vat_json_object_add_string_copy (node, "exceed_action", exceed_action_str); + if (mp->exceed_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) { - eid = format (0, "%U", format_lisp_eid_vat, - mp->eid_type, - mp->eid, - mp->eid_prefix_len, - mp->seid, mp->seid_prefix_len, mp->is_src_dst); - vec_add1 (eid, 0); - vat_json_object_add_string_copy (node, "eid", eid); - vec_free (eid); + u8 *dscp_str = format (0, "%U", format_dscp, mp->exceed_action.dscp); + vat_json_object_add_string_copy (node, "exceed_dscp", dscp_str); + vec_free (dscp_str); } - vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni)); - vat_json_object_add_uint (node, "ttl", clib_net_to_host_u32 (mp->ttl)); - vat_json_object_add_uint (node, "authoritative", (mp->authoritative)); - - if (mp->key_id) + vat_json_object_add_string_copy (node, "violate_action", + violate_action_str); + if (mp->violate_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) { - vat_json_object_add_uint (node, "key_id", - clib_net_to_host_u16 (mp->key_id)); - vat_json_object_add_string_copy (node, "key", mp->key); + u8 *dscp_str = format (0, "%U", format_dscp, mp->violate_action.dscp); + vat_json_object_add_string_copy (node, "violate_dscp", dscp_str); + vec_free (dscp_str); } + + vec_free (rate_type_str); + vec_free (round_type_str); + vec_free (type_str); + vec_free (conform_action_str); + vec_free (exceed_action_str); + vec_free (violate_action_str); } static void -vl_api_one_stats_details_t_handler (vl_api_one_stats_details_t * mp) +vl_api_classify_table_ids_reply_t_handler (vl_api_classify_table_ids_reply_t * + mp) { vat_main_t *vam = &vat_main; - u8 *seid = 0, *deid = 0; - u8 *(*format_ip_address_fcn) (u8 *, va_list *) = 0; - - deid = format (0, "%U", format_lisp_eid_vat, - mp->eid_type, mp->deid, mp->deid_pref_len, 0, 0, 0); - - seid = format (0, "%U", format_lisp_eid_vat, - mp->eid_type, mp->seid, mp->seid_pref_len, 0, 0, 0); - - vec_add1 (deid, 0); - vec_add1 (seid, 0); - - if (mp->is_ip4) - format_ip_address_fcn = format_ip4_address; - else - format_ip_address_fcn = format_ip6_address; - - - print (vam->ofp, "([%d] %s %s) (%U %U) %u %u", - clib_net_to_host_u32 (mp->vni), - seid, deid, - format_ip_address_fcn, mp->lloc, - format_ip_address_fcn, mp->rloc, - clib_net_to_host_u32 (mp->pkt_count), - clib_net_to_host_u32 (mp->bytes)); + int i, count = ntohl (mp->count); - vec_free (deid); - vec_free (seid); + if (count > 0) + print (vam->ofp, "classify table ids (%d) : ", count); + for (i = 0; i < count; i++) + { + print (vam->ofp, "%d", ntohl (mp->ids[i])); + print (vam->ofp, (i < count - 1) ? "," : ""); + } + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; } static void -vl_api_one_stats_details_t_handler_json (vl_api_one_stats_details_t * mp) + vl_api_classify_table_ids_reply_t_handler_json + (vl_api_classify_table_ids_reply_t * mp) { - struct in6_addr ip6; - struct in_addr ip4; vat_main_t *vam = &vat_main; - vat_json_node_t *node = 0; - u8 *deid = 0, *seid = 0; + int i, count = ntohl (mp->count); - if (VAT_JSON_ARRAY != vam->json_tree.type) + if (count > 0) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - deid = format (0, "%U", format_lisp_eid_vat, - mp->eid_type, mp->deid, mp->deid_pref_len, 0, 0, 0); + vat_json_node_t node; - seid = format (0, "%U", format_lisp_eid_vat, - mp->eid_type, mp->seid, mp->seid_pref_len, 0, 0, 0); - - vec_add1 (deid, 0); - vec_add1 (seid, 0); - - vat_json_object_add_string_copy (node, "seid", seid); - vat_json_object_add_string_copy (node, "deid", deid); - vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni)); - - if (mp->is_ip4) - { - clib_memcpy (&ip4, mp->lloc, sizeof (ip4)); - vat_json_object_add_ip4 (node, "lloc", ip4); - clib_memcpy (&ip4, mp->rloc, sizeof (ip4)); - vat_json_object_add_ip4 (node, "rloc", ip4); - } - else - { - clib_memcpy (&ip6, mp->lloc, sizeof (ip6)); - vat_json_object_add_ip6 (node, "lloc", ip6); - clib_memcpy (&ip6, mp->rloc, sizeof (ip6)); - vat_json_object_add_ip6 (node, "rloc", ip6); + vat_json_init_object (&node); + for (i = 0; i < count; i++) + { + vat_json_object_add_uint (&node, "table_id", ntohl (mp->ids[i])); + } + vat_json_print (vam->ofp, &node); + vat_json_free (&node); } - vat_json_object_add_uint (node, "pkt_count", - clib_net_to_host_u32 (mp->pkt_count)); - vat_json_object_add_uint (node, "bytes", clib_net_to_host_u32 (mp->bytes)); - - vec_free (deid); - vec_free (seid); + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; } static void - vl_api_one_eid_table_map_details_t_handler - (vl_api_one_eid_table_map_details_t * mp) + vl_api_classify_table_by_interface_reply_t_handler + (vl_api_classify_table_by_interface_reply_t * mp) { vat_main_t *vam = &vat_main; + u32 table_id; - u8 *line = format (0, "%=10d%=10d", - clib_net_to_host_u32 (mp->vni), - clib_net_to_host_u32 (mp->dp_table)); - print (vam->ofp, "%v", line); - vec_free (line); + table_id = ntohl (mp->l2_table_id); + if (table_id != ~0) + print (vam->ofp, "l2 table id : %d", table_id); + else + print (vam->ofp, "l2 table id : No input ACL tables configured"); + table_id = ntohl (mp->ip4_table_id); + if (table_id != ~0) + print (vam->ofp, "ip4 table id : %d", table_id); + else + print (vam->ofp, "ip4 table id : No input ACL tables configured"); + table_id = ntohl (mp->ip6_table_id); + if (table_id != ~0) + print (vam->ofp, "ip6 table id : %d", table_id); + else + print (vam->ofp, "ip6 table id : No input ACL tables configured"); + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; } static void - vl_api_one_eid_table_map_details_t_handler_json - (vl_api_one_eid_table_map_details_t * mp) + vl_api_classify_table_by_interface_reply_t_handler_json + (vl_api_classify_table_by_interface_reply_t * mp) { vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; + vat_json_node_t node; - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - vat_json_object_add_uint (node, "dp_table", - clib_net_to_host_u32 (mp->dp_table)); - vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni)); -} + vat_json_init_object (&node); -static void - vl_api_one_eid_table_vni_details_t_handler - (vl_api_one_eid_table_vni_details_t * mp) -{ - vat_main_t *vam = &vat_main; + vat_json_object_add_int (&node, "l2_table_id", ntohl (mp->l2_table_id)); + vat_json_object_add_int (&node, "ip4_table_id", ntohl (mp->ip4_table_id)); + vat_json_object_add_int (&node, "ip6_table_id", ntohl (mp->ip6_table_id)); - u8 *line = format (0, "%d", clib_net_to_host_u32 (mp->vni)); - print (vam->ofp, "%v", line); - vec_free (line); + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; } -static void - vl_api_one_eid_table_vni_details_t_handler_json - (vl_api_one_eid_table_vni_details_t * mp) +static void vl_api_policer_add_del_reply_t_handler + (vl_api_policer_add_del_reply_t * mp) { vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - - if (VAT_JSON_ARRAY != vam->json_tree.type) + i32 retval = ntohl (mp->retval); + if (vam->async_mode) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + vam->async_errors += (retval < 0); + } + else + { + vam->retval = retval; + vam->result_ready = 1; + if (retval == 0 && mp->policer_index != 0xFFFFFFFF) + /* + * Note: this is just barely thread-safe, depends on + * the main thread spinning waiting for an answer... + */ + errmsg ("policer index %d", ntohl (mp->policer_index)); } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni)); } -static void - vl_api_show_one_map_register_fallback_threshold_reply_t_handler - (vl_api_show_one_map_register_fallback_threshold_reply_t * mp) +static void vl_api_policer_add_del_reply_t_handler_json + (vl_api_policer_add_del_reply_t * mp) { vat_main_t *vam = &vat_main; - int retval = clib_net_to_host_u32 (mp->retval); + vat_json_node_t node; - vl_api_show_one_map_register_fallback_threshold_reply_t_endian (mp); - print (vam->ofp, "fallback threshold value: %d", mp->value); + vat_json_init_object (&node); + vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); + vat_json_object_add_uint (&node, "policer_index", + ntohl (mp->policer_index)); - vam->retval = retval; + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); vam->result_ready = 1; } -static void - vl_api_show_one_map_register_fallback_threshold_reply_t_handler_json - (vl_api_show_one_map_register_fallback_threshold_reply_t * mp) +/* Format hex dump. */ +u8 * +format_hex_bytes (u8 * s, va_list * va) { - vat_main_t *vam = &vat_main; - vat_json_node_t _node, *node = &_node; - int retval = clib_net_to_host_u32 (mp->retval); + u8 *bytes = va_arg (*va, u8 *); + int n_bytes = va_arg (*va, int); + uword i; - vl_api_show_one_map_register_fallback_threshold_reply_t_endian (mp); - vat_json_init_object (node); - vat_json_object_add_uint (node, "value", mp->value); + /* Print short or long form depending on byte count. */ + uword short_form = n_bytes <= 32; + u32 indent = format_get_indent (s); + + if (n_bytes == 0) + return s; - vat_json_print (vam->ofp, node); - vat_json_free (node); + for (i = 0; i < n_bytes; i++) + { + if (!short_form && (i % 32) == 0) + s = format (s, "%08x: ", i); + s = format (s, "%02x", bytes[i]); + if (!short_form && ((i + 1) % 32) == 0 && (i + 1) < n_bytes) + s = format (s, "\n%U", format_white_space, indent); + } - vam->retval = retval; - vam->result_ready = 1; + return s; } static void - vl_api_show_one_map_register_state_reply_t_handler - (vl_api_show_one_map_register_state_reply_t * mp) +vl_api_classify_table_info_reply_t_handler (vl_api_classify_table_info_reply_t + * mp) { vat_main_t *vam = &vat_main; - int retval = clib_net_to_host_u32 (mp->retval); - - print (vam->ofp, "%s", mp->is_enabled ? "enabled" : "disabled"); - + i32 retval = ntohl (mp->retval); + if (retval == 0) + { + print (vam->ofp, "classify table info :"); + print (vam->ofp, "sessions: %d nexttbl: %d nextnode: %d", + ntohl (mp->active_sessions), ntohl (mp->next_table_index), + ntohl (mp->miss_next_index)); + print (vam->ofp, "nbuckets: %d skip: %d match: %d", + ntohl (mp->nbuckets), ntohl (mp->skip_n_vectors), + ntohl (mp->match_n_vectors)); + print (vam->ofp, "mask: %U", format_hex_bytes, mp->mask, + ntohl (mp->mask_length)); + } vam->retval = retval; vam->result_ready = 1; } static void - vl_api_show_one_map_register_state_reply_t_handler_json - (vl_api_show_one_map_register_state_reply_t * mp) + vl_api_classify_table_info_reply_t_handler_json + (vl_api_classify_table_info_reply_t * mp) { vat_main_t *vam = &vat_main; - vat_json_node_t _node, *node = &_node; - int retval = clib_net_to_host_u32 (mp->retval); - - u8 *s = format (0, "%s", mp->is_enabled ? "enabled" : "disabled"); + vat_json_node_t node; - vat_json_init_object (node); - vat_json_object_add_string_copy (node, "state", s); + i32 retval = ntohl (mp->retval); + if (retval == 0) + { + vat_json_init_object (&node); - vat_json_print (vam->ofp, node); - vat_json_free (node); + vat_json_object_add_int (&node, "sessions", + ntohl (mp->active_sessions)); + vat_json_object_add_int (&node, "nexttbl", + ntohl (mp->next_table_index)); + vat_json_object_add_int (&node, "nextnode", + ntohl (mp->miss_next_index)); + vat_json_object_add_int (&node, "nbuckets", ntohl (mp->nbuckets)); + vat_json_object_add_int (&node, "skip", ntohl (mp->skip_n_vectors)); + vat_json_object_add_int (&node, "match", ntohl (mp->match_n_vectors)); + u8 *s = format (0, "%U%c", format_hex_bytes, mp->mask, + ntohl (mp->mask_length), 0); + vat_json_object_add_string_copy (&node, "mask", s); - vam->retval = retval; + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + } + vam->retval = ntohl (mp->retval); vam->result_ready = 1; - vec_free (s); } static void - vl_api_show_one_rloc_probe_state_reply_t_handler - (vl_api_show_one_rloc_probe_state_reply_t * mp) +vl_api_classify_session_details_t_handler (vl_api_classify_session_details_t * + mp) { vat_main_t *vam = &vat_main; - int retval = clib_net_to_host_u32 (mp->retval); - if (retval) - goto end; - - print (vam->ofp, "%s", mp->is_enabled ? "enabled" : "disabled"); -end: - vam->retval = retval; - vam->result_ready = 1; + print (vam->ofp, "next_index: %d advance: %d opaque: %d ", + ntohl (mp->hit_next_index), ntohl (mp->advance), + ntohl (mp->opaque_index)); + print (vam->ofp, "mask: %U", format_hex_bytes, mp->match, + ntohl (mp->match_length)); } static void - vl_api_show_one_rloc_probe_state_reply_t_handler_json - (vl_api_show_one_rloc_probe_state_reply_t * mp) + vl_api_classify_session_details_t_handler_json + (vl_api_classify_session_details_t * mp) { vat_main_t *vam = &vat_main; - vat_json_node_t _node, *node = &_node; - int retval = clib_net_to_host_u32 (mp->retval); - - u8 *s = format (0, "%s", mp->is_enabled ? "enabled" : "disabled"); - vat_json_init_object (node); - vat_json_object_add_string_copy (node, "state", s); + vat_json_node_t *node = NULL; - vat_json_print (vam->ofp, node); - vat_json_free (node); + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); - vam->retval = retval; - vam->result_ready = 1; - vec_free (s); + vat_json_init_object (node); + vat_json_object_add_int (node, "next_index", ntohl (mp->hit_next_index)); + vat_json_object_add_int (node, "advance", ntohl (mp->advance)); + vat_json_object_add_int (node, "opaque", ntohl (mp->opaque_index)); + u8 *s = + format (0, "%U%c", format_hex_bytes, mp->match, ntohl (mp->match_length), + 0); + vat_json_object_add_string_copy (node, "match", s); } -static void - vl_api_show_one_stats_enable_disable_reply_t_handler - (vl_api_show_one_stats_enable_disable_reply_t * mp) +static void vl_api_pg_create_interface_reply_t_handler + (vl_api_pg_create_interface_reply_t * mp) { vat_main_t *vam = &vat_main; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - print (vam->ofp, "%s", mp->is_en ? "enabled" : "disabled"); -end: - vam->retval = retval; + vam->retval = ntohl (mp->retval); vam->result_ready = 1; } -static void - vl_api_show_one_stats_enable_disable_reply_t_handler_json - (vl_api_show_one_stats_enable_disable_reply_t * mp) +static void vl_api_pg_create_interface_reply_t_handler_json + (vl_api_pg_create_interface_reply_t * mp) { vat_main_t *vam = &vat_main; - vat_json_node_t _node, *node = &_node; - int retval = clib_net_to_host_u32 (mp->retval); + vat_json_node_t node; - u8 *s = format (0, "%s", mp->is_en ? "enabled" : "disabled"); - vat_json_init_object (node); - vat_json_object_add_string_copy (node, "state", s); + i32 retval = ntohl (mp->retval); + if (retval == 0) + { + vat_json_init_object (&node); - vat_json_print (vam->ofp, node); - vat_json_free (node); + vat_json_object_add_int (&node, "sw_if_index", ntohl (mp->sw_if_index)); - vam->retval = retval; + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + } + vam->retval = ntohl (mp->retval); vam->result_ready = 1; - vec_free (s); } -static void -api_gpe_fwd_entry_net_to_host (vl_api_gpe_fwd_entry_t * e) +static void vl_api_policer_classify_details_t_handler + (vl_api_policer_classify_details_t * mp) { - e->dp_table = clib_net_to_host_u32 (e->dp_table); - e->fwd_entry_index = clib_net_to_host_u32 (e->fwd_entry_index); - e->vni = clib_net_to_host_u32 (e->vni); + vat_main_t *vam = &vat_main; + + print (vam->ofp, "%10d%20d", ntohl (mp->sw_if_index), + ntohl (mp->table_index)); } -static void - gpe_fwd_entries_get_reply_t_net_to_host - (vl_api_gpe_fwd_entries_get_reply_t * mp) +static void vl_api_policer_classify_details_t_handler_json + (vl_api_policer_classify_details_t * mp) { - u32 i; + vat_main_t *vam = &vat_main; + vat_json_node_t *node; - mp->count = clib_net_to_host_u32 (mp->count); - for (i = 0; i < mp->count; i++) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - api_gpe_fwd_entry_net_to_host (&mp->entries[i]); + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index)); } -static u8 * -format_gpe_encap_mode (u8 * s, va_list * args) +static void vl_api_flow_classify_details_t_handler + (vl_api_flow_classify_details_t * mp) { - u32 mode = va_arg (*args, u32); + vat_main_t *vam = &vat_main; - switch (mode) - { - case 0: - return format (s, "lisp"); - case 1: - return format (s, "vxlan"); - } - return 0; + print (vam->ofp, "%10d%20d", ntohl (mp->sw_if_index), + ntohl (mp->table_index)); } -static void - vl_api_gpe_get_encap_mode_reply_t_handler - (vl_api_gpe_get_encap_mode_reply_t * mp) +static void vl_api_flow_classify_details_t_handler_json + (vl_api_flow_classify_details_t * mp) { vat_main_t *vam = &vat_main; - - print (vam->ofp, "gpe mode: %U", format_gpe_encap_mode, mp->encap_mode); - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_gpe_get_encap_mode_reply_t_handler_json - (vl_api_gpe_get_encap_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - u8 *encap_mode = format (0, "%U", format_gpe_encap_mode, mp->encap_mode); - vec_add1 (encap_mode, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "gpe_mode", encap_mode); - - vec_free (encap_mode); - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_gpe_fwd_entry_path_details_t_handler - (vl_api_gpe_fwd_entry_path_details_t * mp) -{ - vat_main_t *vam = &vat_main; - u8 *(*format_ip_address_fcn) (u8 *, va_list *) = 0; - - if (mp->lcl_loc.is_ip4) - format_ip_address_fcn = format_ip4_address; - else - format_ip_address_fcn = format_ip6_address; - - print (vam->ofp, "w:%d %30U %30U", mp->rmt_loc.weight, - format_ip_address_fcn, &mp->lcl_loc, - format_ip_address_fcn, &mp->rmt_loc); -} - -static void -lisp_fill_locator_node (vat_json_node_t * n, vl_api_gpe_locator_t * loc) -{ - struct in6_addr ip6; - struct in_addr ip4; - - if (loc->is_ip4) - { - clib_memcpy (&ip4, loc->addr, sizeof (ip4)); - vat_json_object_add_ip4 (n, "address", ip4); - } - else - { - clib_memcpy (&ip6, loc->addr, sizeof (ip6)); - vat_json_object_add_ip6 (n, "address", ip6); - } - vat_json_object_add_uint (n, "weight", loc->weight); -} - -static void - vl_api_gpe_fwd_entry_path_details_t_handler_json - (vl_api_gpe_fwd_entry_path_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - vat_json_node_t *loc_node; + vat_json_node_t *node; if (VAT_JSON_ARRAY != vam->json_tree.type) { @@ -3406,7270 +3187,1286 @@ static void vat_json_init_array (&vam->json_tree); } node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - - loc_node = vat_json_object_add (node, "local_locator"); - vat_json_init_object (loc_node); - lisp_fill_locator_node (loc_node, &mp->lcl_loc); - - loc_node = vat_json_object_add (node, "remote_locator"); - vat_json_init_object (loc_node); - lisp_fill_locator_node (loc_node, &mp->rmt_loc); -} - -static void - vl_api_gpe_fwd_entries_get_reply_t_handler - (vl_api_gpe_fwd_entries_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 i; - int retval = clib_net_to_host_u32 (mp->retval); - vl_api_gpe_fwd_entry_t *e; - - if (retval) - goto end; - - gpe_fwd_entries_get_reply_t_net_to_host (mp); - - for (i = 0; i < mp->count; i++) - { - e = &mp->entries[i]; - print (vam->ofp, "%10d %10d %U %40U", e->fwd_entry_index, e->dp_table, - format_lisp_flat_eid, e->eid_type, e->leid, e->leid_prefix_len, - format_lisp_flat_eid, e->eid_type, e->reid, e->reid_prefix_len); - } - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_gpe_fwd_entries_get_reply_t_handler_json - (vl_api_gpe_fwd_entries_get_reply_t * mp) -{ - u8 *s = 0; - vat_main_t *vam = &vat_main; - vat_json_node_t *e = 0, root; - u32 i; - int retval = clib_net_to_host_u32 (mp->retval); - vl_api_gpe_fwd_entry_t *fwd; - - if (retval) - goto end; - - gpe_fwd_entries_get_reply_t_net_to_host (mp); - vat_json_init_array (&root); - - for (i = 0; i < mp->count; i++) - { - e = vat_json_array_add (&root); - fwd = &mp->entries[i]; - - vat_json_init_object (e); - vat_json_object_add_int (e, "fwd_entry_index", fwd->fwd_entry_index); - vat_json_object_add_int (e, "dp_table", fwd->dp_table); - vat_json_object_add_int (e, "vni", fwd->vni); - vat_json_object_add_int (e, "action", fwd->action); - - s = format (0, "%U", format_lisp_flat_eid, fwd->eid_type, fwd->leid, - fwd->leid_prefix_len); - vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "leid", s); - vec_free (s); - - s = format (0, "%U", format_lisp_flat_eid, fwd->eid_type, fwd->reid, - fwd->reid_prefix_len); - vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "reid", s); - vec_free (s); - } - - vat_json_print (vam->ofp, &root); - vat_json_free (&root); -end: - vam->retval = retval; - vam->result_ready = 1; + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index)); } -static void - vl_api_gpe_native_fwd_rpaths_get_reply_t_handler - (vl_api_gpe_native_fwd_rpaths_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - vl_api_gpe_native_fwd_rpath_t *r; - - if (retval) - goto end; +/* + * Generate boilerplate reply handlers, which + * dig the return value out of the xxx_reply_t API message, + * stick it into vam->retval, and set vam->result_ready + * + * Could also do this by pointing N message decode slots at + * a single function, but that could break in subtle ways. + */ - n = clib_net_to_host_u32 (mp->count); +#define foreach_standard_reply_retval_handler \ +_(sw_interface_set_flags_reply) \ +_(sw_interface_add_del_address_reply) \ +_(sw_interface_set_rx_mode_reply) \ +_(sw_interface_set_rx_placement_reply) \ +_(sw_interface_set_table_reply) \ +_(sw_interface_set_mpls_enable_reply) \ +_(sw_interface_set_vpath_reply) \ +_(sw_interface_set_vxlan_bypass_reply) \ +_(sw_interface_set_vxlan_gpe_bypass_reply) \ +_(sw_interface_set_l2_bridge_reply) \ +_(sw_interface_set_bond_weight_reply) \ +_(bridge_domain_add_del_reply) \ +_(sw_interface_set_l2_xconnect_reply) \ +_(l2fib_add_del_reply) \ +_(l2fib_flush_int_reply) \ +_(l2fib_flush_bd_reply) \ +_(ip_route_add_del_reply) \ +_(ip_table_add_del_reply) \ +_(ip_table_replace_begin_reply) \ +_(ip_table_flush_reply) \ +_(ip_table_replace_end_reply) \ +_(ip_mroute_add_del_reply) \ +_(mpls_route_add_del_reply) \ +_(mpls_table_add_del_reply) \ +_(mpls_ip_bind_unbind_reply) \ +_(bier_route_add_del_reply) \ +_(bier_table_add_del_reply) \ +_(sw_interface_set_unnumbered_reply) \ +_(set_ip_flow_hash_reply) \ +_(sw_interface_ip6_enable_disable_reply) \ +_(l2_patch_add_del_reply) \ +_(sr_mpls_policy_add_reply) \ +_(sr_mpls_policy_mod_reply) \ +_(sr_mpls_policy_del_reply) \ +_(sr_policy_add_reply) \ +_(sr_policy_mod_reply) \ +_(sr_policy_del_reply) \ +_(sr_localsid_add_del_reply) \ +_(sr_steering_add_del_reply) \ +_(classify_add_del_session_reply) \ +_(classify_set_interface_ip_table_reply) \ +_(classify_set_interface_l2_tables_reply) \ +_(l2_fib_clear_table_reply) \ +_(l2_interface_efp_filter_reply) \ +_(l2_interface_vlan_tag_rewrite_reply) \ +_(modify_vhost_user_if_reply) \ +_(delete_vhost_user_if_reply) \ +_(want_l2_macs_events_reply) \ +_(input_acl_set_interface_reply) \ +_(ipsec_spd_add_del_reply) \ +_(ipsec_interface_add_del_spd_reply) \ +_(ipsec_spd_entry_add_del_reply) \ +_(ipsec_sad_entry_add_del_reply) \ +_(delete_loopback_reply) \ +_(bd_ip_mac_add_del_reply) \ +_(bd_ip_mac_flush_reply) \ +_(want_interface_events_reply) \ +_(cop_interface_enable_disable_reply) \ +_(cop_whitelist_enable_disable_reply) \ +_(sw_interface_clear_stats_reply) \ +_(ioam_enable_reply) \ +_(ioam_disable_reply) \ +_(af_packet_delete_reply) \ +_(policer_classify_set_interface_reply) \ +_(set_ipfix_exporter_reply) \ +_(set_ipfix_classify_stream_reply) \ +_(ipfix_classify_table_add_del_reply) \ +_(flow_classify_set_interface_reply) \ +_(sw_interface_span_enable_disable_reply) \ +_(pg_capture_reply) \ +_(pg_enable_disable_reply) \ +_(pg_interface_enable_disable_coalesce_reply) \ +_(ip_source_and_port_range_check_add_del_reply) \ +_(ip_source_and_port_range_check_interface_add_del_reply)\ +_(delete_subif_reply) \ +_(l2_interface_pbb_tag_rewrite_reply) \ +_(set_punt_reply) \ +_(feature_enable_disable_reply) \ +_(feature_gso_enable_disable_reply) \ +_(sw_interface_tag_add_del_reply) \ +_(sw_interface_add_del_mac_address_reply) \ +_(hw_interface_set_mtu_reply) \ +_(p2p_ethernet_add_reply) \ +_(p2p_ethernet_del_reply) \ +_(tcp_configure_src_addresses_reply) \ +_(session_rule_add_del_reply) \ +_(ip_container_proxy_add_del_reply) \ +_(output_acl_set_interface_reply) \ +_(qos_record_enable_disable_reply) \ +_(flow_add_reply) - for (i = 0; i < n; i++) - { - r = &mp->entries[i]; - print (vam->ofp, "fib_index: %d sw_if_index %d nh %U", - clib_net_to_host_u32 (r->fib_index), - clib_net_to_host_u32 (r->nh_sw_if_index), - r->is_ip4 ? format_ip4_address : format_ip6_address, r->nh_addr); +#define _(n) \ + static void vl_api_##n##_t_handler \ + (vl_api_##n##_t * mp) \ + { \ + vat_main_t * vam = &vat_main; \ + i32 retval = ntohl(mp->retval); \ + if (vam->async_mode) { \ + vam->async_errors += (retval < 0); \ + } else { \ + vam->retval = retval; \ + vam->result_ready = 1; \ + } \ } +foreach_standard_reply_retval_handler; +#undef _ -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_gpe_native_fwd_rpaths_get_reply_t_handler_json - (vl_api_gpe_native_fwd_rpaths_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t root, *e; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - vl_api_gpe_native_fwd_rpath_t *r; - u8 *s; - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - vat_json_init_array (&root); - - for (i = 0; i < n; i++) - { - e = vat_json_array_add (&root); - vat_json_init_object (e); - r = &mp->entries[i]; - s = - format (0, "%U", r->is_ip4 ? format_ip4_address : format_ip6_address, - r->nh_addr); - vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "ip4", s); - vec_free (s); - - vat_json_object_add_uint (e, "fib_index", - clib_net_to_host_u32 (r->fib_index)); - vat_json_object_add_uint (e, "nh_sw_if_index", - clib_net_to_host_u32 (r->nh_sw_if_index)); +#define _(n) \ + static void vl_api_##n##_t_handler_json \ + (vl_api_##n##_t * mp) \ + { \ + vat_main_t * vam = &vat_main; \ + vat_json_node_t node; \ + vat_json_init_object(&node); \ + vat_json_object_add_int(&node, "retval", ntohl(mp->retval)); \ + vat_json_print(vam->ofp, &node); \ + vam->retval = ntohl(mp->retval); \ + vam->result_ready = 1; \ } +foreach_standard_reply_retval_handler; +#undef _ - vat_json_print (vam->ofp, &root); - vat_json_free (&root); - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_gpe_fwd_entry_vnis_get_reply_t_handler - (vl_api_gpe_fwd_entry_vnis_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - - for (i = 0; i < n; i++) - print (vam->ofp, "%d", clib_net_to_host_u32 (mp->vnis[i])); - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_gpe_fwd_entry_vnis_get_reply_t_handler_json - (vl_api_gpe_fwd_entry_vnis_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t root; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - vat_json_init_array (&root); - - for (i = 0; i < n; i++) - vat_json_array_add_uint (&root, clib_net_to_host_u32 (mp->vnis[i])); - - vat_json_print (vam->ofp, &root); - vat_json_free (&root); - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_ndp_entries_get_reply_t_handler - (vl_api_one_ndp_entries_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; +/* + * Table of message reply handlers, must include boilerplate handlers + * we just generated + */ - n = clib_net_to_host_u32 (mp->count); - - for (i = 0; i < n; i++) - print (vam->ofp, "%U -> %U", format_ip6_address, &mp->entries[i].ip6, - format_ethernet_address, mp->entries[i].mac); - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_ndp_entries_get_reply_t_handler_json - (vl_api_one_ndp_entries_get_reply_t * mp) -{ - u8 *s = 0; - vat_main_t *vam = &vat_main; - vat_json_node_t *e = 0, root; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - vl_api_one_ndp_entry_t *arp_entry; - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - vat_json_init_array (&root); - - for (i = 0; i < n; i++) - { - e = vat_json_array_add (&root); - arp_entry = &mp->entries[i]; - - vat_json_init_object (e); - s = format (0, "%U", format_ethernet_address, arp_entry->mac); - vec_add1 (s, 0); - - vat_json_object_add_string_copy (e, "mac", s); - vec_free (s); - - s = format (0, "%U", format_ip6_address, &arp_entry->ip6); - vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "ip6", s); - vec_free (s); - } - - vat_json_print (vam->ofp, &root); - vat_json_free (&root); - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_l2_arp_entries_get_reply_t_handler - (vl_api_one_l2_arp_entries_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - - for (i = 0; i < n; i++) - print (vam->ofp, "%U -> %U", format_ip4_address, &mp->entries[i].ip4, - format_ethernet_address, mp->entries[i].mac); - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_l2_arp_entries_get_reply_t_handler_json - (vl_api_one_l2_arp_entries_get_reply_t * mp) -{ - u8 *s = 0; - vat_main_t *vam = &vat_main; - vat_json_node_t *e = 0, root; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - vl_api_one_l2_arp_entry_t *arp_entry; - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - vat_json_init_array (&root); - - for (i = 0; i < n; i++) - { - e = vat_json_array_add (&root); - arp_entry = &mp->entries[i]; - - vat_json_init_object (e); - s = format (0, "%U", format_ethernet_address, arp_entry->mac); - vec_add1 (s, 0); - - vat_json_object_add_string_copy (e, "mac", s); - vec_free (s); - - s = format (0, "%U", format_ip4_address, &arp_entry->ip4); - vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "ip4", s); - vec_free (s); - } - - vat_json_print (vam->ofp, &root); - vat_json_free (&root); - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void -vl_api_one_ndp_bd_get_reply_t_handler (vl_api_one_ndp_bd_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - - for (i = 0; i < n; i++) - { - print (vam->ofp, "%d", clib_net_to_host_u32 (mp->bridge_domains[i])); - } - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_ndp_bd_get_reply_t_handler_json - (vl_api_one_ndp_bd_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t root; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - vat_json_init_array (&root); - - for (i = 0; i < n; i++) - { - vat_json_array_add_uint (&root, - clib_net_to_host_u32 (mp->bridge_domains[i])); - } - - vat_json_print (vam->ofp, &root); - vat_json_free (&root); - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_l2_arp_bd_get_reply_t_handler - (vl_api_one_l2_arp_bd_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - - for (i = 0; i < n; i++) - { - print (vam->ofp, "%d", clib_net_to_host_u32 (mp->bridge_domains[i])); - } - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_l2_arp_bd_get_reply_t_handler_json - (vl_api_one_l2_arp_bd_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t root; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - vat_json_init_array (&root); - - for (i = 0; i < n; i++) - { - vat_json_array_add_uint (&root, - clib_net_to_host_u32 (mp->bridge_domains[i])); - } - - vat_json_print (vam->ofp, &root); - vat_json_free (&root); - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_adjacencies_get_reply_t_handler - (vl_api_one_adjacencies_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - vl_api_one_adjacency_t *a; - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - - for (i = 0; i < n; i++) - { - a = &mp->adjacencies[i]; - print (vam->ofp, "%U %40U", - format_lisp_flat_eid, a->eid_type, a->leid, a->leid_prefix_len, - format_lisp_flat_eid, a->eid_type, a->reid, a->reid_prefix_len); - } - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_adjacencies_get_reply_t_handler_json - (vl_api_one_adjacencies_get_reply_t * mp) -{ - u8 *s = 0; - vat_main_t *vam = &vat_main; - vat_json_node_t *e = 0, root; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - vl_api_one_adjacency_t *a; - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - vat_json_init_array (&root); - - for (i = 0; i < n; i++) - { - e = vat_json_array_add (&root); - a = &mp->adjacencies[i]; - - vat_json_init_object (e); - s = format (0, "%U", format_lisp_flat_eid, a->eid_type, a->leid, - a->leid_prefix_len); - vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "leid", s); - vec_free (s); - - s = format (0, "%U", format_lisp_flat_eid, a->eid_type, a->reid, - a->reid_prefix_len); - vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "reid", s); - vec_free (s); - } - - vat_json_print (vam->ofp, &root); - vat_json_free (&root); - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void -vl_api_one_map_server_details_t_handler (vl_api_one_map_server_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "%=20U", - mp->is_ipv6 ? format_ip6_address : format_ip4_address, - mp->ip_address); -} - -static void - vl_api_one_map_server_details_t_handler_json - (vl_api_one_map_server_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - struct in6_addr ip6; - struct in_addr ip4; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - if (mp->is_ipv6) - { - clib_memcpy (&ip6, mp->ip_address, sizeof (ip6)); - vat_json_object_add_ip6 (node, "map-server", ip6); - } - else - { - clib_memcpy (&ip4, mp->ip_address, sizeof (ip4)); - vat_json_object_add_ip4 (node, "map-server", ip4); - } -} - -static void -vl_api_one_map_resolver_details_t_handler (vl_api_one_map_resolver_details_t - * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "%=20U", - mp->is_ipv6 ? format_ip6_address : format_ip4_address, - mp->ip_address); -} - -static void - vl_api_one_map_resolver_details_t_handler_json - (vl_api_one_map_resolver_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - struct in6_addr ip6; - struct in_addr ip4; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - if (mp->is_ipv6) - { - clib_memcpy (&ip6, mp->ip_address, sizeof (ip6)); - vat_json_object_add_ip6 (node, "map resolver", ip6); - } - else - { - clib_memcpy (&ip4, mp->ip_address, sizeof (ip4)); - vat_json_object_add_ip4 (node, "map resolver", ip4); - } -} - -static void -vl_api_show_one_status_reply_t_handler (vl_api_show_one_status_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (0 <= retval) - { - print (vam->ofp, "feature: %s\ngpe: %s", - mp->feature_status ? "enabled" : "disabled", - mp->gpe_status ? "enabled" : "disabled"); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_show_one_status_reply_t_handler_json - (vl_api_show_one_status_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *gpe_status = NULL; - u8 *feature_status = NULL; - - gpe_status = format (0, "%s", mp->gpe_status ? "enabled" : "disabled"); - feature_status = format (0, "%s", - mp->feature_status ? "enabled" : "disabled"); - vec_add1 (gpe_status, 0); - vec_add1 (feature_status, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "gpe_status", gpe_status); - vat_json_object_add_string_copy (&node, "feature_status", feature_status); - - vec_free (gpe_status); - vec_free (feature_status); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_one_get_map_request_itr_rlocs_reply_t_handler - (vl_api_one_get_map_request_itr_rlocs_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (retval >= 0) - { - print (vam->ofp, "%=20s", mp->locator_set_name); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_get_map_request_itr_rlocs_reply_t_handler_json - (vl_api_one_get_map_request_itr_rlocs_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_string_copy (node, "itr-rlocs", mp->locator_set_name); - - vat_json_print (vam->ofp, node); - vat_json_free (node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static u8 * -format_lisp_map_request_mode (u8 * s, va_list * args) -{ - u32 mode = va_arg (*args, u32); - - switch (mode) - { - case 0: - return format (0, "dst-only"); - case 1: - return format (0, "src-dst"); - } - return 0; -} - -static void - vl_api_show_one_map_request_mode_reply_t_handler - (vl_api_show_one_map_request_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (0 <= retval) - { - u32 mode = mp->mode; - print (vam->ofp, "map_request_mode: %U", - format_lisp_map_request_mode, mode); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_show_one_map_request_mode_reply_t_handler_json - (vl_api_show_one_map_request_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *s = 0; - u32 mode; - - mode = mp->mode; - s = format (0, "%U", format_lisp_map_request_mode, mode); - vec_add1 (s, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "map_request_mode", s); - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vec_free (s); - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_one_show_xtr_mode_reply_t_handler - (vl_api_one_show_xtr_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (0 <= retval) - { - print (vam->ofp, "%s\n", mp->is_en ? "enabled" : "disabled"); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_show_xtr_mode_reply_t_handler_json - (vl_api_one_show_xtr_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *status = 0; - - status = format (0, "%s", mp->is_en ? "enabled" : "disabled"); - vec_add1 (status, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "status", status); - - vec_free (status); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_one_show_pitr_mode_reply_t_handler - (vl_api_one_show_pitr_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (0 <= retval) - { - print (vam->ofp, "%s\n", mp->is_en ? "enabled" : "disabled"); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_show_pitr_mode_reply_t_handler_json - (vl_api_one_show_pitr_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *status = 0; - - status = format (0, "%s", mp->is_en ? "enabled" : "disabled"); - vec_add1 (status, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "status", status); - - vec_free (status); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_one_show_petr_mode_reply_t_handler - (vl_api_one_show_petr_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (0 <= retval) - { - print (vam->ofp, "%s\n", mp->is_en ? "enabled" : "disabled"); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_show_petr_mode_reply_t_handler_json - (vl_api_one_show_petr_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *status = 0; - - status = format (0, "%s", mp->is_en ? "enabled" : "disabled"); - vec_add1 (status, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "status", status); - - vec_free (status); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_show_one_use_petr_reply_t_handler - (vl_api_show_one_use_petr_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (0 <= retval) - { - print (vam->ofp, "%s\n", mp->status ? "enabled" : "disabled"); - if (mp->status) - { - print (vam->ofp, "Proxy-ETR address; %U", - mp->is_ip4 ? format_ip4_address : format_ip6_address, - mp->address); - } - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_show_one_use_petr_reply_t_handler_json - (vl_api_show_one_use_petr_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *status = 0; - struct in_addr ip4; - struct in6_addr ip6; - - status = format (0, "%s", mp->status ? "enabled" : "disabled"); - vec_add1 (status, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "status", status); - if (mp->status) - { - if (mp->is_ip4) - { - clib_memcpy (&ip6, mp->address, sizeof (ip6)); - vat_json_object_add_ip6 (&node, "address", ip6); - } - else - { - clib_memcpy (&ip4, mp->address, sizeof (ip4)); - vat_json_object_add_ip4 (&node, "address", ip4); - } - } - - vec_free (status); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_show_one_nsh_mapping_reply_t_handler - (vl_api_show_one_nsh_mapping_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (0 <= retval) - { - print (vam->ofp, "%-20s%-16s", - mp->is_set ? "set" : "not-set", - mp->is_set ? (char *) mp->locator_set_name : ""); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_show_one_nsh_mapping_reply_t_handler_json - (vl_api_show_one_nsh_mapping_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *status = 0; - - status = format (0, "%s", mp->is_set ? "yes" : "no"); - vec_add1 (status, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "is_set", status); - if (mp->is_set) - { - vat_json_object_add_string_copy (&node, "locator_set", - mp->locator_set_name); - } - - vec_free (status); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_show_one_map_register_ttl_reply_t_handler - (vl_api_show_one_map_register_ttl_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - vl_api_show_one_map_register_ttl_reply_t_endian (mp); - - if (0 <= retval) - { - print (vam->ofp, "ttl: %u", mp->ttl); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_show_one_map_register_ttl_reply_t_handler_json - (vl_api_show_one_map_register_ttl_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - vl_api_show_one_map_register_ttl_reply_t_endian (mp); - vat_json_init_object (&node); - vat_json_object_add_uint (&node, "ttl", mp->ttl); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void -vl_api_show_one_pitr_reply_t_handler (vl_api_show_one_pitr_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (0 <= retval) - { - print (vam->ofp, "%-20s%-16s", - mp->status ? "enabled" : "disabled", - mp->status ? (char *) mp->locator_set_name : ""); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void -vl_api_show_one_pitr_reply_t_handler_json (vl_api_show_one_pitr_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *status = 0; - - status = format (0, "%s", mp->status ? "enabled" : "disabled"); - vec_add1 (status, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "status", status); - if (mp->status) - { - vat_json_object_add_string_copy (&node, "locator_set", - mp->locator_set_name); - } - - vec_free (status); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static u8 * -format_policer_type (u8 * s, va_list * va) -{ - u32 i = va_arg (*va, u32); - - if (i == SSE2_QOS_POLICER_TYPE_1R2C) - s = format (s, "1r2c"); - else if (i == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697) - s = format (s, "1r3c"); - else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698) - s = format (s, "2r3c-2698"); - else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115) - s = format (s, "2r3c-4115"); - else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1) - s = format (s, "2r3c-mef5cf1"); - else - s = format (s, "ILLEGAL"); - return s; -} - -static u8 * -format_policer_rate_type (u8 * s, va_list * va) -{ - u32 i = va_arg (*va, u32); - - if (i == SSE2_QOS_RATE_KBPS) - s = format (s, "kbps"); - else if (i == SSE2_QOS_RATE_PPS) - s = format (s, "pps"); - else - s = format (s, "ILLEGAL"); - return s; -} - -static u8 * -format_policer_round_type (u8 * s, va_list * va) -{ - u32 i = va_arg (*va, u32); - - if (i == SSE2_QOS_ROUND_TO_CLOSEST) - s = format (s, "closest"); - else if (i == SSE2_QOS_ROUND_TO_UP) - s = format (s, "up"); - else if (i == SSE2_QOS_ROUND_TO_DOWN) - s = format (s, "down"); - else - s = format (s, "ILLEGAL"); - return s; -} - -static u8 * -format_policer_action_type (u8 * s, va_list * va) -{ - u32 i = va_arg (*va, u32); - - if (i == SSE2_QOS_ACTION_DROP) - s = format (s, "drop"); - else if (i == SSE2_QOS_ACTION_TRANSMIT) - s = format (s, "transmit"); - else if (i == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) - s = format (s, "mark-and-transmit"); - else - s = format (s, "ILLEGAL"); - return s; -} - -static u8 * -format_dscp (u8 * s, va_list * va) -{ - u32 i = va_arg (*va, u32); - char *t = 0; - - switch (i) - { -#define _(v,f,str) case VNET_DSCP_##f: t = str; break; - foreach_vnet_dscp -#undef _ - default: - return format (s, "ILLEGAL"); - } - s = format (s, "%s", t); - return s; -} - -static void -vl_api_policer_details_t_handler (vl_api_policer_details_t * mp) -{ - vat_main_t *vam = &vat_main; - u8 *conform_dscp_str, *exceed_dscp_str, *violate_dscp_str; - - if (mp->conform_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) - conform_dscp_str = format (0, "%U", format_dscp, mp->conform_dscp); - else - conform_dscp_str = format (0, ""); - - if (mp->exceed_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) - exceed_dscp_str = format (0, "%U", format_dscp, mp->exceed_dscp); - else - exceed_dscp_str = format (0, ""); - - if (mp->violate_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) - violate_dscp_str = format (0, "%U", format_dscp, mp->violate_dscp); - else - violate_dscp_str = format (0, ""); - - print (vam->ofp, "Name \"%s\", type %U, cir %u, eir %u, cb %u, eb %u, " - "rate type %U, round type %U, %s rate, %s color-aware, " - "cir %u tok/period, pir %u tok/period, scale %u, cur lim %u, " - "cur bkt %u, ext lim %u, ext bkt %u, last update %llu" - "conform action %U%s, exceed action %U%s, violate action %U%s", - mp->name, - format_policer_type, mp->type, - ntohl (mp->cir), - ntohl (mp->eir), - clib_net_to_host_u64 (mp->cb), - clib_net_to_host_u64 (mp->eb), - format_policer_rate_type, mp->rate_type, - format_policer_round_type, mp->round_type, - mp->single_rate ? "single" : "dual", - mp->color_aware ? "is" : "not", - ntohl (mp->cir_tokens_per_period), - ntohl (mp->pir_tokens_per_period), - ntohl (mp->scale), - ntohl (mp->current_limit), - ntohl (mp->current_bucket), - ntohl (mp->extended_limit), - ntohl (mp->extended_bucket), - clib_net_to_host_u64 (mp->last_update_time), - format_policer_action_type, mp->conform_action_type, - conform_dscp_str, - format_policer_action_type, mp->exceed_action_type, - exceed_dscp_str, - format_policer_action_type, mp->violate_action_type, - violate_dscp_str); - - vec_free (conform_dscp_str); - vec_free (exceed_dscp_str); - vec_free (violate_dscp_str); -} - -static void vl_api_policer_details_t_handler_json - (vl_api_policer_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node; - u8 *rate_type_str, *round_type_str, *type_str; - u8 *conform_action_str, *exceed_action_str, *violate_action_str; - - rate_type_str = format (0, "%U", format_policer_rate_type, mp->rate_type); - round_type_str = - format (0, "%U", format_policer_round_type, mp->round_type); - type_str = format (0, "%U", format_policer_type, mp->type); - conform_action_str = format (0, "%U", format_policer_action_type, - mp->conform_action_type); - exceed_action_str = format (0, "%U", format_policer_action_type, - mp->exceed_action_type); - violate_action_str = format (0, "%U", format_policer_action_type, - mp->violate_action_type); - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_string_copy (node, "name", mp->name); - vat_json_object_add_uint (node, "cir", ntohl (mp->cir)); - vat_json_object_add_uint (node, "eir", ntohl (mp->eir)); - vat_json_object_add_uint (node, "cb", clib_net_to_host_u64 (mp->cb)); - vat_json_object_add_uint (node, "eb", clib_net_to_host_u64 (mp->eb)); - vat_json_object_add_string_copy (node, "rate_type", rate_type_str); - vat_json_object_add_string_copy (node, "round_type", round_type_str); - vat_json_object_add_string_copy (node, "type", type_str); - vat_json_object_add_uint (node, "single_rate", mp->single_rate); - vat_json_object_add_uint (node, "color_aware", mp->color_aware); - vat_json_object_add_uint (node, "scale", ntohl (mp->scale)); - vat_json_object_add_uint (node, "cir_tokens_per_period", - ntohl (mp->cir_tokens_per_period)); - vat_json_object_add_uint (node, "eir_tokens_per_period", - ntohl (mp->pir_tokens_per_period)); - vat_json_object_add_uint (node, "current_limit", ntohl (mp->current_limit)); - vat_json_object_add_uint (node, "current_bucket", - ntohl (mp->current_bucket)); - vat_json_object_add_uint (node, "extended_limit", - ntohl (mp->extended_limit)); - vat_json_object_add_uint (node, "extended_bucket", - ntohl (mp->extended_bucket)); - vat_json_object_add_uint (node, "last_update_time", - ntohl (mp->last_update_time)); - vat_json_object_add_string_copy (node, "conform_action", - conform_action_str); - if (mp->conform_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) - { - u8 *dscp_str = format (0, "%U", format_dscp, mp->conform_dscp); - vat_json_object_add_string_copy (node, "conform_dscp", dscp_str); - vec_free (dscp_str); - } - vat_json_object_add_string_copy (node, "exceed_action", exceed_action_str); - if (mp->exceed_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) - { - u8 *dscp_str = format (0, "%U", format_dscp, mp->exceed_dscp); - vat_json_object_add_string_copy (node, "exceed_dscp", dscp_str); - vec_free (dscp_str); - } - vat_json_object_add_string_copy (node, "violate_action", - violate_action_str); - if (mp->violate_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) - { - u8 *dscp_str = format (0, "%U", format_dscp, mp->violate_dscp); - vat_json_object_add_string_copy (node, "violate_dscp", dscp_str); - vec_free (dscp_str); - } - - vec_free (rate_type_str); - vec_free (round_type_str); - vec_free (type_str); - vec_free (conform_action_str); - vec_free (exceed_action_str); - vec_free (violate_action_str); -} - -static void -vl_api_classify_table_ids_reply_t_handler (vl_api_classify_table_ids_reply_t * - mp) -{ - vat_main_t *vam = &vat_main; - int i, count = ntohl (mp->count); - - if (count > 0) - print (vam->ofp, "classify table ids (%d) : ", count); - for (i = 0; i < count; i++) - { - print (vam->ofp, "%d", ntohl (mp->ids[i])); - print (vam->ofp, (i < count - 1) ? "," : ""); - } - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_classify_table_ids_reply_t_handler_json - (vl_api_classify_table_ids_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - int i, count = ntohl (mp->count); - - if (count > 0) - { - vat_json_node_t node; - - vat_json_init_object (&node); - for (i = 0; i < count; i++) - { - vat_json_object_add_uint (&node, "table_id", ntohl (mp->ids[i])); - } - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - } - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_classify_table_by_interface_reply_t_handler - (vl_api_classify_table_by_interface_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 table_id; - - table_id = ntohl (mp->l2_table_id); - if (table_id != ~0) - print (vam->ofp, "l2 table id : %d", table_id); - else - print (vam->ofp, "l2 table id : No input ACL tables configured"); - table_id = ntohl (mp->ip4_table_id); - if (table_id != ~0) - print (vam->ofp, "ip4 table id : %d", table_id); - else - print (vam->ofp, "ip4 table id : No input ACL tables configured"); - table_id = ntohl (mp->ip6_table_id); - if (table_id != ~0) - print (vam->ofp, "ip6 table id : %d", table_id); - else - print (vam->ofp, "ip6 table id : No input ACL tables configured"); - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_classify_table_by_interface_reply_t_handler_json - (vl_api_classify_table_by_interface_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object (&node); - - vat_json_object_add_int (&node, "l2_table_id", ntohl (mp->l2_table_id)); - vat_json_object_add_int (&node, "ip4_table_id", ntohl (mp->ip4_table_id)); - vat_json_object_add_int (&node, "ip6_table_id", ntohl (mp->ip6_table_id)); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void vl_api_policer_add_del_reply_t_handler - (vl_api_policer_add_del_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - if (vam->async_mode) - { - vam->async_errors += (retval < 0); - } - else - { - vam->retval = retval; - vam->result_ready = 1; - if (retval == 0 && mp->policer_index != 0xFFFFFFFF) - /* - * Note: this is just barely thread-safe, depends on - * the main thread spinning waiting for an answer... - */ - errmsg ("policer index %d", ntohl (mp->policer_index)); - } -} - -static void vl_api_policer_add_del_reply_t_handler_json - (vl_api_policer_add_del_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object (&node); - vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "policer_index", - ntohl (mp->policer_index)); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -/* Format hex dump. */ -u8 * -format_hex_bytes (u8 * s, va_list * va) -{ - u8 *bytes = va_arg (*va, u8 *); - int n_bytes = va_arg (*va, int); - uword i; - - /* Print short or long form depending on byte count. */ - uword short_form = n_bytes <= 32; - u32 indent = format_get_indent (s); - - if (n_bytes == 0) - return s; - - for (i = 0; i < n_bytes; i++) - { - if (!short_form && (i % 32) == 0) - s = format (s, "%08x: ", i); - s = format (s, "%02x", bytes[i]); - if (!short_form && ((i + 1) % 32) == 0 && (i + 1) < n_bytes) - s = format (s, "\n%U", format_white_space, indent); - } - - return s; -} - -static void -vl_api_classify_table_info_reply_t_handler (vl_api_classify_table_info_reply_t - * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - if (retval == 0) - { - print (vam->ofp, "classify table info :"); - print (vam->ofp, "sessions: %d nexttbl: %d nextnode: %d", - ntohl (mp->active_sessions), ntohl (mp->next_table_index), - ntohl (mp->miss_next_index)); - print (vam->ofp, "nbuckets: %d skip: %d match: %d", - ntohl (mp->nbuckets), ntohl (mp->skip_n_vectors), - ntohl (mp->match_n_vectors)); - print (vam->ofp, "mask: %U", format_hex_bytes, mp->mask, - ntohl (mp->mask_length)); - } - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_classify_table_info_reply_t_handler_json - (vl_api_classify_table_info_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - i32 retval = ntohl (mp->retval); - if (retval == 0) - { - vat_json_init_object (&node); - - vat_json_object_add_int (&node, "sessions", - ntohl (mp->active_sessions)); - vat_json_object_add_int (&node, "nexttbl", - ntohl (mp->next_table_index)); - vat_json_object_add_int (&node, "nextnode", - ntohl (mp->miss_next_index)); - vat_json_object_add_int (&node, "nbuckets", ntohl (mp->nbuckets)); - vat_json_object_add_int (&node, "skip", ntohl (mp->skip_n_vectors)); - vat_json_object_add_int (&node, "match", ntohl (mp->match_n_vectors)); - u8 *s = format (0, "%U%c", format_hex_bytes, mp->mask, - ntohl (mp->mask_length), 0); - vat_json_object_add_string_copy (&node, "mask", s); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - } - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void -vl_api_classify_session_details_t_handler (vl_api_classify_session_details_t * - mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "next_index: %d advance: %d opaque: %d ", - ntohl (mp->hit_next_index), ntohl (mp->advance), - ntohl (mp->opaque_index)); - print (vam->ofp, "mask: %U", format_hex_bytes, mp->match, - ntohl (mp->match_length)); -} - -static void - vl_api_classify_session_details_t_handler_json - (vl_api_classify_session_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_int (node, "next_index", ntohl (mp->hit_next_index)); - vat_json_object_add_int (node, "advance", ntohl (mp->advance)); - vat_json_object_add_int (node, "opaque", ntohl (mp->opaque_index)); - u8 *s = - format (0, "%U%c", format_hex_bytes, mp->match, ntohl (mp->match_length), - 0); - vat_json_object_add_string_copy (node, "match", s); -} - -static void vl_api_pg_create_interface_reply_t_handler - (vl_api_pg_create_interface_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void vl_api_pg_create_interface_reply_t_handler_json - (vl_api_pg_create_interface_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - i32 retval = ntohl (mp->retval); - if (retval == 0) - { - vat_json_init_object (&node); - - vat_json_object_add_int (&node, "sw_if_index", ntohl (mp->sw_if_index)); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - } - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void vl_api_policer_classify_details_t_handler - (vl_api_policer_classify_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "%10d%20d", ntohl (mp->sw_if_index), - ntohl (mp->table_index)); -} - -static void vl_api_policer_classify_details_t_handler_json - (vl_api_policer_classify_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index)); -} - -static void vl_api_flow_classify_details_t_handler - (vl_api_flow_classify_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "%10d%20d", ntohl (mp->sw_if_index), - ntohl (mp->table_index)); -} - -static void vl_api_flow_classify_details_t_handler_json - (vl_api_flow_classify_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index)); -} - -#define vl_api_one_adjacencies_get_reply_t_endian vl_noop_handler -#define vl_api_one_adjacencies_get_reply_t_print vl_noop_handler -#define vl_api_one_l2_arp_bd_get_reply_t_print vl_noop_handler -#define vl_api_one_l2_arp_entries_get_reply_t_endian vl_noop_handler -#define vl_api_one_l2_arp_entries_get_reply_t_print vl_noop_handler -#define vl_api_one_l2_arp_bd_get_reply_t_endian vl_noop_handler -#define vl_api_one_ndp_bd_get_reply_t_endian vl_noop_handler -#define vl_api_one_ndp_bd_get_reply_t_print vl_noop_handler -#define vl_api_one_ndp_entries_get_reply_t_print vl_noop_handler -#define vl_api_one_ndp_entries_get_reply_t_endian vl_noop_handler - -/* - * Generate boilerplate reply handlers, which - * dig the return value out of the xxx_reply_t API message, - * stick it into vam->retval, and set vam->result_ready - * - * Could also do this by pointing N message decode slots at - * a single function, but that could break in subtle ways. - */ - -#define foreach_standard_reply_retval_handler \ -_(sw_interface_set_flags_reply) \ -_(sw_interface_add_del_address_reply) \ -_(sw_interface_set_rx_mode_reply) \ -_(sw_interface_set_rx_placement_reply) \ -_(sw_interface_set_table_reply) \ -_(sw_interface_set_mpls_enable_reply) \ -_(sw_interface_set_vpath_reply) \ -_(sw_interface_set_vxlan_bypass_reply) \ -_(sw_interface_set_geneve_bypass_reply) \ -_(sw_interface_set_vxlan_gpe_bypass_reply) \ -_(sw_interface_set_l2_bridge_reply) \ -_(sw_interface_set_bond_weight_reply) \ -_(bridge_domain_add_del_reply) \ -_(sw_interface_set_l2_xconnect_reply) \ -_(l2fib_add_del_reply) \ -_(l2fib_flush_int_reply) \ -_(l2fib_flush_bd_reply) \ -_(ip_route_add_del_reply) \ -_(ip_table_add_del_reply) \ -_(ip_table_replace_begin_reply) \ -_(ip_table_flush_reply) \ -_(ip_table_replace_end_reply) \ -_(ip_mroute_add_del_reply) \ -_(mpls_route_add_del_reply) \ -_(mpls_table_add_del_reply) \ -_(mpls_ip_bind_unbind_reply) \ -_(bier_route_add_del_reply) \ -_(bier_table_add_del_reply) \ -_(sw_interface_set_unnumbered_reply) \ -_(set_ip_flow_hash_reply) \ -_(sw_interface_ip6_enable_disable_reply) \ -_(l2_patch_add_del_reply) \ -_(sr_mpls_policy_add_reply) \ -_(sr_mpls_policy_mod_reply) \ -_(sr_mpls_policy_del_reply) \ -_(sr_policy_add_reply) \ -_(sr_policy_mod_reply) \ -_(sr_policy_del_reply) \ -_(sr_localsid_add_del_reply) \ -_(sr_steering_add_del_reply) \ -_(classify_add_del_session_reply) \ -_(classify_set_interface_ip_table_reply) \ -_(classify_set_interface_l2_tables_reply) \ -_(l2tpv3_set_tunnel_cookies_reply) \ -_(l2tpv3_interface_enable_disable_reply) \ -_(l2tpv3_set_lookup_key_reply) \ -_(l2_fib_clear_table_reply) \ -_(l2_interface_efp_filter_reply) \ -_(l2_interface_vlan_tag_rewrite_reply) \ -_(modify_vhost_user_if_reply) \ -_(delete_vhost_user_if_reply) \ -_(want_l2_macs_events_reply) \ -_(input_acl_set_interface_reply) \ -_(ipsec_spd_add_del_reply) \ -_(ipsec_interface_add_del_spd_reply) \ -_(ipsec_spd_entry_add_del_reply) \ -_(ipsec_sad_entry_add_del_reply) \ -_(ipsec_tunnel_if_add_del_reply) \ -_(ipsec_tunnel_if_set_sa_reply) \ -_(delete_loopback_reply) \ -_(bd_ip_mac_add_del_reply) \ -_(bd_ip_mac_flush_reply) \ -_(want_interface_events_reply) \ -_(cop_interface_enable_disable_reply) \ -_(cop_whitelist_enable_disable_reply) \ -_(sw_interface_clear_stats_reply) \ -_(ioam_enable_reply) \ -_(ioam_disable_reply) \ -_(one_add_del_locator_reply) \ -_(one_add_del_local_eid_reply) \ -_(one_add_del_remote_mapping_reply) \ -_(one_add_del_adjacency_reply) \ -_(one_add_del_map_resolver_reply) \ -_(one_add_del_map_server_reply) \ -_(one_enable_disable_reply) \ -_(one_rloc_probe_enable_disable_reply) \ -_(one_map_register_enable_disable_reply) \ -_(one_map_register_set_ttl_reply) \ -_(one_set_transport_protocol_reply) \ -_(one_map_register_fallback_threshold_reply) \ -_(one_pitr_set_locator_set_reply) \ -_(one_map_request_mode_reply) \ -_(one_add_del_map_request_itr_rlocs_reply) \ -_(one_eid_table_add_del_map_reply) \ -_(one_use_petr_reply) \ -_(one_stats_enable_disable_reply) \ -_(one_add_del_l2_arp_entry_reply) \ -_(one_add_del_ndp_entry_reply) \ -_(one_stats_flush_reply) \ -_(one_enable_disable_xtr_mode_reply) \ -_(one_enable_disable_pitr_mode_reply) \ -_(one_enable_disable_petr_mode_reply) \ -_(gpe_enable_disable_reply) \ -_(gpe_set_encap_mode_reply) \ -_(gpe_add_del_iface_reply) \ -_(gpe_add_del_native_fwd_rpath_reply) \ -_(af_packet_delete_reply) \ -_(policer_classify_set_interface_reply) \ -_(netmap_create_reply) \ -_(netmap_delete_reply) \ -_(set_ipfix_exporter_reply) \ -_(set_ipfix_classify_stream_reply) \ -_(ipfix_classify_table_add_del_reply) \ -_(flow_classify_set_interface_reply) \ -_(sw_interface_span_enable_disable_reply) \ -_(pg_capture_reply) \ -_(pg_enable_disable_reply) \ -_(ip_source_and_port_range_check_add_del_reply) \ -_(ip_source_and_port_range_check_interface_add_del_reply)\ -_(delete_subif_reply) \ -_(l2_interface_pbb_tag_rewrite_reply) \ -_(set_punt_reply) \ -_(feature_enable_disable_reply) \ -_(feature_gso_enable_disable_reply) \ -_(sw_interface_tag_add_del_reply) \ -_(sw_interface_add_del_mac_address_reply) \ -_(hw_interface_set_mtu_reply) \ -_(p2p_ethernet_add_reply) \ -_(p2p_ethernet_del_reply) \ -_(lldp_config_reply) \ -_(sw_interface_set_lldp_reply) \ -_(tcp_configure_src_addresses_reply) \ -_(session_rule_add_del_reply) \ -_(ip_container_proxy_add_del_reply) \ -_(output_acl_set_interface_reply) \ -_(qos_record_enable_disable_reply) - -#define _(n) \ - static void vl_api_##n##_t_handler \ - (vl_api_##n##_t * mp) \ - { \ - vat_main_t * vam = &vat_main; \ - i32 retval = ntohl(mp->retval); \ - if (vam->async_mode) { \ - vam->async_errors += (retval < 0); \ - } else { \ - vam->retval = retval; \ - vam->result_ready = 1; \ - } \ - } -foreach_standard_reply_retval_handler; -#undef _ - -#define _(n) \ - static void vl_api_##n##_t_handler_json \ - (vl_api_##n##_t * mp) \ - { \ - vat_main_t * vam = &vat_main; \ - vat_json_node_t node; \ - vat_json_init_object(&node); \ - vat_json_object_add_int(&node, "retval", ntohl(mp->retval)); \ - vat_json_print(vam->ofp, &node); \ - vam->retval = ntohl(mp->retval); \ - vam->result_ready = 1; \ - } -foreach_standard_reply_retval_handler; -#undef _ - -/* - * Table of message reply handlers, must include boilerplate handlers - * we just generated - */ - -#define foreach_vpe_api_reply_msg \ -_(CREATE_LOOPBACK_REPLY, create_loopback_reply) \ -_(CREATE_LOOPBACK_INSTANCE_REPLY, create_loopback_instance_reply) \ -_(SW_INTERFACE_DETAILS, sw_interface_details) \ -_(SW_INTERFACE_SET_FLAGS_REPLY, sw_interface_set_flags_reply) \ -_(CONTROL_PING_REPLY, control_ping_reply) \ -_(CLI_REPLY, cli_reply) \ -_(CLI_INBAND_REPLY, cli_inband_reply) \ -_(SW_INTERFACE_ADD_DEL_ADDRESS_REPLY, \ - sw_interface_add_del_address_reply) \ -_(SW_INTERFACE_SET_RX_MODE_REPLY, sw_interface_set_rx_mode_reply) \ -_(SW_INTERFACE_SET_RX_PLACEMENT_REPLY, sw_interface_set_rx_placement_reply) \ -_(SW_INTERFACE_RX_PLACEMENT_DETAILS, sw_interface_rx_placement_details) \ -_(SW_INTERFACE_SET_TABLE_REPLY, sw_interface_set_table_reply) \ -_(SW_INTERFACE_SET_MPLS_ENABLE_REPLY, sw_interface_set_mpls_enable_reply) \ -_(SW_INTERFACE_SET_VPATH_REPLY, sw_interface_set_vpath_reply) \ -_(SW_INTERFACE_SET_VXLAN_BYPASS_REPLY, sw_interface_set_vxlan_bypass_reply) \ -_(SW_INTERFACE_SET_GENEVE_BYPASS_REPLY, sw_interface_set_geneve_bypass_reply) \ -_(SW_INTERFACE_SET_VXLAN_GPE_BYPASS_REPLY, sw_interface_set_vxlan_gpe_bypass_reply) \ -_(SW_INTERFACE_SET_L2_XCONNECT_REPLY, \ - sw_interface_set_l2_xconnect_reply) \ -_(SW_INTERFACE_SET_L2_BRIDGE_REPLY, \ - sw_interface_set_l2_bridge_reply) \ -_(BRIDGE_DOMAIN_ADD_DEL_REPLY, bridge_domain_add_del_reply) \ -_(BRIDGE_DOMAIN_DETAILS, bridge_domain_details) \ -_(BRIDGE_DOMAIN_SET_MAC_AGE_REPLY, bridge_domain_set_mac_age_reply) \ -_(L2FIB_ADD_DEL_REPLY, l2fib_add_del_reply) \ -_(L2FIB_FLUSH_INT_REPLY, l2fib_flush_int_reply) \ -_(L2FIB_FLUSH_BD_REPLY, l2fib_flush_bd_reply) \ -_(L2_FLAGS_REPLY, l2_flags_reply) \ -_(BRIDGE_FLAGS_REPLY, bridge_flags_reply) \ -_(TAP_CREATE_V2_REPLY, tap_create_v2_reply) \ -_(TAP_DELETE_V2_REPLY, tap_delete_v2_reply) \ -_(SW_INTERFACE_TAP_V2_DETAILS, sw_interface_tap_v2_details) \ -_(VIRTIO_PCI_CREATE_REPLY, virtio_pci_create_reply) \ -_(VIRTIO_PCI_DELETE_REPLY, virtio_pci_delete_reply) \ -_(SW_INTERFACE_VIRTIO_PCI_DETAILS, sw_interface_virtio_pci_details) \ -_(BOND_CREATE_REPLY, bond_create_reply) \ -_(BOND_DELETE_REPLY, bond_delete_reply) \ -_(BOND_ENSLAVE_REPLY, bond_enslave_reply) \ -_(BOND_DETACH_SLAVE_REPLY, bond_detach_slave_reply) \ -_(SW_INTERFACE_SET_BOND_WEIGHT_REPLY, sw_interface_set_bond_weight_reply) \ -_(SW_INTERFACE_BOND_DETAILS, sw_interface_bond_details) \ -_(SW_INTERFACE_SLAVE_DETAILS, sw_interface_slave_details) \ -_(IP_ROUTE_ADD_DEL_REPLY, ip_route_add_del_reply) \ -_(IP_TABLE_ADD_DEL_REPLY, ip_table_add_del_reply) \ -_(IP_TABLE_REPLACE_BEGIN_REPLY, ip_table_replace_begin_reply) \ -_(IP_TABLE_FLUSH_REPLY, ip_table_flush_reply) \ -_(IP_TABLE_REPLACE_END_REPLY, ip_table_replace_end_reply) \ -_(IP_MROUTE_ADD_DEL_REPLY, ip_mroute_add_del_reply) \ -_(MPLS_TABLE_ADD_DEL_REPLY, mpls_table_add_del_reply) \ -_(MPLS_ROUTE_ADD_DEL_REPLY, mpls_route_add_del_reply) \ -_(MPLS_IP_BIND_UNBIND_REPLY, mpls_ip_bind_unbind_reply) \ -_(BIER_ROUTE_ADD_DEL_REPLY, bier_route_add_del_reply) \ -_(BIER_TABLE_ADD_DEL_REPLY, bier_table_add_del_reply) \ -_(MPLS_TUNNEL_ADD_DEL_REPLY, mpls_tunnel_add_del_reply) \ -_(SW_INTERFACE_SET_UNNUMBERED_REPLY, \ - sw_interface_set_unnumbered_reply) \ -_(CREATE_VLAN_SUBIF_REPLY, create_vlan_subif_reply) \ -_(CREATE_SUBIF_REPLY, create_subif_reply) \ -_(SET_IP_FLOW_HASH_REPLY, set_ip_flow_hash_reply) \ -_(SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY, \ - sw_interface_ip6_enable_disable_reply) \ -_(L2_PATCH_ADD_DEL_REPLY, l2_patch_add_del_reply) \ -_(SR_MPLS_POLICY_ADD_REPLY, sr_mpls_policy_add_reply) \ -_(SR_MPLS_POLICY_MOD_REPLY, sr_mpls_policy_mod_reply) \ -_(SR_MPLS_POLICY_DEL_REPLY, sr_mpls_policy_del_reply) \ -_(SR_POLICY_ADD_REPLY, sr_policy_add_reply) \ -_(SR_POLICY_MOD_REPLY, sr_policy_mod_reply) \ -_(SR_POLICY_DEL_REPLY, sr_policy_del_reply) \ -_(SR_LOCALSID_ADD_DEL_REPLY, sr_localsid_add_del_reply) \ -_(SR_STEERING_ADD_DEL_REPLY, sr_steering_add_del_reply) \ -_(CLASSIFY_ADD_DEL_TABLE_REPLY, classify_add_del_table_reply) \ -_(CLASSIFY_ADD_DEL_SESSION_REPLY, classify_add_del_session_reply) \ -_(CLASSIFY_SET_INTERFACE_IP_TABLE_REPLY, \ -classify_set_interface_ip_table_reply) \ -_(CLASSIFY_SET_INTERFACE_L2_TABLES_REPLY, \ - classify_set_interface_l2_tables_reply) \ -_(GET_NODE_INDEX_REPLY, get_node_index_reply) \ -_(ADD_NODE_NEXT_REPLY, add_node_next_reply) \ -_(L2TPV3_CREATE_TUNNEL_REPLY, l2tpv3_create_tunnel_reply) \ -_(L2TPV3_SET_TUNNEL_COOKIES_REPLY, l2tpv3_set_tunnel_cookies_reply) \ -_(L2TPV3_INTERFACE_ENABLE_DISABLE_REPLY, \ - l2tpv3_interface_enable_disable_reply) \ -_(L2TPV3_SET_LOOKUP_KEY_REPLY, l2tpv3_set_lookup_key_reply) \ -_(SW_IF_L2TPV3_TUNNEL_DETAILS, sw_if_l2tpv3_tunnel_details) \ -_(VXLAN_ADD_DEL_TUNNEL_REPLY, vxlan_add_del_tunnel_reply) \ -_(VXLAN_OFFLOAD_RX_REPLY, vxlan_offload_rx_reply) \ -_(GENEVE_ADD_DEL_TUNNEL_REPLY, geneve_add_del_tunnel_reply) \ -_(VXLAN_TUNNEL_DETAILS, vxlan_tunnel_details) \ -_(GENEVE_TUNNEL_DETAILS, geneve_tunnel_details) \ -_(GRE_TUNNEL_ADD_DEL_REPLY, gre_tunnel_add_del_reply) \ -_(GRE_TUNNEL_DETAILS, gre_tunnel_details) \ -_(L2_FIB_CLEAR_TABLE_REPLY, l2_fib_clear_table_reply) \ -_(L2_INTERFACE_EFP_FILTER_REPLY, l2_interface_efp_filter_reply) \ -_(L2_INTERFACE_VLAN_TAG_REWRITE_REPLY, l2_interface_vlan_tag_rewrite_reply) \ -_(SW_INTERFACE_VHOST_USER_DETAILS, sw_interface_vhost_user_details) \ -_(CREATE_VHOST_USER_IF_REPLY, create_vhost_user_if_reply) \ -_(MODIFY_VHOST_USER_IF_REPLY, modify_vhost_user_if_reply) \ -_(DELETE_VHOST_USER_IF_REPLY, delete_vhost_user_if_reply) \ -_(SHOW_VERSION_REPLY, show_version_reply) \ -_(SHOW_THREADS_REPLY, show_threads_reply) \ -_(L2_FIB_TABLE_DETAILS, l2_fib_table_details) \ -_(VXLAN_GPE_ADD_DEL_TUNNEL_REPLY, vxlan_gpe_add_del_tunnel_reply) \ -_(VXLAN_GPE_TUNNEL_DETAILS, vxlan_gpe_tunnel_details) \ -_(INTERFACE_NAME_RENUMBER_REPLY, interface_name_renumber_reply) \ -_(WANT_L2_MACS_EVENTS_REPLY, want_l2_macs_events_reply) \ -_(L2_MACS_EVENT, l2_macs_event) \ -_(INPUT_ACL_SET_INTERFACE_REPLY, input_acl_set_interface_reply) \ -_(IP_ADDRESS_DETAILS, ip_address_details) \ -_(IP_DETAILS, ip_details) \ -_(IPSEC_SPD_ADD_DEL_REPLY, ipsec_spd_add_del_reply) \ -_(IPSEC_INTERFACE_ADD_DEL_SPD_REPLY, ipsec_interface_add_del_spd_reply) \ -_(IPSEC_SPD_ENTRY_ADD_DEL_REPLY, ipsec_spd_entry_add_del_reply) \ -_(IPSEC_SAD_ENTRY_ADD_DEL_REPLY, ipsec_sad_entry_add_del_reply) \ -_(IPSEC_SA_DETAILS, ipsec_sa_details) \ -_(IPSEC_TUNNEL_IF_ADD_DEL_REPLY, ipsec_tunnel_if_add_del_reply) \ -_(IPSEC_TUNNEL_IF_SET_SA_REPLY, ipsec_tunnel_if_set_sa_reply) \ -_(DELETE_LOOPBACK_REPLY, delete_loopback_reply) \ -_(BD_IP_MAC_ADD_DEL_REPLY, bd_ip_mac_add_del_reply) \ -_(BD_IP_MAC_FLUSH_REPLY, bd_ip_mac_flush_reply) \ -_(BD_IP_MAC_DETAILS, bd_ip_mac_details) \ -_(WANT_INTERFACE_EVENTS_REPLY, want_interface_events_reply) \ -_(GET_FIRST_MSG_ID_REPLY, get_first_msg_id_reply) \ -_(COP_INTERFACE_ENABLE_DISABLE_REPLY, cop_interface_enable_disable_reply) \ -_(COP_WHITELIST_ENABLE_DISABLE_REPLY, cop_whitelist_enable_disable_reply) \ -_(GET_NODE_GRAPH_REPLY, get_node_graph_reply) \ -_(SW_INTERFACE_CLEAR_STATS_REPLY, sw_interface_clear_stats_reply) \ -_(IOAM_ENABLE_REPLY, ioam_enable_reply) \ -_(IOAM_DISABLE_REPLY, ioam_disable_reply) \ -_(ONE_ADD_DEL_LOCATOR_SET_REPLY, one_add_del_locator_set_reply) \ -_(ONE_ADD_DEL_LOCATOR_REPLY, one_add_del_locator_reply) \ -_(ONE_ADD_DEL_LOCAL_EID_REPLY, one_add_del_local_eid_reply) \ -_(ONE_ADD_DEL_REMOTE_MAPPING_REPLY, one_add_del_remote_mapping_reply) \ -_(ONE_ADD_DEL_ADJACENCY_REPLY, one_add_del_adjacency_reply) \ -_(ONE_ADD_DEL_MAP_RESOLVER_REPLY, one_add_del_map_resolver_reply) \ -_(ONE_ADD_DEL_MAP_SERVER_REPLY, one_add_del_map_server_reply) \ -_(ONE_ENABLE_DISABLE_REPLY, one_enable_disable_reply) \ -_(ONE_MAP_REGISTER_ENABLE_DISABLE_REPLY, \ - one_map_register_enable_disable_reply) \ -_(ONE_MAP_REGISTER_SET_TTL_REPLY, one_map_register_set_ttl_reply) \ -_(ONE_SET_TRANSPORT_PROTOCOL_REPLY, one_set_transport_protocol_reply) \ -_(ONE_GET_TRANSPORT_PROTOCOL_REPLY, one_get_transport_protocol_reply) \ -_(ONE_MAP_REGISTER_FALLBACK_THRESHOLD_REPLY, \ - one_map_register_fallback_threshold_reply) \ -_(ONE_RLOC_PROBE_ENABLE_DISABLE_REPLY, \ - one_rloc_probe_enable_disable_reply) \ -_(ONE_PITR_SET_LOCATOR_SET_REPLY, one_pitr_set_locator_set_reply) \ -_(ONE_USE_PETR_REPLY, one_use_petr_reply) \ -_(ONE_MAP_REQUEST_MODE_REPLY, one_map_request_mode_reply) \ -_(ONE_EID_TABLE_ADD_DEL_MAP_REPLY, one_eid_table_add_del_map_reply) \ -_(ONE_LOCATOR_SET_DETAILS, one_locator_set_details) \ -_(ONE_LOCATOR_DETAILS, one_locator_details) \ -_(ONE_EID_TABLE_DETAILS, one_eid_table_details) \ -_(ONE_EID_TABLE_MAP_DETAILS, one_eid_table_map_details) \ -_(ONE_EID_TABLE_VNI_DETAILS, one_eid_table_vni_details) \ -_(ONE_MAP_RESOLVER_DETAILS, one_map_resolver_details) \ -_(ONE_MAP_SERVER_DETAILS, one_map_server_details) \ -_(ONE_ADJACENCIES_GET_REPLY, one_adjacencies_get_reply) \ -_(ONE_STATS_DETAILS, one_stats_details) \ -_(ONE_STATS_FLUSH_REPLY, one_stats_flush_reply) \ -_(ONE_STATS_ENABLE_DISABLE_REPLY, one_stats_enable_disable_reply) \ -_(SHOW_ONE_STATS_ENABLE_DISABLE_REPLY, \ - show_one_stats_enable_disable_reply) \ -_(ONE_ADD_DEL_NDP_ENTRY_REPLY, one_add_del_ndp_entry_reply) \ -_(ONE_NDP_BD_GET_REPLY, one_ndp_bd_get_reply) \ -_(ONE_NDP_ENTRIES_GET_REPLY, one_ndp_entries_get_reply) \ -_(ONE_ADD_DEL_L2_ARP_ENTRY_REPLY, one_add_del_l2_arp_entry_reply) \ -_(ONE_L2_ARP_BD_GET_REPLY, one_l2_arp_bd_get_reply) \ -_(ONE_L2_ARP_ENTRIES_GET_REPLY, one_l2_arp_entries_get_reply) \ -_(ONE_ENABLE_DISABLE_XTR_MODE_REPLY, one_enable_disable_xtr_mode_reply) \ -_(ONE_ENABLE_DISABLE_PITR_MODE_REPLY, \ - one_enable_disable_pitr_mode_reply) \ -_(ONE_ENABLE_DISABLE_PETR_MODE_REPLY, \ - one_enable_disable_petr_mode_reply) \ -_(ONE_SHOW_XTR_MODE_REPLY, one_show_xtr_mode_reply) \ -_(ONE_SHOW_PITR_MODE_REPLY, one_show_pitr_mode_reply) \ -_(ONE_SHOW_PETR_MODE_REPLY, one_show_petr_mode_reply) \ -_(GPE_SET_ENCAP_MODE_REPLY, gpe_set_encap_mode_reply) \ -_(GPE_GET_ENCAP_MODE_REPLY, gpe_get_encap_mode_reply) \ -_(GPE_ADD_DEL_IFACE_REPLY, gpe_add_del_iface_reply) \ -_(GPE_ENABLE_DISABLE_REPLY, gpe_enable_disable_reply) \ -_(GPE_ADD_DEL_FWD_ENTRY_REPLY, gpe_add_del_fwd_entry_reply) \ -_(GPE_FWD_ENTRY_VNIS_GET_REPLY, gpe_fwd_entry_vnis_get_reply) \ -_(GPE_FWD_ENTRIES_GET_REPLY, gpe_fwd_entries_get_reply) \ -_(GPE_NATIVE_FWD_RPATHS_GET_REPLY, gpe_native_fwd_rpaths_get_reply) \ -_(GPE_ADD_DEL_NATIVE_FWD_RPATH_REPLY, \ - gpe_add_del_native_fwd_rpath_reply) \ -_(GPE_FWD_ENTRY_PATH_DETAILS, \ - gpe_fwd_entry_path_details) \ -_(SHOW_ONE_STATUS_REPLY, show_one_status_reply) \ -_(ONE_ADD_DEL_MAP_REQUEST_ITR_RLOCS_REPLY, \ - one_add_del_map_request_itr_rlocs_reply) \ -_(ONE_GET_MAP_REQUEST_ITR_RLOCS_REPLY, \ - one_get_map_request_itr_rlocs_reply) \ -_(SHOW_ONE_NSH_MAPPING_REPLY, show_one_nsh_mapping_reply) \ -_(SHOW_ONE_PITR_REPLY, show_one_pitr_reply) \ -_(SHOW_ONE_USE_PETR_REPLY, show_one_use_petr_reply) \ -_(SHOW_ONE_MAP_REQUEST_MODE_REPLY, show_one_map_request_mode_reply) \ -_(SHOW_ONE_RLOC_PROBE_STATE_REPLY, show_one_rloc_probe_state_reply) \ -_(SHOW_ONE_MAP_REGISTER_STATE_REPLY, \ - show_one_map_register_state_reply) \ -_(SHOW_ONE_MAP_REGISTER_TTL_REPLY, show_one_map_register_ttl_reply) \ -_(SHOW_ONE_MAP_REGISTER_FALLBACK_THRESHOLD_REPLY, \ - show_one_map_register_fallback_threshold_reply) \ -_(AF_PACKET_CREATE_REPLY, af_packet_create_reply) \ -_(AF_PACKET_DELETE_REPLY, af_packet_delete_reply) \ -_(AF_PACKET_DETAILS, af_packet_details) \ -_(POLICER_ADD_DEL_REPLY, policer_add_del_reply) \ -_(POLICER_DETAILS, policer_details) \ -_(POLICER_CLASSIFY_SET_INTERFACE_REPLY, policer_classify_set_interface_reply) \ -_(POLICER_CLASSIFY_DETAILS, policer_classify_details) \ -_(NETMAP_CREATE_REPLY, netmap_create_reply) \ -_(NETMAP_DELETE_REPLY, netmap_delete_reply) \ -_(MPLS_TUNNEL_DETAILS, mpls_tunnel_details) \ -_(MPLS_TABLE_DETAILS, mpls_table_details) \ -_(MPLS_ROUTE_DETAILS, mpls_route_details) \ -_(CLASSIFY_TABLE_IDS_REPLY, classify_table_ids_reply) \ -_(CLASSIFY_TABLE_BY_INTERFACE_REPLY, classify_table_by_interface_reply) \ -_(CLASSIFY_TABLE_INFO_REPLY, classify_table_info_reply) \ -_(CLASSIFY_SESSION_DETAILS, classify_session_details) \ -_(SET_IPFIX_EXPORTER_REPLY, set_ipfix_exporter_reply) \ -_(IPFIX_EXPORTER_DETAILS, ipfix_exporter_details) \ -_(SET_IPFIX_CLASSIFY_STREAM_REPLY, set_ipfix_classify_stream_reply) \ -_(IPFIX_CLASSIFY_STREAM_DETAILS, ipfix_classify_stream_details) \ -_(IPFIX_CLASSIFY_TABLE_ADD_DEL_REPLY, ipfix_classify_table_add_del_reply) \ -_(IPFIX_CLASSIFY_TABLE_DETAILS, ipfix_classify_table_details) \ -_(FLOW_CLASSIFY_SET_INTERFACE_REPLY, flow_classify_set_interface_reply) \ -_(FLOW_CLASSIFY_DETAILS, flow_classify_details) \ -_(SW_INTERFACE_SPAN_ENABLE_DISABLE_REPLY, sw_interface_span_enable_disable_reply) \ -_(SW_INTERFACE_SPAN_DETAILS, sw_interface_span_details) \ -_(GET_NEXT_INDEX_REPLY, get_next_index_reply) \ -_(PG_CREATE_INTERFACE_REPLY, pg_create_interface_reply) \ -_(PG_CAPTURE_REPLY, pg_capture_reply) \ -_(PG_ENABLE_DISABLE_REPLY, pg_enable_disable_reply) \ -_(IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL_REPLY, \ - ip_source_and_port_range_check_add_del_reply) \ -_(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL_REPLY, \ - ip_source_and_port_range_check_interface_add_del_reply) \ -_(DELETE_SUBIF_REPLY, delete_subif_reply) \ -_(L2_INTERFACE_PBB_TAG_REWRITE_REPLY, l2_interface_pbb_tag_rewrite_reply) \ -_(SET_PUNT_REPLY, set_punt_reply) \ -_(IP_TABLE_DETAILS, ip_table_details) \ -_(IP_ROUTE_DETAILS, ip_route_details) \ -_(FEATURE_ENABLE_DISABLE_REPLY, feature_enable_disable_reply) \ -_(FEATURE_GSO_ENABLE_DISABLE_REPLY, feature_gso_enable_disable_reply) \ -_(SW_INTERFACE_TAG_ADD_DEL_REPLY, sw_interface_tag_add_del_reply) \ -_(SW_INTERFACE_ADD_DEL_MAC_ADDRESS_REPLY, sw_interface_add_del_mac_address_reply) \ -_(L2_XCONNECT_DETAILS, l2_xconnect_details) \ -_(HW_INTERFACE_SET_MTU_REPLY, hw_interface_set_mtu_reply) \ -_(SW_INTERFACE_GET_TABLE_REPLY, sw_interface_get_table_reply) \ -_(P2P_ETHERNET_ADD_REPLY, p2p_ethernet_add_reply) \ -_(P2P_ETHERNET_DEL_REPLY, p2p_ethernet_del_reply) \ -_(LLDP_CONFIG_REPLY, lldp_config_reply) \ -_(SW_INTERFACE_SET_LLDP_REPLY, sw_interface_set_lldp_reply) \ -_(TCP_CONFIGURE_SRC_ADDRESSES_REPLY, tcp_configure_src_addresses_reply) \ -_(APP_NAMESPACE_ADD_DEL_REPLY, app_namespace_add_del_reply) \ -_(SESSION_RULE_ADD_DEL_REPLY, session_rule_add_del_reply) \ -_(SESSION_RULES_DETAILS, session_rules_details) \ -_(IP_CONTAINER_PROXY_ADD_DEL_REPLY, ip_container_proxy_add_del_reply) \ -_(OUTPUT_ACL_SET_INTERFACE_REPLY, output_acl_set_interface_reply) \ -_(QOS_RECORD_ENABLE_DISABLE_REPLY, qos_record_enable_disable_reply) - -#define foreach_standalone_reply_msg \ -_(SW_INTERFACE_EVENT, sw_interface_event) - -typedef struct -{ - u8 *name; - u32 value; -} name_sort_t; - -#define STR_VTR_OP_CASE(op) \ - case L2_VTR_ ## op: \ - return "" # op; - -static const char * -str_vtr_op (u32 vtr_op) -{ - switch (vtr_op) - { - STR_VTR_OP_CASE (DISABLED); - STR_VTR_OP_CASE (PUSH_1); - STR_VTR_OP_CASE (PUSH_2); - STR_VTR_OP_CASE (POP_1); - STR_VTR_OP_CASE (POP_2); - STR_VTR_OP_CASE (TRANSLATE_1_1); - STR_VTR_OP_CASE (TRANSLATE_1_2); - STR_VTR_OP_CASE (TRANSLATE_2_1); - STR_VTR_OP_CASE (TRANSLATE_2_2); - } - - return "UNKNOWN"; -} - -static int -dump_sub_interface_table (vat_main_t * vam) -{ - const sw_interface_subif_t *sub = NULL; - - if (vam->json_output) - { - clib_warning - ("JSON output supported only for VPE API calls and dump_stats_table"); - return -99; - } - - print (vam->ofp, - "%-30s%-12s%-11s%-7s%-5s%-9s%-9s%-6s%-8s%-10s%-10s", - "Interface", "sw_if_index", - "sub id", "dot1ad", "tags", "outer id", - "inner id", "exact", "default", "outer any", "inner any"); - - vec_foreach (sub, vam->sw_if_subif_table) - { - print (vam->ofp, - "%-30s%-12d%-11d%-7s%-5d%-9d%-9d%-6d%-8d%-10d%-10d", - sub->interface_name, - sub->sw_if_index, - sub->sub_id, sub->sub_dot1ad ? "dot1ad" : "dot1q", - sub->sub_number_of_tags, sub->sub_outer_vlan_id, - sub->sub_inner_vlan_id, sub->sub_exact_match, sub->sub_default, - sub->sub_outer_vlan_id_any, sub->sub_inner_vlan_id_any); - if (sub->vtr_op != L2_VTR_DISABLED) - { - print (vam->ofp, - " vlan-tag-rewrite - op: %-14s [ dot1q: %d " - "tag1: %d tag2: %d ]", - str_vtr_op (sub->vtr_op), sub->vtr_push_dot1q, - sub->vtr_tag1, sub->vtr_tag2); - } - } - - return 0; -} - -static int -name_sort_cmp (void *a1, void *a2) -{ - name_sort_t *n1 = a1; - name_sort_t *n2 = a2; - - return strcmp ((char *) n1->name, (char *) n2->name); -} - -static int -dump_interface_table (vat_main_t * vam) -{ - hash_pair_t *p; - name_sort_t *nses = 0, *ns; - - if (vam->json_output) - { - clib_warning - ("JSON output supported only for VPE API calls and dump_stats_table"); - return -99; - } - - /* *INDENT-OFF* */ - hash_foreach_pair (p, vam->sw_if_index_by_interface_name, - ({ - vec_add2 (nses, ns, 1); - ns->name = (u8 *)(p->key); - ns->value = (u32) p->value[0]; - })); - /* *INDENT-ON* */ - - vec_sort_with_function (nses, name_sort_cmp); - - print (vam->ofp, "%-25s%-15s", "Interface", "sw_if_index"); - vec_foreach (ns, nses) - { - print (vam->ofp, "%-25s%-15d", ns->name, ns->value); - } - vec_free (nses); - return 0; -} - -static int -dump_ip_table (vat_main_t * vam, int is_ipv6) -{ - const ip_details_t *det = NULL; - const ip_address_details_t *address = NULL; - u32 i = ~0; - - print (vam->ofp, "%-12s", "sw_if_index"); - - vec_foreach (det, vam->ip_details_by_sw_if_index[is_ipv6]) - { - i++; - if (!det->present) - { - continue; - } - print (vam->ofp, "%-12d", i); - print (vam->ofp, " %-30s%-13s", "Address", "Prefix length"); - if (!det->addr) - { - continue; - } - vec_foreach (address, det->addr) - { - print (vam->ofp, - " %-30U%-13d", - is_ipv6 ? format_ip6_address : format_ip4_address, - address->ip, address->prefix_length); - } - } - - return 0; -} - -static int -dump_ipv4_table (vat_main_t * vam) -{ - if (vam->json_output) - { - clib_warning - ("JSON output supported only for VPE API calls and dump_stats_table"); - return -99; - } - - return dump_ip_table (vam, 0); -} - -static int -dump_ipv6_table (vat_main_t * vam) -{ - if (vam->json_output) - { - clib_warning - ("JSON output supported only for VPE API calls and dump_stats_table"); - return -99; - } - - return dump_ip_table (vam, 1); -} - -/* - * Pass CLI buffers directly in the CLI_INBAND API message, - * instead of an additional shared memory area. - */ -static int -exec_inband (vat_main_t * vam) -{ - vl_api_cli_inband_t *mp; - unformat_input_t *i = vam->input; - int ret; - - if (vec_len (i->buffer) == 0) - return -1; - - if (vam->exec_mode == 0 && unformat (i, "mode")) - { - vam->exec_mode = 1; - return 0; - } - if (vam->exec_mode == 1 && (unformat (i, "exit") || unformat (i, "quit"))) - { - vam->exec_mode = 0; - return 0; - } - - /* - * In order for the CLI command to work, it - * must be a vector ending in \n, not a C-string ending - * in \n\0. - */ - u32 len = vec_len (vam->input->buffer); - M2 (CLI_INBAND, mp, len); - vl_api_to_api_string (len - 1, (const char *) vam->input->buffer, &mp->cmd); - - S (mp); - W (ret); - /* json responses may or may not include a useful reply... */ - if (vec_len (vam->cmd_reply)) - print (vam->ofp, "%v", (char *) (vam->cmd_reply)); - return ret; -} - -int -exec (vat_main_t * vam) -{ - return exec_inband (vam); -} - -static int -api_create_loopback (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_create_loopback_t *mp; - vl_api_create_loopback_instance_t *mp_lbi; - u8 mac_address[6]; - u8 mac_set = 0; - u8 is_specified = 0; - u32 user_instance = 0; - int ret; - - clib_memset (mac_address, 0, sizeof (mac_address)); - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "mac %U", unformat_ethernet_address, mac_address)) - mac_set = 1; - if (unformat (i, "instance %d", &user_instance)) - is_specified = 1; - else - break; - } - - if (is_specified) - { - M (CREATE_LOOPBACK_INSTANCE, mp_lbi); - mp_lbi->is_specified = is_specified; - if (is_specified) - mp_lbi->user_instance = htonl (user_instance); - if (mac_set) - clib_memcpy (mp_lbi->mac_address, mac_address, sizeof (mac_address)); - S (mp_lbi); - } - else - { - /* Construct the API message */ - M (CREATE_LOOPBACK, mp); - if (mac_set) - clib_memcpy (mp->mac_address, mac_address, sizeof (mac_address)); - S (mp); - } - - W (ret); - return ret; -} - -static int -api_delete_loopback (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_delete_loopback_t *mp; - u32 sw_if_index = ~0; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - ; - else - break; - } - - if (sw_if_index == ~0) - { - errmsg ("missing sw_if_index"); - return -99; - } - - /* Construct the API message */ - M (DELETE_LOOPBACK, mp); - mp->sw_if_index = ntohl (sw_if_index); - - S (mp); - W (ret); - return ret; -} - -static int -api_want_interface_events (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_want_interface_events_t *mp; - int enable = -1; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "enable")) - enable = 1; - else if (unformat (i, "disable")) - enable = 0; - else - break; - } - - if (enable == -1) - { - errmsg ("missing enable|disable"); - return -99; - } - - M (WANT_INTERFACE_EVENTS, mp); - mp->enable_disable = enable; - - vam->interface_event_display = enable; - - S (mp); - W (ret); - return ret; -} - - -/* Note: non-static, called once to set up the initial intfc table */ -int -api_sw_interface_dump (vat_main_t * vam) -{ - vl_api_sw_interface_dump_t *mp; - vl_api_control_ping_t *mp_ping; - hash_pair_t *p; - name_sort_t *nses = 0, *ns; - sw_interface_subif_t *sub = NULL; - int ret; - - /* Toss the old name table */ - /* *INDENT-OFF* */ - hash_foreach_pair (p, vam->sw_if_index_by_interface_name, - ({ - vec_add2 (nses, ns, 1); - ns->name = (u8 *)(p->key); - ns->value = (u32) p->value[0]; - })); - /* *INDENT-ON* */ - - hash_free (vam->sw_if_index_by_interface_name); - - vec_foreach (ns, nses) vec_free (ns->name); - - vec_free (nses); - - vec_foreach (sub, vam->sw_if_subif_table) - { - vec_free (sub->interface_name); - } - vec_free (vam->sw_if_subif_table); - - /* recreate the interface name hash table */ - vam->sw_if_index_by_interface_name = hash_create_string (0, sizeof (uword)); - - /* - * Ask for all interface names. Otherwise, the epic catalog of - * name filters becomes ridiculously long, and vat ends up needing - * to be taught about new interface types. - */ - M (SW_INTERFACE_DUMP, mp); - S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - W (ret); - return ret; -} - -static int -api_sw_interface_set_flags (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_flags_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u8 admin_up = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "admin-up")) - admin_up = 1; - else if (unformat (i, "admin-down")) - admin_up = 0; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - /* Construct the API message */ - M (SW_INTERFACE_SET_FLAGS, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->flags = ntohl ((admin_up) ? IF_STATUS_API_FLAG_ADMIN_UP : 0); - - /* send it... */ - S (mp); - - /* Wait for a reply, return the good/bad news... */ - W (ret); - return ret; -} - -static int -api_sw_interface_set_rx_mode (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_rx_mode_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - int ret; - u8 queue_id_valid = 0; - u32 queue_id; - vnet_hw_interface_rx_mode mode = VNET_HW_INTERFACE_RX_MODE_UNKNOWN; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "queue %d", &queue_id)) - queue_id_valid = 1; - else if (unformat (i, "polling")) - mode = VNET_HW_INTERFACE_RX_MODE_POLLING; - else if (unformat (i, "interrupt")) - mode = VNET_HW_INTERFACE_RX_MODE_INTERRUPT; - else if (unformat (i, "adaptive")) - mode = VNET_HW_INTERFACE_RX_MODE_ADAPTIVE; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - if (mode == VNET_HW_INTERFACE_RX_MODE_UNKNOWN) - { - errmsg ("missing rx-mode"); - return -99; - } - - /* Construct the API message */ - M (SW_INTERFACE_SET_RX_MODE, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->mode = (vl_api_rx_mode_t) mode; - mp->queue_id_valid = queue_id_valid; - mp->queue_id = queue_id_valid ? ntohl (queue_id) : ~0; - - /* send it... */ - S (mp); - - /* Wait for a reply, return the good/bad news... */ - W (ret); - return ret; -} - -static int -api_sw_interface_set_rx_placement (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_rx_placement_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - int ret; - u8 is_main = 0; - u32 queue_id, thread_index; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "queue %d", &queue_id)) - ; - else if (unformat (i, "main")) - is_main = 1; - else if (unformat (i, "worker %d", &thread_index)) - ; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - if (is_main) - thread_index = 0; - /* Construct the API message */ - M (SW_INTERFACE_SET_RX_PLACEMENT, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->worker_id = ntohl (thread_index); - mp->queue_id = ntohl (queue_id); - mp->is_main = is_main; - - /* send it... */ - S (mp); - /* Wait for a reply, return the good/bad news... */ - W (ret); - return ret; -} - -static void vl_api_sw_interface_rx_placement_details_t_handler - (vl_api_sw_interface_rx_placement_details_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 worker_id = ntohl (mp->worker_id); - - print (vam->ofp, - "\n%-11d %-11s %-6d %-5d %-9s", - ntohl (mp->sw_if_index), (worker_id == 0) ? "main" : "worker", - worker_id, ntohl (mp->queue_id), - (mp->mode == - 1) ? "polling" : ((mp->mode == 2) ? "interrupt" : "adaptive")); -} - -static void vl_api_sw_interface_rx_placement_details_t_handler_json - (vl_api_sw_interface_rx_placement_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_uint (node, "worker_id", ntohl (mp->worker_id)); - vat_json_object_add_uint (node, "queue_id", ntohl (mp->queue_id)); - vat_json_object_add_uint (node, "mode", mp->mode); -} - -static int -api_sw_interface_rx_placement_dump (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_rx_placement_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; - u32 sw_if_index; - u8 sw_if_index_set = 0; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set++; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set++; - else - break; - } - - print (vam->ofp, - "\n%-11s %-11s %-6s %-5s %-4s", - "sw_if_index", "main/worker", "thread", "queue", "mode"); - - /* Dump Interface rx placement */ - M (SW_INTERFACE_RX_PLACEMENT_DUMP, mp); - - if (sw_if_index_set) - mp->sw_if_index = htonl (sw_if_index); - else - mp->sw_if_index = ~0; - - S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - W (ret); - return ret; -} - -static int -api_sw_interface_clear_stats (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_clear_stats_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - break; - } - - /* Construct the API message */ - M (SW_INTERFACE_CLEAR_STATS, mp); - - if (sw_if_index_set == 1) - mp->sw_if_index = ntohl (sw_if_index); - else - mp->sw_if_index = ~0; - - /* send it... */ - S (mp); - - /* Wait for a reply, return the good/bad news... */ - W (ret); - return ret; -} - -static int -api_sw_interface_add_del_address (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_add_del_address_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u8 is_add = 1, del_all = 0; - u32 address_length = 0; - u8 v4_address_set = 0; - u8 v6_address_set = 0; - ip4_address_t v4address; - ip6_address_t v6address; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "del-all")) - del_all = 1; - else if (unformat (i, "del")) - is_add = 0; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "%U/%d", - unformat_ip4_address, &v4address, &address_length)) - v4_address_set = 1; - else if (unformat (i, "%U/%d", - unformat_ip6_address, &v6address, &address_length)) - v6_address_set = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - if (v4_address_set && v6_address_set) - { - errmsg ("both v4 and v6 addresses set"); - return -99; - } - if (!v4_address_set && !v6_address_set && !del_all) - { - errmsg ("no addresses set"); - return -99; - } - - /* Construct the API message */ - M (SW_INTERFACE_ADD_DEL_ADDRESS, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->is_add = is_add; - mp->del_all = del_all; - if (v6_address_set) - { - mp->prefix.address.af = ADDRESS_IP6; - clib_memcpy (mp->prefix.address.un.ip6, &v6address, sizeof (v6address)); - } - else - { - mp->prefix.address.af = ADDRESS_IP4; - clib_memcpy (mp->prefix.address.un.ip4, &v4address, sizeof (v4address)); - } - mp->prefix.len = address_length; - - /* send it... */ - S (mp); - - /* Wait for a reply, return good/bad news */ - W (ret); - return ret; -} - -static int -api_sw_interface_set_mpls_enable (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_mpls_enable_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u8 enable = 1; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "disable")) - enable = 0; - else if (unformat (i, "dis")) - enable = 0; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - /* Construct the API message */ - M (SW_INTERFACE_SET_MPLS_ENABLE, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->enable = enable; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_sw_interface_set_table (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_table_t *mp; - u32 sw_if_index, vrf_id = 0; - u8 sw_if_index_set = 0; - u8 is_ipv6 = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "vrf %d", &vrf_id)) - ; - else if (unformat (i, "ipv6")) - is_ipv6 = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - /* Construct the API message */ - M (SW_INTERFACE_SET_TABLE, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->is_ipv6 = is_ipv6; - mp->vrf_id = ntohl (vrf_id); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static void vl_api_sw_interface_get_table_reply_t_handler - (vl_api_sw_interface_get_table_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "%d", ntohl (mp->vrf_id)); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; - -} - -static void vl_api_sw_interface_get_table_reply_t_handler_json - (vl_api_sw_interface_get_table_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object (&node); - vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_int (&node, "vrf_id", ntohl (mp->vrf_id)); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static int -api_sw_interface_get_table (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_get_table_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u8 is_ipv6 = 0; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "ipv6")) - is_ipv6 = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - M (SW_INTERFACE_GET_TABLE, mp); - mp->sw_if_index = htonl (sw_if_index); - mp->is_ipv6 = is_ipv6; - - S (mp); - W (ret); - return ret; -} - -static int -api_sw_interface_set_vpath (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_vpath_t *mp; - u32 sw_if_index = 0; - u8 sw_if_index_set = 0; - u8 is_enable = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "enable")) - is_enable = 1; - else if (unformat (i, "disable")) - is_enable = 0; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - /* Construct the API message */ - M (SW_INTERFACE_SET_VPATH, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->enable = is_enable; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_sw_interface_set_vxlan_bypass (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_vxlan_bypass_t *mp; - u32 sw_if_index = 0; - u8 sw_if_index_set = 0; - u8 is_enable = 1; - u8 is_ipv6 = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "enable")) - is_enable = 1; - else if (unformat (i, "disable")) - is_enable = 0; - else if (unformat (i, "ip4")) - is_ipv6 = 0; - else if (unformat (i, "ip6")) - is_ipv6 = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - /* Construct the API message */ - M (SW_INTERFACE_SET_VXLAN_BYPASS, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->enable = is_enable; - mp->is_ipv6 = is_ipv6; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_sw_interface_set_geneve_bypass (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_geneve_bypass_t *mp; - u32 sw_if_index = 0; - u8 sw_if_index_set = 0; - u8 is_enable = 1; - u8 is_ipv6 = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "enable")) - is_enable = 1; - else if (unformat (i, "disable")) - is_enable = 0; - else if (unformat (i, "ip4")) - is_ipv6 = 0; - else if (unformat (i, "ip6")) - is_ipv6 = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - /* Construct the API message */ - M (SW_INTERFACE_SET_GENEVE_BYPASS, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->enable = is_enable; - mp->is_ipv6 = is_ipv6; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_sw_interface_set_l2_xconnect (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_l2_xconnect_t *mp; - u32 rx_sw_if_index; - u8 rx_sw_if_index_set = 0; - u32 tx_sw_if_index; - u8 tx_sw_if_index_set = 0; - u8 enable = 1; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index)) - rx_sw_if_index_set = 1; - else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index)) - tx_sw_if_index_set = 1; - else if (unformat (i, "rx")) - { - if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, - &rx_sw_if_index)) - rx_sw_if_index_set = 1; - } - else - break; - } - else if (unformat (i, "tx")) - { - if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, - &tx_sw_if_index)) - tx_sw_if_index_set = 1; - } - else - break; - } - else if (unformat (i, "enable")) - enable = 1; - else if (unformat (i, "disable")) - enable = 0; - else - break; - } - - if (rx_sw_if_index_set == 0) - { - errmsg ("missing rx interface name or rx_sw_if_index"); - return -99; - } - - if (enable && (tx_sw_if_index_set == 0)) - { - errmsg ("missing tx interface name or tx_sw_if_index"); - return -99; - } - - M (SW_INTERFACE_SET_L2_XCONNECT, mp); - - mp->rx_sw_if_index = ntohl (rx_sw_if_index); - mp->tx_sw_if_index = ntohl (tx_sw_if_index); - mp->enable = enable; - - S (mp); - W (ret); - return ret; -} - -static int -api_sw_interface_set_l2_bridge (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_l2_bridge_t *mp; - vl_api_l2_port_type_t port_type; - u32 rx_sw_if_index; - u8 rx_sw_if_index_set = 0; - u32 bd_id; - u8 bd_id_set = 0; - u32 shg = 0; - u8 enable = 1; - int ret; - - port_type = L2_API_PORT_TYPE_NORMAL; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "sw_if_index %d", &rx_sw_if_index)) - rx_sw_if_index_set = 1; - else if (unformat (i, "bd_id %d", &bd_id)) - bd_id_set = 1; - else - if (unformat - (i, "%U", api_unformat_sw_if_index, vam, &rx_sw_if_index)) - rx_sw_if_index_set = 1; - else if (unformat (i, "shg %d", &shg)) - ; - else if (unformat (i, "bvi")) - port_type = L2_API_PORT_TYPE_BVI; - else if (unformat (i, "uu-fwd")) - port_type = L2_API_PORT_TYPE_UU_FWD; - else if (unformat (i, "enable")) - enable = 1; - else if (unformat (i, "disable")) - enable = 0; - else - break; - } - - if (rx_sw_if_index_set == 0) - { - errmsg ("missing rx interface name or sw_if_index"); - return -99; - } - - if (enable && (bd_id_set == 0)) - { - errmsg ("missing bridge domain"); - return -99; - } - - M (SW_INTERFACE_SET_L2_BRIDGE, mp); - - mp->rx_sw_if_index = ntohl (rx_sw_if_index); - mp->bd_id = ntohl (bd_id); - mp->shg = (u8) shg; - mp->port_type = ntohl (port_type); - mp->enable = enable; - - S (mp); - W (ret); - return ret; -} - -static int -api_bridge_domain_dump (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bridge_domain_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 bd_id = ~0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)) - ; - else - break; - } - - M (BRIDGE_DOMAIN_DUMP, mp); - mp->bd_id = ntohl (bd_id); - S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - W (ret); - return ret; -} - -static int -api_bridge_domain_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bridge_domain_add_del_t *mp; - u32 bd_id = ~0; - u8 is_add = 1; - u32 flood = 1, forward = 1, learn = 1, uu_flood = 1, arp_term = 0; - u8 *bd_tag = NULL; - u32 mac_age = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)) - ; - else if (unformat (i, "flood %d", &flood)) - ; - else if (unformat (i, "uu-flood %d", &uu_flood)) - ; - else if (unformat (i, "forward %d", &forward)) - ; - else if (unformat (i, "learn %d", &learn)) - ; - else if (unformat (i, "arp-term %d", &arp_term)) - ; - else if (unformat (i, "mac-age %d", &mac_age)) - ; - else if (unformat (i, "bd-tag %s", &bd_tag)) - ; - else if (unformat (i, "del")) - { - is_add = 0; - flood = uu_flood = forward = learn = 0; - } - else - break; - } - - if (bd_id == ~0) - { - errmsg ("missing bridge domain"); - ret = -99; - goto done; - } - - if (mac_age > 255) - { - errmsg ("mac age must be less than 256 "); - ret = -99; - goto done; - } - - if ((bd_tag) && (vec_len (bd_tag) > 63)) - { - errmsg ("bd-tag cannot be longer than 63"); - ret = -99; - goto done; - } - - M (BRIDGE_DOMAIN_ADD_DEL, mp); - - mp->bd_id = ntohl (bd_id); - mp->flood = flood; - mp->uu_flood = uu_flood; - mp->forward = forward; - mp->learn = learn; - mp->arp_term = arp_term; - mp->is_add = is_add; - mp->mac_age = (u8) mac_age; - if (bd_tag) - { - clib_memcpy (mp->bd_tag, bd_tag, vec_len (bd_tag)); - mp->bd_tag[vec_len (bd_tag)] = 0; - } - S (mp); - W (ret); - -done: - vec_free (bd_tag); - return ret; -} - -static int -api_l2fib_flush_bd (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_l2fib_flush_bd_t *mp; - u32 bd_id = ~0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)); - else - break; - } - - if (bd_id == ~0) - { - errmsg ("missing bridge domain"); - return -99; - } - - M (L2FIB_FLUSH_BD, mp); - - mp->bd_id = htonl (bd_id); - - S (mp); - W (ret); - return ret; -} - -static int -api_l2fib_flush_int (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_l2fib_flush_int_t *mp; - u32 sw_if_index = ~0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "sw_if_index %d", &sw_if_index)); - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)); - else - break; - } - - if (sw_if_index == ~0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - M (L2FIB_FLUSH_INT, mp); - - mp->sw_if_index = ntohl (sw_if_index); - - S (mp); - W (ret); - return ret; -} - -static int -api_l2fib_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_l2fib_add_del_t *mp; - f64 timeout; - u8 mac[6] = { 0 }; - u8 mac_set = 0; - u32 bd_id; - u8 bd_id_set = 0; - u32 sw_if_index = 0; - u8 sw_if_index_set = 0; - u8 is_add = 1; - u8 static_mac = 0; - u8 filter_mac = 0; - u8 bvi_mac = 0; - int count = 1; - f64 before = 0; - int j; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "mac %U", unformat_ethernet_address, mac)) - mac_set = 1; - else if (unformat (i, "bd_id %d", &bd_id)) - bd_id_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if")) - { - if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat - (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - } - else - break; - } - else if (unformat (i, "static")) - static_mac = 1; - else if (unformat (i, "filter")) - { - filter_mac = 1; - static_mac = 1; - } - else if (unformat (i, "bvi")) - { - bvi_mac = 1; - static_mac = 1; - } - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "count %d", &count)) - ; - else - break; - } - - if (mac_set == 0) - { - errmsg ("missing mac address"); - return -99; - } - - if (bd_id_set == 0) - { - errmsg ("missing bridge domain"); - return -99; - } - - if (is_add && sw_if_index_set == 0 && filter_mac == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - if (count > 1) - { - /* Turn on async mode */ - vam->async_mode = 1; - vam->async_errors = 0; - before = vat_time_now (vam); - } - - for (j = 0; j < count; j++) - { - M (L2FIB_ADD_DEL, mp); - - clib_memcpy (mp->mac, mac, 6); - mp->bd_id = ntohl (bd_id); - mp->is_add = is_add; - mp->sw_if_index = ntohl (sw_if_index); - - if (is_add) - { - mp->static_mac = static_mac; - mp->filter_mac = filter_mac; - mp->bvi_mac = bvi_mac; - } - increment_mac_address (mac); - /* send it... */ - S (mp); - } - - if (count > 1) - { - vl_api_control_ping_t *mp_ping; - f64 after; - - /* Shut off async mode */ - vam->async_mode = 0; - - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - timeout = vat_time_now (vam) + 1.0; - while (vat_time_now (vam) < timeout) - if (vam->result_ready == 1) - goto out; - vam->retval = -99; - - out: - if (vam->retval == -99) - errmsg ("timeout"); - - if (vam->async_errors > 0) - { - errmsg ("%d asynchronous errors", vam->async_errors); - vam->retval = -98; - } - vam->async_errors = 0; - after = vat_time_now (vam); - - print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec", - count, after - before, count / (after - before)); - } - else - { - int ret; - - /* Wait for a reply... */ - W (ret); - return ret; - } - /* Return the good/bad news */ - return (vam->retval); -} - -static int -api_bridge_domain_set_mac_age (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bridge_domain_set_mac_age_t *mp; - u32 bd_id = ~0; - u32 mac_age = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)); - else if (unformat (i, "mac-age %d", &mac_age)); - else - break; - } - - if (bd_id == ~0) - { - errmsg ("missing bridge domain"); - return -99; - } - - if (mac_age > 255) - { - errmsg ("mac age must be less than 256 "); - return -99; - } - - M (BRIDGE_DOMAIN_SET_MAC_AGE, mp); - - mp->bd_id = htonl (bd_id); - mp->mac_age = (u8) mac_age; - - S (mp); - W (ret); - return ret; -} - -static int -api_l2_flags (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_l2_flags_t *mp; - u32 sw_if_index; - u32 flags = 0; - u8 sw_if_index_set = 0; - u8 is_set = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if")) - { - if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat - (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - } - else - break; - } - else if (unformat (i, "learn")) - flags |= L2_LEARN; - else if (unformat (i, "forward")) - flags |= L2_FWD; - else if (unformat (i, "flood")) - flags |= L2_FLOOD; - else if (unformat (i, "uu-flood")) - flags |= L2_UU_FLOOD; - else if (unformat (i, "arp-term")) - flags |= L2_ARP_TERM; - else if (unformat (i, "off")) - is_set = 0; - else if (unformat (i, "disable")) - is_set = 0; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - M (L2_FLAGS, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->feature_bitmap = ntohl (flags); - mp->is_set = is_set; - - S (mp); - W (ret); - return ret; -} - -static int -api_bridge_flags (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bridge_flags_t *mp; - u32 bd_id; - u8 bd_id_set = 0; - u8 is_set = 1; - bd_flags_t flags = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)) - bd_id_set = 1; - else if (unformat (i, "learn")) - flags |= BRIDGE_API_FLAG_LEARN; - else if (unformat (i, "forward")) - flags |= BRIDGE_API_FLAG_FWD; - else if (unformat (i, "flood")) - flags |= BRIDGE_API_FLAG_FLOOD; - else if (unformat (i, "uu-flood")) - flags |= BRIDGE_API_FLAG_UU_FLOOD; - else if (unformat (i, "arp-term")) - flags |= BRIDGE_API_FLAG_ARP_TERM; - else if (unformat (i, "off")) - is_set = 0; - else if (unformat (i, "disable")) - is_set = 0; - else - break; - } - - if (bd_id_set == 0) - { - errmsg ("missing bridge domain"); - return -99; - } - - M (BRIDGE_FLAGS, mp); - - mp->bd_id = ntohl (bd_id); - mp->flags = ntohl (flags); - mp->is_set = is_set; - - S (mp); - W (ret); - return ret; -} - -static int -api_bd_ip_mac_add_del (vat_main_t * vam) -{ - vl_api_address_t ip = VL_API_ZERO_ADDRESS; - vl_api_mac_address_t mac = { 0 }; - unformat_input_t *i = vam->input; - vl_api_bd_ip_mac_add_del_t *mp; - u32 bd_id; - u8 is_add = 1; - u8 bd_id_set = 0; - u8 ip_set = 0; - u8 mac_set = 0; - int ret; - - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)) - { - bd_id_set++; - } - else if (unformat (i, "%U", unformat_vl_api_address, &ip)) - { - ip_set++; - } - else if (unformat (i, "%U", unformat_vl_api_mac_address, &mac)) - { - mac_set++; - } - else if (unformat (i, "del")) - is_add = 0; - else - break; - } - - if (bd_id_set == 0) - { - errmsg ("missing bridge domain"); - return -99; - } - else if (ip_set == 0) - { - errmsg ("missing IP address"); - return -99; - } - else if (mac_set == 0) - { - errmsg ("missing MAC address"); - return -99; - } - - M (BD_IP_MAC_ADD_DEL, mp); - - mp->entry.bd_id = ntohl (bd_id); - mp->is_add = is_add; - - clib_memcpy (&mp->entry.ip, &ip, sizeof (ip)); - clib_memcpy (&mp->entry.mac, &mac, sizeof (mac)); - - S (mp); - W (ret); - return ret; -} - -static int -api_bd_ip_mac_flush (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bd_ip_mac_flush_t *mp; - u32 bd_id; - u8 bd_id_set = 0; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)) - { - bd_id_set++; - } - else - break; - } - - if (bd_id_set == 0) - { - errmsg ("missing bridge domain"); - return -99; - } - - M (BD_IP_MAC_FLUSH, mp); - - mp->bd_id = ntohl (bd_id); - - S (mp); - W (ret); - return ret; -} - -static void vl_api_bd_ip_mac_details_t_handler - (vl_api_bd_ip_mac_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, - "\n%-5d %U %U", - ntohl (mp->entry.bd_id), - format_vl_api_mac_address, mp->entry.mac, - format_vl_api_address, &mp->entry.ip); -} - -static void vl_api_bd_ip_mac_details_t_handler_json - (vl_api_bd_ip_mac_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_uint (node, "bd_id", ntohl (mp->entry.bd_id)); - vat_json_object_add_string_copy (node, "mac_address", - format (0, "%U", format_vl_api_mac_address, - &mp->entry.mac)); - u8 *ip = 0; - - ip = format (0, "%U", format_vl_api_address, &mp->entry.ip); - vat_json_object_add_string_copy (node, "ip_address", ip); - vec_free (ip); -} - -static int -api_bd_ip_mac_dump (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bd_ip_mac_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; - u32 bd_id; - u8 bd_id_set = 0; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)) - { - bd_id_set++; - } - else - break; - } - - print (vam->ofp, - "\n%-5s %-7s %-20s %-30s", - "bd_id", "is_ipv6", "mac_address", "ip_address"); - - /* Dump Bridge Domain Ip to Mac entries */ - M (BD_IP_MAC_DUMP, mp); - - if (bd_id_set) - mp->bd_id = htonl (bd_id); - else - mp->bd_id = ~0; - - S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - W (ret); - return ret; -} - -static int -api_tap_create_v2 (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_tap_create_v2_t *mp; -#define TAP_FLAG_GSO (1 << 0) - u8 mac_address[6]; - u8 random_mac = 1; - u32 id = ~0; - u8 *host_if_name = 0; - u8 *host_ns = 0; - u8 host_mac_addr[6]; - u8 host_mac_addr_set = 0; - u8 *host_bridge = 0; - ip4_address_t host_ip4_addr; - ip4_address_t host_ip4_gw; - u8 host_ip4_gw_set = 0; - u32 host_ip4_prefix_len = 0; - ip6_address_t host_ip6_addr; - ip6_address_t host_ip6_gw; - u8 host_ip6_gw_set = 0; - u32 host_ip6_prefix_len = 0; - u8 host_mtu_set = 0; - u32 host_mtu_size = 0; - u32 tap_flags = 0; - int ret; - u32 rx_ring_sz = 0, tx_ring_sz = 0; - - clib_memset (mac_address, 0, sizeof (mac_address)); - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "hw-addr %U", unformat_ethernet_address, mac_address)) - { - random_mac = 0; - } - else if (unformat (i, "id %u", &id)) - ; - else if (unformat (i, "host-if-name %s", &host_if_name)) - ; - else if (unformat (i, "host-ns %s", &host_ns)) - ; - else if (unformat (i, "host-mac-addr %U", unformat_ethernet_address, - host_mac_addr)) - host_mac_addr_set = 1; - else if (unformat (i, "host-bridge %s", &host_bridge)) - ; - else if (unformat (i, "host-ip4-addr %U/%d", unformat_ip4_address, - &host_ip4_addr, &host_ip4_prefix_len)) - ; - else if (unformat (i, "host-ip6-addr %U/%d", unformat_ip6_address, - &host_ip6_addr, &host_ip6_prefix_len)) - ; - else if (unformat (i, "host-ip4-gw %U", unformat_ip4_address, - &host_ip4_gw)) - host_ip4_gw_set = 1; - else if (unformat (i, "host-ip6-gw %U", unformat_ip6_address, - &host_ip6_gw)) - host_ip6_gw_set = 1; - else if (unformat (i, "rx-ring-size %d", &rx_ring_sz)) - ; - else if (unformat (i, "tx-ring-size %d", &tx_ring_sz)) - ; - else if (unformat (i, "host-mtu-size %d", &host_mtu_size)) - host_mtu_set = 1; - else if (unformat (i, "no-gso")) - tap_flags &= ~TAP_FLAG_GSO; - else if (unformat (i, "gso")) - tap_flags |= TAP_FLAG_GSO; - else - break; - } - - if (vec_len (host_if_name) > 63) - { - errmsg ("tap name too long. "); - return -99; - } - if (vec_len (host_ns) > 63) - { - errmsg ("host name space too long. "); - return -99; - } - if (vec_len (host_bridge) > 63) - { - errmsg ("host bridge name too long. "); - return -99; - } - if (host_ip4_prefix_len > 32) - { - errmsg ("host ip4 prefix length not valid. "); - return -99; - } - if (host_ip6_prefix_len > 128) - { - errmsg ("host ip6 prefix length not valid. "); - return -99; - } - if (!is_pow2 (rx_ring_sz)) - { - errmsg ("rx ring size must be power of 2. "); - return -99; - } - if (rx_ring_sz > 32768) - { - errmsg ("rx ring size must be 32768 or lower. "); - return -99; - } - if (!is_pow2 (tx_ring_sz)) - { - errmsg ("tx ring size must be power of 2. "); - return -99; - } - if (tx_ring_sz > 32768) - { - errmsg ("tx ring size must be 32768 or lower. "); - return -99; - } - if (host_mtu_set && (host_mtu_size < 64 || host_mtu_size > 65355)) - { - errmsg ("host MTU size must be in between 64 and 65355. "); - return -99; - } - - /* Construct the API message */ - M (TAP_CREATE_V2, mp); - - mp->use_random_mac = random_mac; - - mp->id = ntohl (id); - mp->host_namespace_set = host_ns != 0; - mp->host_bridge_set = host_bridge != 0; - mp->host_ip4_prefix_set = host_ip4_prefix_len != 0; - mp->host_ip6_prefix_set = host_ip6_prefix_len != 0; - mp->rx_ring_sz = ntohs (rx_ring_sz); - mp->tx_ring_sz = ntohs (tx_ring_sz); - mp->host_mtu_set = host_mtu_set; - mp->host_mtu_size = ntohl (host_mtu_size); - mp->tap_flags = ntohl (tap_flags); - - if (random_mac == 0) - clib_memcpy (mp->mac_address, mac_address, 6); - if (host_mac_addr_set) - clib_memcpy (mp->host_mac_addr, host_mac_addr, 6); - if (host_if_name) - clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name)); - if (host_ns) - clib_memcpy (mp->host_namespace, host_ns, vec_len (host_ns)); - if (host_bridge) - clib_memcpy (mp->host_bridge, host_bridge, vec_len (host_bridge)); - if (host_ip4_prefix_len) - clib_memcpy (mp->host_ip4_prefix.address, &host_ip4_addr, 4); - if (host_ip6_prefix_len) - clib_memcpy (mp->host_ip6_prefix.address, &host_ip6_addr, 16); - if (host_ip4_gw_set) - clib_memcpy (mp->host_ip4_gw, &host_ip4_gw, 4); - if (host_ip6_gw_set) - clib_memcpy (mp->host_ip6_gw, &host_ip6_gw, 16); - - vec_free (host_ns); - vec_free (host_if_name); - vec_free (host_bridge); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_tap_delete_v2 (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_tap_delete_v2_t *mp; - u32 sw_if_index = ~0; - u8 sw_if_index_set = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing vpp interface name. "); - return -99; - } - - /* Construct the API message */ - M (TAP_DELETE_V2, mp); - - mp->sw_if_index = ntohl (sw_if_index); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -uword -unformat_vlib_pci_addr (unformat_input_t * input, va_list * args) -{ - vlib_pci_addr_t *addr = va_arg (*args, vlib_pci_addr_t *); - u32 x[4]; - - if (!unformat (input, "%x:%x:%x.%x", &x[0], &x[1], &x[2], &x[3])) - return 0; - - addr->domain = x[0]; - addr->bus = x[1]; - addr->slot = x[2]; - addr->function = x[3]; - - return 1; -} - -static int -api_virtio_pci_create (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_virtio_pci_create_t *mp; - u8 mac_address[6]; - u8 random_mac = 1; - u8 gso_enabled = 0; - u8 checksum_offload_enabled = 0; - u32 pci_addr = 0; - u64 features = (u64) ~ (0ULL); - int ret; - - clib_memset (mac_address, 0, sizeof (mac_address)); - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "hw-addr %U", unformat_ethernet_address, mac_address)) - { - random_mac = 0; - } - else if (unformat (i, "pci-addr %U", unformat_vlib_pci_addr, &pci_addr)) - ; - else if (unformat (i, "features 0x%llx", &features)) - ; - else if (unformat (i, "gso-enabled")) - gso_enabled = 1; - else if (unformat (i, "csum-offload-enabled")) - checksum_offload_enabled = 1; - else - break; - } - - if (pci_addr == 0) - { - errmsg ("pci address must be non zero. "); - return -99; - } - - /* Construct the API message */ - M (VIRTIO_PCI_CREATE, mp); - - mp->use_random_mac = random_mac; - - mp->pci_addr.domain = htons (((vlib_pci_addr_t) pci_addr).domain); - mp->pci_addr.bus = ((vlib_pci_addr_t) pci_addr).bus; - mp->pci_addr.slot = ((vlib_pci_addr_t) pci_addr).slot; - mp->pci_addr.function = ((vlib_pci_addr_t) pci_addr).function; - - mp->features = clib_host_to_net_u64 (features); - mp->gso_enabled = gso_enabled; - mp->checksum_offload_enabled = checksum_offload_enabled; - - if (random_mac == 0) - clib_memcpy (mp->mac_address, mac_address, 6); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_virtio_pci_delete (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_virtio_pci_delete_t *mp; - u32 sw_if_index = ~0; - u8 sw_if_index_set = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing vpp interface name. "); - return -99; - } - - /* Construct the API message */ - M (VIRTIO_PCI_DELETE, mp); - - mp->sw_if_index = htonl (sw_if_index); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_bond_create (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bond_create_t *mp; - u8 mac_address[6]; - u8 custom_mac = 0; - int ret; - u8 mode; - u8 lb; - u8 mode_is_set = 0; - u32 id = ~0; - u8 numa_only = 0; - - clib_memset (mac_address, 0, sizeof (mac_address)); - lb = BOND_LB_L2; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "mode %U", unformat_bond_mode, &mode)) - mode_is_set = 1; - else if (((mode == BOND_MODE_LACP) || (mode == BOND_MODE_XOR)) - && unformat (i, "lb %U", unformat_bond_load_balance, &lb)) - ; - else if (unformat (i, "hw-addr %U", unformat_ethernet_address, - mac_address)) - custom_mac = 1; - else if (unformat (i, "numa-only")) - numa_only = 1; - else if (unformat (i, "id %u", &id)) - ; - else - break; - } - - if (mode_is_set == 0) - { - errmsg ("Missing bond mode. "); - return -99; - } - - /* Construct the API message */ - M (BOND_CREATE, mp); - - mp->use_custom_mac = custom_mac; - - mp->mode = htonl (mode); - mp->lb = htonl (lb); - mp->id = htonl (id); - mp->numa_only = numa_only; - - if (custom_mac) - clib_memcpy (mp->mac_address, mac_address, 6); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_bond_delete (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bond_delete_t *mp; - u32 sw_if_index = ~0; - u8 sw_if_index_set = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing vpp interface name. "); - return -99; - } - - /* Construct the API message */ - M (BOND_DELETE, mp); - - mp->sw_if_index = ntohl (sw_if_index); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_bond_enslave (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bond_enslave_t *mp; - u32 bond_sw_if_index; - int ret; - u8 is_passive; - u8 is_long_timeout; - u32 bond_sw_if_index_is_set = 0; - u32 sw_if_index; - u8 sw_if_index_is_set = 0; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_is_set = 1; - else if (unformat (i, "bond %u", &bond_sw_if_index)) - bond_sw_if_index_is_set = 1; - else if (unformat (i, "passive %d", &is_passive)) - ; - else if (unformat (i, "long-timeout %d", &is_long_timeout)) - ; - else - break; - } - - if (bond_sw_if_index_is_set == 0) - { - errmsg ("Missing bond sw_if_index. "); - return -99; - } - if (sw_if_index_is_set == 0) - { - errmsg ("Missing slave sw_if_index. "); - return -99; - } - - /* Construct the API message */ - M (BOND_ENSLAVE, mp); - - mp->bond_sw_if_index = ntohl (bond_sw_if_index); - mp->sw_if_index = ntohl (sw_if_index); - mp->is_long_timeout = is_long_timeout; - mp->is_passive = is_passive; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_bond_detach_slave (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bond_detach_slave_t *mp; - u32 sw_if_index = ~0; - u8 sw_if_index_set = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing vpp interface name. "); - return -99; - } - - /* Construct the API message */ - M (BOND_DETACH_SLAVE, mp); - - mp->sw_if_index = ntohl (sw_if_index); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_ip_table_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ip_table_add_del_t *mp; - u32 table_id = ~0; - u8 is_ipv6 = 0; - u8 is_add = 1; - int ret = 0; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "ipv6")) - is_ipv6 = 1; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "add")) - is_add = 1; - else if (unformat (i, "table %d", &table_id)) - ; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (~0 == table_id) - { - errmsg ("missing table-ID"); - return -99; - } - - /* Construct the API message */ - M (IP_TABLE_ADD_DEL, mp); - - mp->table.table_id = ntohl (table_id); - mp->table.is_ip6 = is_ipv6; - mp->is_add = is_add; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - - return ret; -} - -uword -unformat_fib_path (unformat_input_t * input, va_list * args) -{ - vat_main_t *vam = va_arg (*args, vat_main_t *); - vl_api_fib_path_t *path = va_arg (*args, vl_api_fib_path_t *); - u32 weight, preference; - mpls_label_t out_label; - - clib_memset (path, 0, sizeof (*path)); - path->weight = 1; - path->sw_if_index = ~0; - path->rpf_id = ~0; - path->n_labels = 0; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "%U %U", - unformat_vl_api_ip4_address, - &path->nh.address.ip4, - api_unformat_sw_if_index, vam, &path->sw_if_index)) - { - path->proto = FIB_API_PATH_NH_PROTO_IP4; - } - else if (unformat (input, "%U %U", - unformat_vl_api_ip6_address, - &path->nh.address.ip6, - api_unformat_sw_if_index, vam, &path->sw_if_index)) - { - path->proto = FIB_API_PATH_NH_PROTO_IP6; - } - else if (unformat (input, "weight %u", &weight)) - { - path->weight = weight; - } - else if (unformat (input, "preference %u", &preference)) - { - path->preference = preference; - } - else if (unformat (input, "%U next-hop-table %d", - unformat_vl_api_ip4_address, - &path->nh.address.ip4, &path->table_id)) - { - path->proto = FIB_API_PATH_NH_PROTO_IP4; - } - else if (unformat (input, "%U next-hop-table %d", - unformat_vl_api_ip6_address, - &path->nh.address.ip6, &path->table_id)) - { - path->proto = FIB_API_PATH_NH_PROTO_IP6; - } - else if (unformat (input, "%U", - unformat_vl_api_ip4_address, &path->nh.address.ip4)) - { - /* - * the recursive next-hops are by default in the default table - */ - path->table_id = 0; - path->sw_if_index = ~0; - path->proto = FIB_API_PATH_NH_PROTO_IP4; - } - else if (unformat (input, "%U", - unformat_vl_api_ip6_address, &path->nh.address.ip6)) - { - /* - * the recursive next-hops are by default in the default table - */ - path->table_id = 0; - path->sw_if_index = ~0; - path->proto = FIB_API_PATH_NH_PROTO_IP6; - } - else if (unformat (input, "resolve-via-host")) - { - path->flags |= FIB_API_PATH_FLAG_RESOLVE_VIA_HOST; - } - else if (unformat (input, "resolve-via-attached")) - { - path->flags |= FIB_API_PATH_FLAG_RESOLVE_VIA_ATTACHED; - } - else if (unformat (input, "ip4-lookup-in-table %d", &path->table_id)) - { - path->type = FIB_API_PATH_TYPE_LOCAL; - path->sw_if_index = ~0; - path->proto = FIB_API_PATH_NH_PROTO_IP4; - } - else if (unformat (input, "ip6-lookup-in-table %d", &path->table_id)) - { - path->type = FIB_API_PATH_TYPE_LOCAL; - path->sw_if_index = ~0; - path->proto = FIB_API_PATH_NH_PROTO_IP6; - } - else if (unformat (input, "sw_if_index %d", &path->sw_if_index)) - ; - else if (unformat (input, "via-label %d", &path->nh.via_label)) - { - path->proto = FIB_API_PATH_NH_PROTO_MPLS; - path->sw_if_index = ~0; - } - else if (unformat (input, "l2-input-on %d", &path->sw_if_index)) - { - path->proto = FIB_API_PATH_NH_PROTO_ETHERNET; - path->type = FIB_API_PATH_TYPE_INTERFACE_RX; - } - else if (unformat (input, "local")) - { - path->type = FIB_API_PATH_TYPE_LOCAL; - } - else if (unformat (input, "out-labels")) - { - while (unformat (input, "%d", &out_label)) - { - path->label_stack[path->n_labels].label = out_label; - path->label_stack[path->n_labels].is_uniform = 0; - path->label_stack[path->n_labels].ttl = 64; - path->n_labels++; - } - } - else if (unformat (input, "via")) - { - /* new path, back up and return */ - unformat_put_input (input); - unformat_put_input (input); - unformat_put_input (input); - unformat_put_input (input); - break; - } - else - { - return (0); - } - } - - path->proto = ntohl (path->proto); - path->type = ntohl (path->type); - path->flags = ntohl (path->flags); - path->table_id = ntohl (path->table_id); - path->sw_if_index = ntohl (path->sw_if_index); - - return (1); -} - -static int -api_ip_route_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ip_route_add_del_t *mp; - u32 vrf_id = 0; - u8 is_add = 1; - u8 is_multipath = 0; - u8 prefix_set = 0; - u8 path_count = 0; - vl_api_prefix_t pfx = { }; - vl_api_fib_path_t paths[8]; - int count = 1; - int j; - f64 before = 0; - u32 random_add_del = 0; - u32 *random_vector = 0; - u32 random_seed = 0xdeaddabe; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", unformat_vl_api_prefix, &pfx)) - prefix_set = 1; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "add")) - is_add = 1; - else if (unformat (i, "vrf %d", &vrf_id)) - ; - else if (unformat (i, "count %d", &count)) - ; - else if (unformat (i, "random")) - random_add_del = 1; - else if (unformat (i, "multipath")) - is_multipath = 1; - else if (unformat (i, "seed %d", &random_seed)) - ; - else - if (unformat - (i, "via %U", unformat_fib_path, vam, &paths[path_count])) - { - path_count++; - if (8 == path_count) - { - errmsg ("max 8 paths"); - return -99; - } - } - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!path_count) - { - errmsg ("specify a path; via ..."); - return -99; - } - if (prefix_set == 0) - { - errmsg ("missing prefix"); - return -99; - } - - /* Generate a pile of unique, random routes */ - if (random_add_del) - { - ip4_address_t *i = (ip4_address_t *) & paths[0].nh.address.ip4; - u32 this_random_address; - uword *random_hash; - - random_hash = hash_create (count, sizeof (uword)); - - hash_set (random_hash, i->as_u32, 1); - for (j = 0; j <= count; j++) - { - do - { - this_random_address = random_u32 (&random_seed); - this_random_address = - clib_host_to_net_u32 (this_random_address); - } - while (hash_get (random_hash, this_random_address)); - vec_add1 (random_vector, this_random_address); - hash_set (random_hash, this_random_address, 1); - } - hash_free (random_hash); - set_ip4_address (&pfx.address, random_vector[0]); - } - - if (count > 1) - { - /* Turn on async mode */ - vam->async_mode = 1; - vam->async_errors = 0; - before = vat_time_now (vam); - } - - for (j = 0; j < count; j++) - { - /* Construct the API message */ - M2 (IP_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); - - mp->is_add = is_add; - mp->is_multipath = is_multipath; - - clib_memcpy (&mp->route.prefix, &pfx, sizeof (pfx)); - mp->route.table_id = ntohl (vrf_id); - mp->route.n_paths = path_count; - - clib_memcpy (&mp->route.paths, &paths, sizeof (paths[0]) * path_count); - - if (random_add_del) - set_ip4_address (&pfx.address, random_vector[j + 1]); - else - increment_address (&pfx.address); - /* send it... */ - S (mp); - /* If we receive SIGTERM, stop now... */ - if (vam->do_exit) - break; - } - - /* When testing multiple add/del ops, use a control-ping to sync */ - if (count > 1) - { - vl_api_control_ping_t *mp_ping; - f64 after; - f64 timeout; - - /* Shut off async mode */ - vam->async_mode = 0; - - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - timeout = vat_time_now (vam) + 1.0; - while (vat_time_now (vam) < timeout) - if (vam->result_ready == 1) - goto out; - vam->retval = -99; - - out: - if (vam->retval == -99) - errmsg ("timeout"); - - if (vam->async_errors > 0) - { - errmsg ("%d asynchronous errors", vam->async_errors); - vam->retval = -98; - } - vam->async_errors = 0; - after = vat_time_now (vam); - - /* slim chance, but we might have eaten SIGTERM on the first iteration */ - if (j > 0) - count = j; - - print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec", - count, after - before, count / (after - before)); - } - else - { - int ret; - - /* Wait for a reply... */ - W (ret); - return ret; - } - - /* Return the good/bad news */ - return (vam->retval); -} - -static int -api_ip_mroute_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - u8 path_set = 0, prefix_set = 0, is_add = 1; - vl_api_ip_mroute_add_del_t *mp; - mfib_entry_flags_t eflags = 0; - vl_api_mfib_path_t path; - vl_api_mprefix_t pfx = { }; - u32 vrf_id = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", unformat_vl_api_mprefix, &pfx)) - { - prefix_set = 1; - pfx.grp_address_length = htons (pfx.grp_address_length); - } - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "add")) - is_add = 1; - else if (unformat (i, "vrf %d", &vrf_id)) - ; - else if (unformat (i, "%U", unformat_mfib_itf_flags, &path.itf_flags)) - path.itf_flags = htonl (path.itf_flags); - else if (unformat (i, "%U", unformat_mfib_entry_flags, &eflags)) - ; - else if (unformat (i, "via %U", unformat_fib_path, vam, &path.path)) - path_set = 1; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (prefix_set == 0) - { - errmsg ("missing addresses\n"); - return -99; - } - if (path_set == 0) - { - errmsg ("missing path\n"); - return -99; - } - - /* Construct the API message */ - M (IP_MROUTE_ADD_DEL, mp); - - mp->is_add = is_add; - mp->is_multipath = 1; - - clib_memcpy (&mp->route.prefix, &pfx, sizeof (pfx)); - mp->route.table_id = htonl (vrf_id); - mp->route.n_paths = 1; - mp->route.entry_flags = htonl (eflags); - - clib_memcpy (&mp->route.paths, &path, sizeof (path)); - - /* send it... */ - S (mp); - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_mpls_table_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_mpls_table_add_del_t *mp; - u32 table_id = ~0; - u8 is_add = 1; - int ret = 0; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "table %d", &table_id)) - ; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "add")) - is_add = 1; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (~0 == table_id) - { - errmsg ("missing table-ID"); - return -99; - } - - /* Construct the API message */ - M (MPLS_TABLE_ADD_DEL, mp); - - mp->mt_table.mt_table_id = ntohl (table_id); - mp->mt_is_add = is_add; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - - return ret; -} - -static int -api_mpls_route_add_del (vat_main_t * vam) -{ - u8 is_add = 1, path_count = 0, is_multipath = 0, is_eos = 0; - mpls_label_t local_label = MPLS_LABEL_INVALID; - unformat_input_t *i = vam->input; - vl_api_mpls_route_add_del_t *mp; - vl_api_fib_path_t paths[8]; - int count = 1, j; - f64 before = 0; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%d", &local_label)) - ; - else if (unformat (i, "eos")) - is_eos = 1; - else if (unformat (i, "non-eos")) - is_eos = 0; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "add")) - is_add = 1; - else if (unformat (i, "multipath")) - is_multipath = 1; - else if (unformat (i, "count %d", &count)) - ; - else - if (unformat - (i, "via %U", unformat_fib_path, vam, &paths[path_count])) - { - path_count++; - if (8 == path_count) - { - errmsg ("max 8 paths"); - return -99; - } - } - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!path_count) - { - errmsg ("specify a path; via ..."); - return -99; - } - - if (MPLS_LABEL_INVALID == local_label) - { - errmsg ("missing label"); - return -99; - } - - if (count > 1) - { - /* Turn on async mode */ - vam->async_mode = 1; - vam->async_errors = 0; - before = vat_time_now (vam); - } - - for (j = 0; j < count; j++) - { - /* Construct the API message */ - M2 (MPLS_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); - - mp->mr_is_add = is_add; - mp->mr_is_multipath = is_multipath; - - mp->mr_route.mr_label = local_label; - mp->mr_route.mr_eos = is_eos; - mp->mr_route.mr_table_id = 0; - mp->mr_route.mr_n_paths = path_count; - - clib_memcpy (&mp->mr_route.mr_paths, paths, - sizeof (paths[0]) * path_count); - - local_label++; - - /* send it... */ - S (mp); - /* If we receive SIGTERM, stop now... */ - if (vam->do_exit) - break; - } - - /* When testing multiple add/del ops, use a control-ping to sync */ - if (count > 1) - { - vl_api_control_ping_t *mp_ping; - f64 after; - f64 timeout; - - /* Shut off async mode */ - vam->async_mode = 0; - - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - timeout = vat_time_now (vam) + 1.0; - while (vat_time_now (vam) < timeout) - if (vam->result_ready == 1) - goto out; - vam->retval = -99; - - out: - if (vam->retval == -99) - errmsg ("timeout"); - - if (vam->async_errors > 0) - { - errmsg ("%d asynchronous errors", vam->async_errors); - vam->retval = -98; - } - vam->async_errors = 0; - after = vat_time_now (vam); - - /* slim chance, but we might have eaten SIGTERM on the first iteration */ - if (j > 0) - count = j; - - print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec", - count, after - before, count / (after - before)); - } - else - { - int ret; - - /* Wait for a reply... */ - W (ret); - return ret; - } - - /* Return the good/bad news */ - return (vam->retval); - return (0); -} - -static int -api_mpls_ip_bind_unbind (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_mpls_ip_bind_unbind_t *mp; - u32 ip_table_id = 0; - u8 is_bind = 1; - vl_api_prefix_t pfx; - u8 prefix_set = 0; - mpls_label_t local_label = MPLS_LABEL_INVALID; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", unformat_vl_api_prefix, &pfx)) - prefix_set = 1; - else if (unformat (i, "%d", &local_label)) - ; - else if (unformat (i, "table-id %d", &ip_table_id)) - ; - else if (unformat (i, "unbind")) - is_bind = 0; - else if (unformat (i, "bind")) - is_bind = 1; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!prefix_set) - { - errmsg ("IP prefix not set"); - return -99; - } - - if (MPLS_LABEL_INVALID == local_label) - { - errmsg ("missing label"); - return -99; - } - - /* Construct the API message */ - M (MPLS_IP_BIND_UNBIND, mp); - - mp->mb_is_bind = is_bind; - mp->mb_ip_table_id = ntohl (ip_table_id); - mp->mb_mpls_table_id = 0; - mp->mb_label = ntohl (local_label); - clib_memcpy (&mp->mb_prefix, &pfx, sizeof (pfx)); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; - return (0); -} - -static int -api_sr_mpls_policy_add (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sr_mpls_policy_add_t *mp; - u32 bsid = 0; - u32 weight = 1; - u8 type = 0; - u8 n_segments = 0; - u32 sid; - u32 *segments = NULL; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bsid %d", &bsid)) - ; - else if (unformat (i, "weight %d", &weight)) - ; - else if (unformat (i, "spray")) - type = 1; - else if (unformat (i, "next %d", &sid)) - { - n_segments += 1; - vec_add1 (segments, htonl (sid)); - } - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (bsid == 0) - { - errmsg ("bsid not set"); - return -99; - } - - if (n_segments == 0) - { - errmsg ("no sid in segment stack"); - return -99; - } - - /* Construct the API message */ - M2 (SR_MPLS_POLICY_ADD, mp, sizeof (u32) * n_segments); - - mp->bsid = htonl (bsid); - mp->weight = htonl (weight); - mp->type = type; - mp->n_segments = n_segments; - memcpy (mp->segments, segments, sizeof (u32) * n_segments); - vec_free (segments); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_sr_mpls_policy_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sr_mpls_policy_del_t *mp; - u32 bsid = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bsid %d", &bsid)) - ; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (bsid == 0) - { - errmsg ("bsid not set"); - return -99; - } - - /* Construct the API message */ - M (SR_MPLS_POLICY_DEL, mp); - - mp->bsid = htonl (bsid); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_bier_table_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bier_table_add_del_t *mp; - u8 is_add = 1; - u32 set = 0, sub_domain = 0, hdr_len = 3; - mpls_label_t local_label = MPLS_LABEL_INVALID; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "sub-domain %d", &sub_domain)) - ; - else if (unformat (i, "set %d", &set)) - ; - else if (unformat (i, "label %d", &local_label)) - ; - else if (unformat (i, "hdr-len %d", &hdr_len)) - ; - else if (unformat (i, "add")) - is_add = 1; - else if (unformat (i, "del")) - is_add = 0; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (MPLS_LABEL_INVALID == local_label) - { - errmsg ("missing label\n"); - return -99; - } - - /* Construct the API message */ - M (BIER_TABLE_ADD_DEL, mp); - - mp->bt_is_add = is_add; - mp->bt_label = ntohl (local_label); - mp->bt_tbl_id.bt_set = set; - mp->bt_tbl_id.bt_sub_domain = sub_domain; - mp->bt_tbl_id.bt_hdr_len_id = hdr_len; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - - return (ret); -} - -static int -api_bier_route_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bier_route_add_del_t *mp; - u8 is_add = 1; - u32 set = 0, sub_domain = 0, hdr_len = 3, bp = 0; - ip4_address_t v4_next_hop_address; - ip6_address_t v6_next_hop_address; - u8 next_hop_set = 0; - u8 next_hop_proto_is_ip4 = 1; - mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", unformat_ip4_address, &v4_next_hop_address)) - { - next_hop_proto_is_ip4 = 1; - next_hop_set = 1; - } - else if (unformat (i, "%U", unformat_ip6_address, &v6_next_hop_address)) - { - next_hop_proto_is_ip4 = 0; - next_hop_set = 1; - } - if (unformat (i, "sub-domain %d", &sub_domain)) - ; - else if (unformat (i, "set %d", &set)) - ; - else if (unformat (i, "hdr-len %d", &hdr_len)) - ; - else if (unformat (i, "bp %d", &bp)) - ; - else if (unformat (i, "add")) - is_add = 1; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "out-label %d", &next_hop_out_label)) - ; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!next_hop_set || (MPLS_LABEL_INVALID == next_hop_out_label)) - { - errmsg ("next hop / label set\n"); - return -99; - } - if (0 == bp) - { - errmsg ("bit=position not set\n"); - return -99; - } - - /* Construct the API message */ - M2 (BIER_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t)); - - mp->br_is_add = is_add; - mp->br_route.br_tbl_id.bt_set = set; - mp->br_route.br_tbl_id.bt_sub_domain = sub_domain; - mp->br_route.br_tbl_id.bt_hdr_len_id = hdr_len; - mp->br_route.br_bp = ntohs (bp); - mp->br_route.br_n_paths = 1; - mp->br_route.br_paths[0].n_labels = 1; - mp->br_route.br_paths[0].label_stack[0].label = ntohl (next_hop_out_label); - mp->br_route.br_paths[0].proto = (next_hop_proto_is_ip4 ? - FIB_API_PATH_NH_PROTO_IP4 : - FIB_API_PATH_NH_PROTO_IP6); - - if (next_hop_proto_is_ip4) - { - clib_memcpy (&mp->br_route.br_paths[0].nh.address.ip4, - &v4_next_hop_address, sizeof (v4_next_hop_address)); - } - else - { - clib_memcpy (&mp->br_route.br_paths[0].nh.address.ip6, - &v6_next_hop_address, sizeof (v6_next_hop_address)); - } - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - - return (ret); -} - -static int -api_mpls_tunnel_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_mpls_tunnel_add_del_t *mp; - - vl_api_fib_path_t paths[8]; - u32 sw_if_index = ~0; - u8 path_count = 0; - u8 l2_only = 0; - u8 is_add = 1; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "add")) - is_add = 1; - else - if (unformat - (i, "del %U", api_unformat_sw_if_index, vam, &sw_if_index)) - is_add = 0; - else if (unformat (i, "del sw_if_index %d", &sw_if_index)) - is_add = 0; - else if (unformat (i, "l2-only")) - l2_only = 1; - else - if (unformat - (i, "via %U", unformat_fib_path, vam, &paths[path_count])) - { - path_count++; - if (8 == path_count) - { - errmsg ("max 8 paths"); - return -99; - } - } - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - M2 (MPLS_TUNNEL_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); - - mp->mt_is_add = is_add; - mp->mt_tunnel.mt_sw_if_index = ntohl (sw_if_index); - mp->mt_tunnel.mt_l2_only = l2_only; - mp->mt_tunnel.mt_is_multicast = 0; - mp->mt_tunnel.mt_n_paths = path_count; - - clib_memcpy (&mp->mt_tunnel.mt_paths, &paths, - sizeof (paths[0]) * path_count); - - S (mp); - W (ret); - return ret; -} - -static int -api_sw_interface_set_unnumbered (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_unnumbered_t *mp; - u32 sw_if_index; - u32 unnum_sw_index = ~0; - u8 is_add = 1; - u8 sw_if_index_set = 0; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "unnum_if_index %d", &unnum_sw_index)) - ; - else if (unformat (i, "del")) - is_add = 0; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - M (SW_INTERFACE_SET_UNNUMBERED, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->unnumbered_sw_if_index = ntohl (unnum_sw_index); - mp->is_add = is_add; - - S (mp); - W (ret); - return ret; -} - - -static int -api_create_vlan_subif (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_create_vlan_subif_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u32 vlan_id; - u8 vlan_id_set = 0; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "vlan %d", &vlan_id)) - vlan_id_set = 1; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - if (vlan_id_set == 0) - { - errmsg ("missing vlan_id"); - return -99; - } - M (CREATE_VLAN_SUBIF, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->vlan_id = ntohl (vlan_id); - - S (mp); - W (ret); - return ret; -} - -#define foreach_create_subif_bit \ -_(no_tags) \ -_(one_tag) \ -_(two_tags) \ -_(dot1ad) \ -_(exact_match) \ -_(default_sub) \ -_(outer_vlan_id_any) \ -_(inner_vlan_id_any) - -#define foreach_create_subif_flag \ -_(0, "no_tags") \ -_(1, "one_tag") \ -_(2, "two_tags") \ -_(3, "dot1ad") \ -_(4, "exact_match") \ -_(5, "default_sub") \ -_(6, "outer_vlan_id_any") \ -_(7, "inner_vlan_id_any") - -static int -api_create_subif (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_create_subif_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u32 sub_id; - u8 sub_id_set = 0; - u32 __attribute__ ((unused)) no_tags = 0; - u32 __attribute__ ((unused)) one_tag = 0; - u32 __attribute__ ((unused)) two_tags = 0; - u32 __attribute__ ((unused)) dot1ad = 0; - u32 __attribute__ ((unused)) exact_match = 0; - u32 __attribute__ ((unused)) default_sub = 0; - u32 __attribute__ ((unused)) outer_vlan_id_any = 0; - u32 __attribute__ ((unused)) inner_vlan_id_any = 0; - u32 tmp; - u16 outer_vlan_id = 0; - u16 inner_vlan_id = 0; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sub_id %d", &sub_id)) - sub_id_set = 1; - else if (unformat (i, "outer_vlan_id %d", &tmp)) - outer_vlan_id = tmp; - else if (unformat (i, "inner_vlan_id %d", &tmp)) - inner_vlan_id = tmp; - -#define _(a) else if (unformat (i, #a)) a = 1 ; - foreach_create_subif_bit -#undef _ - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - if (sub_id_set == 0) - { - errmsg ("missing sub_id"); - return -99; - } - M (CREATE_SUBIF, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->sub_id = ntohl (sub_id); - -#define _(a,b) mp->sub_if_flags |= (1 << a); - foreach_create_subif_flag; -#undef _ - - mp->outer_vlan_id = ntohs (outer_vlan_id); - mp->inner_vlan_id = ntohs (inner_vlan_id); - - S (mp); - W (ret); - return ret; -} - -static int -api_ip_table_replace_begin (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ip_table_replace_begin_t *mp; - u32 table_id = 0; - u8 is_ipv6 = 0; - - int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "table %d", &table_id)) - ; - else if (unformat (i, "ipv6")) - is_ipv6 = 1; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - M (IP_TABLE_REPLACE_BEGIN, mp); - - mp->table.table_id = ntohl (table_id); - mp->table.is_ip6 = is_ipv6; - - S (mp); - W (ret); - return ret; -} - -static int -api_ip_table_flush (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ip_table_flush_t *mp; - u32 table_id = 0; - u8 is_ipv6 = 0; - - int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "table %d", &table_id)) - ; - else if (unformat (i, "ipv6")) - is_ipv6 = 1; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - M (IP_TABLE_FLUSH, mp); - - mp->table.table_id = ntohl (table_id); - mp->table.is_ip6 = is_ipv6; - - S (mp); - W (ret); - return ret; -} - -static int -api_ip_table_replace_end (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ip_table_replace_end_t *mp; - u32 table_id = 0; - u8 is_ipv6 = 0; - - int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "table %d", &table_id)) - ; - else if (unformat (i, "ipv6")) - is_ipv6 = 1; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - M (IP_TABLE_REPLACE_END, mp); - - mp->table.table_id = ntohl (table_id); - mp->table.is_ip6 = is_ipv6; - - S (mp); - W (ret); - return ret; -} - -static int -api_set_ip_flow_hash (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_set_ip_flow_hash_t *mp; - u32 vrf_id = 0; - u8 is_ipv6 = 0; - u8 vrf_id_set = 0; - u8 src = 0; - u8 dst = 0; - u8 sport = 0; - u8 dport = 0; - u8 proto = 0; - u8 reverse = 0; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "vrf %d", &vrf_id)) - vrf_id_set = 1; - else if (unformat (i, "ipv6")) - is_ipv6 = 1; - else if (unformat (i, "src")) - src = 1; - else if (unformat (i, "dst")) - dst = 1; - else if (unformat (i, "sport")) - sport = 1; - else if (unformat (i, "dport")) - dport = 1; - else if (unformat (i, "proto")) - proto = 1; - else if (unformat (i, "reverse")) - reverse = 1; - - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (vrf_id_set == 0) - { - errmsg ("missing vrf id"); - return -99; - } - - M (SET_IP_FLOW_HASH, mp); - mp->src = src; - mp->dst = dst; - mp->sport = sport; - mp->dport = dport; - mp->proto = proto; - mp->reverse = reverse; - mp->vrf_id = ntohl (vrf_id); - mp->is_ipv6 = is_ipv6; - - S (mp); - W (ret); - return ret; -} - -static int -api_sw_interface_ip6_enable_disable (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_ip6_enable_disable_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u8 enable = 0; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "enable")) - enable = 1; - else if (unformat (i, "disable")) - enable = 0; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - M (SW_INTERFACE_IP6_ENABLE_DISABLE, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->enable = enable; - - S (mp); - W (ret); - return ret; -} - - -static int -api_l2_patch_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_l2_patch_add_del_t *mp; - u32 rx_sw_if_index; - u8 rx_sw_if_index_set = 0; - u32 tx_sw_if_index; - u8 tx_sw_if_index_set = 0; - u8 is_add = 1; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index)) - rx_sw_if_index_set = 1; - else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index)) - tx_sw_if_index_set = 1; - else if (unformat (i, "rx")) - { - if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, - &rx_sw_if_index)) - rx_sw_if_index_set = 1; - } - else - break; - } - else if (unformat (i, "tx")) - { - if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, - &tx_sw_if_index)) - tx_sw_if_index_set = 1; - } - else - break; - } - else if (unformat (i, "del")) - is_add = 0; - else - break; - } - - if (rx_sw_if_index_set == 0) - { - errmsg ("missing rx interface name or rx_sw_if_index"); - return -99; - } - - if (tx_sw_if_index_set == 0) - { - errmsg ("missing tx interface name or tx_sw_if_index"); - return -99; - } - - M (L2_PATCH_ADD_DEL, mp); - - mp->rx_sw_if_index = ntohl (rx_sw_if_index); - mp->tx_sw_if_index = ntohl (tx_sw_if_index); - mp->is_add = is_add; - - S (mp); - W (ret); - return ret; -} - -u8 is_del; -u8 localsid_addr[16]; -u8 end_psp; -u8 behavior; -u32 sw_if_index; -u32 vlan_index; -u32 fib_table; -u8 nh_addr[16]; - -static int -api_sr_localsid_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sr_localsid_add_del_t *mp; - - u8 is_del; - ip6_address_t localsid; - u8 end_psp = 0; - u8 behavior = ~0; - u32 sw_if_index; - u32 fib_table = ~(u32) 0; - ip6_address_t nh_addr6; - ip4_address_t nh_addr4; - clib_memset (&nh_addr6, 0, sizeof (ip6_address_t)); - clib_memset (&nh_addr4, 0, sizeof (ip4_address_t)); - - bool nexthop_set = 0; - - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "del")) - is_del = 1; - else if (unformat (i, "address %U", unformat_ip6_address, &localsid)); - else if (unformat (i, "next-hop %U", unformat_ip4_address, &nh_addr4)) - nexthop_set = 1; - else if (unformat (i, "next-hop %U", unformat_ip6_address, &nh_addr6)) - nexthop_set = 1; - else if (unformat (i, "behavior %u", &behavior)); - else if (unformat (i, "sw_if_index %u", &sw_if_index)); - else if (unformat (i, "fib-table %u", &fib_table)); - else if (unformat (i, "end.psp %u", &behavior)); - else - break; - } - - M (SR_LOCALSID_ADD_DEL, mp); - - clib_memcpy (mp->localsid.addr, &localsid, sizeof (mp->localsid)); - - if (nexthop_set) - { - clib_memcpy (mp->nh_addr6, &nh_addr6, sizeof (mp->nh_addr6)); - clib_memcpy (mp->nh_addr4, &nh_addr4, sizeof (mp->nh_addr4)); - } - mp->behavior = behavior; - mp->sw_if_index = ntohl (sw_if_index); - mp->fib_table = ntohl (fib_table); - mp->end_psp = end_psp; - mp->is_del = is_del; - - S (mp); - W (ret); - return ret; -} - -static int -api_ioam_enable (vat_main_t * vam) -{ - unformat_input_t *input = vam->input; - vl_api_ioam_enable_t *mp; - u32 id = 0; - int has_trace_option = 0; - int has_pot_option = 0; - int has_seqno_option = 0; - int has_analyse_option = 0; - int ret; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "trace")) - has_trace_option = 1; - else if (unformat (input, "pot")) - has_pot_option = 1; - else if (unformat (input, "seqno")) - has_seqno_option = 1; - else if (unformat (input, "analyse")) - has_analyse_option = 1; - else - break; - } - M (IOAM_ENABLE, mp); - mp->id = htons (id); - mp->seqno = has_seqno_option; - mp->analyse = has_analyse_option; - mp->pot_enable = has_pot_option; - mp->trace_enable = has_trace_option; - - S (mp); - W (ret); - return ret; -} - - -static int -api_ioam_disable (vat_main_t * vam) -{ - vl_api_ioam_disable_t *mp; - int ret; - - M (IOAM_DISABLE, mp); - S (mp); - W (ret); - return ret; -} - -#define foreach_tcp_proto_field \ -_(src_port) \ -_(dst_port) - -#define foreach_udp_proto_field \ -_(src_port) \ -_(dst_port) - -#define foreach_ip4_proto_field \ -_(src_address) \ -_(dst_address) \ -_(tos) \ -_(length) \ -_(fragment_id) \ -_(ttl) \ -_(protocol) \ -_(checksum) - -typedef struct -{ - u16 src_port, dst_port; -} tcpudp_header_t; - -#if VPP_API_TEST_BUILTIN == 0 -uword -unformat_tcp_mask (unformat_input_t * input, va_list * args) -{ - u8 **maskp = va_arg (*args, u8 **); - u8 *mask = 0; - u8 found_something = 0; - tcp_header_t *tcp; - -#define _(a) u8 a=0; - foreach_tcp_proto_field; -#undef _ - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (0); -#define _(a) else if (unformat (input, #a)) a=1; - foreach_tcp_proto_field -#undef _ - else - break; - } - -#define _(a) found_something += a; - foreach_tcp_proto_field; -#undef _ - - if (found_something == 0) - return 0; - - vec_validate (mask, sizeof (*tcp) - 1); - - tcp = (tcp_header_t *) mask; - -#define _(a) if (a) clib_memset (&tcp->a, 0xff, sizeof (tcp->a)); - foreach_tcp_proto_field; -#undef _ - - *maskp = mask; - return 1; -} - -uword -unformat_udp_mask (unformat_input_t * input, va_list * args) -{ - u8 **maskp = va_arg (*args, u8 **); - u8 *mask = 0; - u8 found_something = 0; - udp_header_t *udp; - -#define _(a) u8 a=0; - foreach_udp_proto_field; -#undef _ - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (0); -#define _(a) else if (unformat (input, #a)) a=1; - foreach_udp_proto_field -#undef _ - else - break; - } - -#define _(a) found_something += a; - foreach_udp_proto_field; -#undef _ - - if (found_something == 0) - return 0; - - vec_validate (mask, sizeof (*udp) - 1); - - udp = (udp_header_t *) mask; - -#define _(a) if (a) clib_memset (&udp->a, 0xff, sizeof (udp->a)); - foreach_udp_proto_field; -#undef _ - - *maskp = mask; - return 1; -} - -uword -unformat_l4_mask (unformat_input_t * input, va_list * args) -{ - u8 **maskp = va_arg (*args, u8 **); - u16 src_port = 0, dst_port = 0; - tcpudp_header_t *tcpudp; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "tcp %U", unformat_tcp_mask, maskp)) - return 1; - else if (unformat (input, "udp %U", unformat_udp_mask, maskp)) - return 1; - else if (unformat (input, "src_port")) - src_port = 0xFFFF; - else if (unformat (input, "dst_port")) - dst_port = 0xFFFF; - else - return 0; - } - - if (!src_port && !dst_port) - return 0; - - u8 *mask = 0; - vec_validate (mask, sizeof (tcpudp_header_t) - 1); - - tcpudp = (tcpudp_header_t *) mask; - tcpudp->src_port = src_port; - tcpudp->dst_port = dst_port; - - *maskp = mask; - - return 1; -} - -uword -unformat_ip4_mask (unformat_input_t * input, va_list * args) -{ - u8 **maskp = va_arg (*args, u8 **); - u8 *mask = 0; - u8 found_something = 0; - ip4_header_t *ip; - -#define _(a) u8 a=0; - foreach_ip4_proto_field; -#undef _ - u8 version = 0; - u8 hdr_length = 0; - - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "version")) - version = 1; - else if (unformat (input, "hdr_length")) - hdr_length = 1; - else if (unformat (input, "src")) - src_address = 1; - else if (unformat (input, "dst")) - dst_address = 1; - else if (unformat (input, "proto")) - protocol = 1; - -#define _(a) else if (unformat (input, #a)) a=1; - foreach_ip4_proto_field -#undef _ - else - break; - } - -#define _(a) found_something += a; - foreach_ip4_proto_field; -#undef _ - - if (found_something == 0) - return 0; - - vec_validate (mask, sizeof (*ip) - 1); - - ip = (ip4_header_t *) mask; - -#define _(a) if (a) clib_memset (&ip->a, 0xff, sizeof (ip->a)); - foreach_ip4_proto_field; -#undef _ - - ip->ip_version_and_header_length = 0; - - if (version) - ip->ip_version_and_header_length |= 0xF0; - - if (hdr_length) - ip->ip_version_and_header_length |= 0x0F; - - *maskp = mask; - return 1; -} - -#define foreach_ip6_proto_field \ -_(src_address) \ -_(dst_address) \ -_(payload_length) \ -_(hop_limit) \ -_(protocol) - -uword -unformat_ip6_mask (unformat_input_t * input, va_list * args) -{ - u8 **maskp = va_arg (*args, u8 **); - u8 *mask = 0; - u8 found_something = 0; - ip6_header_t *ip; - u32 ip_version_traffic_class_and_flow_label; - -#define _(a) u8 a=0; - foreach_ip6_proto_field; -#undef _ - u8 version = 0; - u8 traffic_class = 0; - u8 flow_label = 0; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "version")) - version = 1; - else if (unformat (input, "traffic-class")) - traffic_class = 1; - else if (unformat (input, "flow-label")) - flow_label = 1; - else if (unformat (input, "src")) - src_address = 1; - else if (unformat (input, "dst")) - dst_address = 1; - else if (unformat (input, "proto")) - protocol = 1; - -#define _(a) else if (unformat (input, #a)) a=1; - foreach_ip6_proto_field -#undef _ - else - break; - } - -#define _(a) found_something += a; - foreach_ip6_proto_field; -#undef _ - - if (found_something == 0) - return 0; - - vec_validate (mask, sizeof (*ip) - 1); - - ip = (ip6_header_t *) mask; - -#define _(a) if (a) clib_memset (&ip->a, 0xff, sizeof (ip->a)); - foreach_ip6_proto_field; -#undef _ - - ip_version_traffic_class_and_flow_label = 0; - - if (version) - ip_version_traffic_class_and_flow_label |= 0xF0000000; - - if (traffic_class) - ip_version_traffic_class_and_flow_label |= 0x0FF00000; - - if (flow_label) - ip_version_traffic_class_and_flow_label |= 0x000FFFFF; - - ip->ip_version_traffic_class_and_flow_label = - clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label); +#define foreach_vpe_api_reply_msg \ +_(CREATE_LOOPBACK_REPLY, create_loopback_reply) \ +_(CREATE_LOOPBACK_INSTANCE_REPLY, create_loopback_instance_reply) \ +_(SW_INTERFACE_DETAILS, sw_interface_details) \ +_(SW_INTERFACE_SET_FLAGS_REPLY, sw_interface_set_flags_reply) \ +_(CONTROL_PING_REPLY, control_ping_reply) \ +_(CLI_REPLY, cli_reply) \ +_(CLI_INBAND_REPLY, cli_inband_reply) \ +_(SW_INTERFACE_ADD_DEL_ADDRESS_REPLY, \ + sw_interface_add_del_address_reply) \ +_(SW_INTERFACE_SET_RX_MODE_REPLY, sw_interface_set_rx_mode_reply) \ +_(SW_INTERFACE_SET_RX_PLACEMENT_REPLY, sw_interface_set_rx_placement_reply) \ +_(SW_INTERFACE_RX_PLACEMENT_DETAILS, sw_interface_rx_placement_details) \ +_(SW_INTERFACE_SET_TABLE_REPLY, sw_interface_set_table_reply) \ +_(SW_INTERFACE_SET_MPLS_ENABLE_REPLY, sw_interface_set_mpls_enable_reply) \ +_(SW_INTERFACE_SET_VPATH_REPLY, sw_interface_set_vpath_reply) \ +_(SW_INTERFACE_SET_VXLAN_BYPASS_REPLY, sw_interface_set_vxlan_bypass_reply) \ +_(SW_INTERFACE_SET_VXLAN_GPE_BYPASS_REPLY, sw_interface_set_vxlan_gpe_bypass_reply) \ +_(SW_INTERFACE_SET_L2_XCONNECT_REPLY, \ + sw_interface_set_l2_xconnect_reply) \ +_(SW_INTERFACE_SET_L2_BRIDGE_REPLY, \ + sw_interface_set_l2_bridge_reply) \ +_(BRIDGE_DOMAIN_ADD_DEL_REPLY, bridge_domain_add_del_reply) \ +_(BRIDGE_DOMAIN_DETAILS, bridge_domain_details) \ +_(BRIDGE_DOMAIN_SET_MAC_AGE_REPLY, bridge_domain_set_mac_age_reply) \ +_(L2FIB_ADD_DEL_REPLY, l2fib_add_del_reply) \ +_(L2FIB_FLUSH_INT_REPLY, l2fib_flush_int_reply) \ +_(L2FIB_FLUSH_BD_REPLY, l2fib_flush_bd_reply) \ +_(L2_FLAGS_REPLY, l2_flags_reply) \ +_(BRIDGE_FLAGS_REPLY, bridge_flags_reply) \ +_(TAP_CREATE_V2_REPLY, tap_create_v2_reply) \ +_(TAP_DELETE_V2_REPLY, tap_delete_v2_reply) \ +_(SW_INTERFACE_TAP_V2_DETAILS, sw_interface_tap_v2_details) \ +_(VIRTIO_PCI_CREATE_REPLY, virtio_pci_create_reply) \ +_(VIRTIO_PCI_CREATE_V2_REPLY, virtio_pci_create_v2_reply) \ +_(VIRTIO_PCI_DELETE_REPLY, virtio_pci_delete_reply) \ +_(SW_INTERFACE_VIRTIO_PCI_DETAILS, sw_interface_virtio_pci_details) \ +_(BOND_CREATE_REPLY, bond_create_reply) \ +_(BOND_CREATE2_REPLY, bond_create2_reply) \ +_(BOND_DELETE_REPLY, bond_delete_reply) \ +_(BOND_ADD_MEMBER_REPLY, bond_add_member_reply) \ +_(BOND_DETACH_MEMBER_REPLY, bond_detach_member_reply) \ +_(SW_INTERFACE_SET_BOND_WEIGHT_REPLY, sw_interface_set_bond_weight_reply) \ +_(SW_BOND_INTERFACE_DETAILS, sw_bond_interface_details) \ +_(SW_MEMBER_INTERFACE_DETAILS, sw_member_interface_details) \ +_(IP_ROUTE_ADD_DEL_REPLY, ip_route_add_del_reply) \ +_(IP_TABLE_ADD_DEL_REPLY, ip_table_add_del_reply) \ +_(IP_TABLE_REPLACE_BEGIN_REPLY, ip_table_replace_begin_reply) \ +_(IP_TABLE_FLUSH_REPLY, ip_table_flush_reply) \ +_(IP_TABLE_REPLACE_END_REPLY, ip_table_replace_end_reply) \ +_(IP_MROUTE_ADD_DEL_REPLY, ip_mroute_add_del_reply) \ +_(MPLS_TABLE_ADD_DEL_REPLY, mpls_table_add_del_reply) \ +_(MPLS_ROUTE_ADD_DEL_REPLY, mpls_route_add_del_reply) \ +_(MPLS_IP_BIND_UNBIND_REPLY, mpls_ip_bind_unbind_reply) \ +_(BIER_ROUTE_ADD_DEL_REPLY, bier_route_add_del_reply) \ +_(BIER_TABLE_ADD_DEL_REPLY, bier_table_add_del_reply) \ +_(MPLS_TUNNEL_ADD_DEL_REPLY, mpls_tunnel_add_del_reply) \ +_(SW_INTERFACE_SET_UNNUMBERED_REPLY, \ + sw_interface_set_unnumbered_reply) \ +_(CREATE_VLAN_SUBIF_REPLY, create_vlan_subif_reply) \ +_(CREATE_SUBIF_REPLY, create_subif_reply) \ +_(SET_IP_FLOW_HASH_REPLY, set_ip_flow_hash_reply) \ +_(SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY, \ + sw_interface_ip6_enable_disable_reply) \ +_(L2_PATCH_ADD_DEL_REPLY, l2_patch_add_del_reply) \ +_(SR_MPLS_POLICY_ADD_REPLY, sr_mpls_policy_add_reply) \ +_(SR_MPLS_POLICY_MOD_REPLY, sr_mpls_policy_mod_reply) \ +_(SR_MPLS_POLICY_DEL_REPLY, sr_mpls_policy_del_reply) \ +_(SR_POLICY_ADD_REPLY, sr_policy_add_reply) \ +_(SR_POLICY_MOD_REPLY, sr_policy_mod_reply) \ +_(SR_POLICY_DEL_REPLY, sr_policy_del_reply) \ +_(SR_LOCALSID_ADD_DEL_REPLY, sr_localsid_add_del_reply) \ +_(SR_STEERING_ADD_DEL_REPLY, sr_steering_add_del_reply) \ +_(CLASSIFY_ADD_DEL_TABLE_REPLY, classify_add_del_table_reply) \ +_(CLASSIFY_ADD_DEL_SESSION_REPLY, classify_add_del_session_reply) \ +_(CLASSIFY_SET_INTERFACE_IP_TABLE_REPLY, \ +classify_set_interface_ip_table_reply) \ +_(CLASSIFY_SET_INTERFACE_L2_TABLES_REPLY, \ + classify_set_interface_l2_tables_reply) \ +_(GET_NODE_INDEX_REPLY, get_node_index_reply) \ +_(ADD_NODE_NEXT_REPLY, add_node_next_reply) \ +_(VXLAN_ADD_DEL_TUNNEL_REPLY, vxlan_add_del_tunnel_reply) \ +_(VXLAN_OFFLOAD_RX_REPLY, vxlan_offload_rx_reply) \ +_(VXLAN_TUNNEL_DETAILS, vxlan_tunnel_details) \ +_(L2_FIB_CLEAR_TABLE_REPLY, l2_fib_clear_table_reply) \ +_(L2_INTERFACE_EFP_FILTER_REPLY, l2_interface_efp_filter_reply) \ +_(L2_INTERFACE_VLAN_TAG_REWRITE_REPLY, l2_interface_vlan_tag_rewrite_reply) \ +_(SW_INTERFACE_VHOST_USER_DETAILS, sw_interface_vhost_user_details) \ +_(CREATE_VHOST_USER_IF_REPLY, create_vhost_user_if_reply) \ +_(MODIFY_VHOST_USER_IF_REPLY, modify_vhost_user_if_reply) \ +_(DELETE_VHOST_USER_IF_REPLY, delete_vhost_user_if_reply) \ +_(SHOW_VERSION_REPLY, show_version_reply) \ +_(SHOW_THREADS_REPLY, show_threads_reply) \ +_(L2_FIB_TABLE_DETAILS, l2_fib_table_details) \ +_(VXLAN_GPE_ADD_DEL_TUNNEL_REPLY, vxlan_gpe_add_del_tunnel_reply) \ +_(VXLAN_GPE_TUNNEL_DETAILS, vxlan_gpe_tunnel_details) \ +_(INTERFACE_NAME_RENUMBER_REPLY, interface_name_renumber_reply) \ +_(WANT_L2_MACS_EVENTS_REPLY, want_l2_macs_events_reply) \ +_(L2_MACS_EVENT, l2_macs_event) \ +_(INPUT_ACL_SET_INTERFACE_REPLY, input_acl_set_interface_reply) \ +_(IP_ADDRESS_DETAILS, ip_address_details) \ +_(IP_DETAILS, ip_details) \ +_(IPSEC_SPD_ADD_DEL_REPLY, ipsec_spd_add_del_reply) \ +_(IPSEC_INTERFACE_ADD_DEL_SPD_REPLY, ipsec_interface_add_del_spd_reply) \ +_(IPSEC_SPD_ENTRY_ADD_DEL_REPLY, ipsec_spd_entry_add_del_reply) \ +_(IPSEC_SAD_ENTRY_ADD_DEL_REPLY, ipsec_sad_entry_add_del_reply) \ +_(IPSEC_SA_DETAILS, ipsec_sa_details) \ +_(DELETE_LOOPBACK_REPLY, delete_loopback_reply) \ +_(BD_IP_MAC_ADD_DEL_REPLY, bd_ip_mac_add_del_reply) \ +_(BD_IP_MAC_FLUSH_REPLY, bd_ip_mac_flush_reply) \ +_(BD_IP_MAC_DETAILS, bd_ip_mac_details) \ +_(WANT_INTERFACE_EVENTS_REPLY, want_interface_events_reply) \ +_(GET_FIRST_MSG_ID_REPLY, get_first_msg_id_reply) \ +_(COP_INTERFACE_ENABLE_DISABLE_REPLY, cop_interface_enable_disable_reply) \ +_(COP_WHITELIST_ENABLE_DISABLE_REPLY, cop_whitelist_enable_disable_reply) \ +_(GET_NODE_GRAPH_REPLY, get_node_graph_reply) \ +_(SW_INTERFACE_CLEAR_STATS_REPLY, sw_interface_clear_stats_reply) \ +_(IOAM_ENABLE_REPLY, ioam_enable_reply) \ +_(IOAM_DISABLE_REPLY, ioam_disable_reply) \ +_(AF_PACKET_CREATE_REPLY, af_packet_create_reply) \ +_(AF_PACKET_DELETE_REPLY, af_packet_delete_reply) \ +_(AF_PACKET_DETAILS, af_packet_details) \ +_(POLICER_ADD_DEL_REPLY, policer_add_del_reply) \ +_(POLICER_DETAILS, policer_details) \ +_(POLICER_CLASSIFY_SET_INTERFACE_REPLY, policer_classify_set_interface_reply) \ +_(POLICER_CLASSIFY_DETAILS, policer_classify_details) \ +_(MPLS_TUNNEL_DETAILS, mpls_tunnel_details) \ +_(MPLS_TABLE_DETAILS, mpls_table_details) \ +_(MPLS_ROUTE_DETAILS, mpls_route_details) \ +_(CLASSIFY_TABLE_IDS_REPLY, classify_table_ids_reply) \ +_(CLASSIFY_TABLE_BY_INTERFACE_REPLY, classify_table_by_interface_reply) \ +_(CLASSIFY_TABLE_INFO_REPLY, classify_table_info_reply) \ +_(CLASSIFY_SESSION_DETAILS, classify_session_details) \ +_(SET_IPFIX_EXPORTER_REPLY, set_ipfix_exporter_reply) \ +_(IPFIX_EXPORTER_DETAILS, ipfix_exporter_details) \ +_(SET_IPFIX_CLASSIFY_STREAM_REPLY, set_ipfix_classify_stream_reply) \ +_(IPFIX_CLASSIFY_STREAM_DETAILS, ipfix_classify_stream_details) \ +_(IPFIX_CLASSIFY_TABLE_ADD_DEL_REPLY, ipfix_classify_table_add_del_reply) \ +_(IPFIX_CLASSIFY_TABLE_DETAILS, ipfix_classify_table_details) \ +_(FLOW_CLASSIFY_SET_INTERFACE_REPLY, flow_classify_set_interface_reply) \ +_(FLOW_CLASSIFY_DETAILS, flow_classify_details) \ +_(SW_INTERFACE_SPAN_ENABLE_DISABLE_REPLY, sw_interface_span_enable_disable_reply) \ +_(SW_INTERFACE_SPAN_DETAILS, sw_interface_span_details) \ +_(GET_NEXT_INDEX_REPLY, get_next_index_reply) \ +_(PG_CREATE_INTERFACE_REPLY, pg_create_interface_reply) \ +_(PG_CAPTURE_REPLY, pg_capture_reply) \ +_(PG_ENABLE_DISABLE_REPLY, pg_enable_disable_reply) \ +_(PG_INTERFACE_ENABLE_DISABLE_COALESCE_REPLY, pg_interface_enable_disable_coalesce_reply) \ +_(IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL_REPLY, \ + ip_source_and_port_range_check_add_del_reply) \ +_(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL_REPLY, \ + ip_source_and_port_range_check_interface_add_del_reply) \ +_(DELETE_SUBIF_REPLY, delete_subif_reply) \ +_(L2_INTERFACE_PBB_TAG_REWRITE_REPLY, l2_interface_pbb_tag_rewrite_reply) \ +_(SET_PUNT_REPLY, set_punt_reply) \ +_(IP_TABLE_DETAILS, ip_table_details) \ +_(IP_ROUTE_DETAILS, ip_route_details) \ +_(FEATURE_ENABLE_DISABLE_REPLY, feature_enable_disable_reply) \ +_(FEATURE_GSO_ENABLE_DISABLE_REPLY, feature_gso_enable_disable_reply) \ +_(SW_INTERFACE_TAG_ADD_DEL_REPLY, sw_interface_tag_add_del_reply) \ +_(SW_INTERFACE_ADD_DEL_MAC_ADDRESS_REPLY, sw_interface_add_del_mac_address_reply) \ +_(L2_XCONNECT_DETAILS, l2_xconnect_details) \ +_(HW_INTERFACE_SET_MTU_REPLY, hw_interface_set_mtu_reply) \ +_(SW_INTERFACE_GET_TABLE_REPLY, sw_interface_get_table_reply) \ +_(P2P_ETHERNET_ADD_REPLY, p2p_ethernet_add_reply) \ +_(P2P_ETHERNET_DEL_REPLY, p2p_ethernet_del_reply) \ +_(TCP_CONFIGURE_SRC_ADDRESSES_REPLY, tcp_configure_src_addresses_reply) \ +_(APP_NAMESPACE_ADD_DEL_REPLY, app_namespace_add_del_reply) \ +_(SESSION_RULE_ADD_DEL_REPLY, session_rule_add_del_reply) \ +_(SESSION_RULES_DETAILS, session_rules_details) \ +_(IP_CONTAINER_PROXY_ADD_DEL_REPLY, ip_container_proxy_add_del_reply) \ +_(OUTPUT_ACL_SET_INTERFACE_REPLY, output_acl_set_interface_reply) \ +_(QOS_RECORD_ENABLE_DISABLE_REPLY, qos_record_enable_disable_reply) \ +_(FLOW_ADD_REPLY, flow_add_reply) \ - *maskp = mask; - return 1; -} +#define foreach_standalone_reply_msg \ +_(SW_INTERFACE_EVENT, sw_interface_event) -uword -unformat_l3_mask (unformat_input_t * input, va_list * args) +typedef struct { - u8 **maskp = va_arg (*args, u8 **); + u8 *name; + u32 value; +} name_sort_t; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "ip4 %U", unformat_ip4_mask, maskp)) - return 1; - else if (unformat (input, "ip6 %U", unformat_ip6_mask, maskp)) - return 1; - else - break; - } - return 0; -} +#define STR_VTR_OP_CASE(op) \ + case L2_VTR_ ## op: \ + return "" # op; -uword -unformat_l2_mask (unformat_input_t * input, va_list * args) +static const char * +str_vtr_op (u32 vtr_op) { - u8 **maskp = va_arg (*args, u8 **); - u8 *mask = 0; - u8 src = 0; - u8 dst = 0; - u8 proto = 0; - u8 tag1 = 0; - u8 tag2 = 0; - u8 ignore_tag1 = 0; - u8 ignore_tag2 = 0; - u8 cos1 = 0; - u8 cos2 = 0; - u8 dot1q = 0; - u8 dot1ad = 0; - int len = 14; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "src")) - src = 1; - else if (unformat (input, "dst")) - dst = 1; - else if (unformat (input, "proto")) - proto = 1; - else if (unformat (input, "tag1")) - tag1 = 1; - else if (unformat (input, "tag2")) - tag2 = 1; - else if (unformat (input, "ignore-tag1")) - ignore_tag1 = 1; - else if (unformat (input, "ignore-tag2")) - ignore_tag2 = 1; - else if (unformat (input, "cos1")) - cos1 = 1; - else if (unformat (input, "cos2")) - cos2 = 1; - else if (unformat (input, "dot1q")) - dot1q = 1; - else if (unformat (input, "dot1ad")) - dot1ad = 1; - else - break; - } - if ((src + dst + proto + tag1 + tag2 + dot1q + dot1ad + - ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0) - return 0; - - if (tag1 || ignore_tag1 || cos1 || dot1q) - len = 18; - if (tag2 || ignore_tag2 || cos2 || dot1ad) - len = 22; - - vec_validate (mask, len - 1); - - if (dst) - clib_memset (mask, 0xff, 6); - - if (src) - clib_memset (mask + 6, 0xff, 6); - - if (tag2 || dot1ad) - { - /* inner vlan tag */ - if (tag2) - { - mask[19] = 0xff; - mask[18] = 0x0f; - } - if (cos2) - mask[18] |= 0xe0; - if (proto) - mask[21] = mask[20] = 0xff; - if (tag1) - { - mask[15] = 0xff; - mask[14] = 0x0f; - } - if (cos1) - mask[14] |= 0xe0; - *maskp = mask; - return 1; - } - if (tag1 | dot1q) + switch (vtr_op) { - if (tag1) - { - mask[15] = 0xff; - mask[14] = 0x0f; - } - if (cos1) - mask[14] |= 0xe0; - if (proto) - mask[16] = mask[17] = 0xff; - - *maskp = mask; - return 1; + STR_VTR_OP_CASE (DISABLED); + STR_VTR_OP_CASE (PUSH_1); + STR_VTR_OP_CASE (PUSH_2); + STR_VTR_OP_CASE (POP_1); + STR_VTR_OP_CASE (POP_2); + STR_VTR_OP_CASE (TRANSLATE_1_1); + STR_VTR_OP_CASE (TRANSLATE_1_2); + STR_VTR_OP_CASE (TRANSLATE_2_1); + STR_VTR_OP_CASE (TRANSLATE_2_2); } - if (cos2) - mask[18] |= 0xe0; - if (cos1) - mask[14] |= 0xe0; - if (proto) - mask[12] = mask[13] = 0xff; - *maskp = mask; - return 1; + return "UNKNOWN"; } -uword -unformat_classify_mask (unformat_input_t * input, va_list * args) +static int +dump_sub_interface_table (vat_main_t * vam) { - u8 **maskp = va_arg (*args, u8 **); - u32 *skipp = va_arg (*args, u32 *); - u32 *matchp = va_arg (*args, u32 *); - u32 match; - u8 *mask = 0; - u8 *l2 = 0; - u8 *l3 = 0; - u8 *l4 = 0; - int i; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "hex %U", unformat_hex_string, &mask)) - ; - else if (unformat (input, "l2 %U", unformat_l2_mask, &l2)) - ; - else if (unformat (input, "l3 %U", unformat_l3_mask, &l3)) - ; - else if (unformat (input, "l4 %U", unformat_l4_mask, &l4)) - ; - else - break; - } + const sw_interface_subif_t *sub = NULL; - if (l4 && !l3) + if (vam->json_output) { - vec_free (mask); - vec_free (l2); - vec_free (l4); - return 0; + clib_warning + ("JSON output supported only for VPE API calls and dump_stats_table"); + return -99; } - if (mask || l2 || l3 || l4) - { - if (l2 || l3 || l4) - { - /* "With a free Ethernet header in every package" */ - if (l2 == 0) - vec_validate (l2, 13); - mask = l2; - if (vec_len (l3)) - { - vec_append (mask, l3); - vec_free (l3); - } - if (vec_len (l4)) - { - vec_append (mask, l4); - vec_free (l4); - } - } + print (vam->ofp, + "%-30s%-12s%-11s%-7s%-5s%-9s%-9s%-6s%-8s%-10s%-10s", + "Interface", "sw_if_index", + "sub id", "dot1ad", "tags", "outer id", + "inner id", "exact", "default", "outer any", "inner any"); - /* Scan forward looking for the first significant mask octet */ - for (i = 0; i < vec_len (mask); i++) - if (mask[i]) - break; + vec_foreach (sub, vam->sw_if_subif_table) + { + print (vam->ofp, + "%-30s%-12d%-11d%-7s%-5d%-9d%-9d%-6d%-8d%-10d%-10d", + sub->interface_name, + sub->sw_if_index, + sub->sub_id, sub->sub_dot1ad ? "dot1ad" : "dot1q", + sub->sub_number_of_tags, sub->sub_outer_vlan_id, + sub->sub_inner_vlan_id, sub->sub_exact_match, sub->sub_default, + sub->sub_outer_vlan_id_any, sub->sub_inner_vlan_id_any); + if (sub->vtr_op != L2_VTR_DISABLED) + { + print (vam->ofp, + " vlan-tag-rewrite - op: %-14s [ dot1q: %d " + "tag1: %d tag2: %d ]", + str_vtr_op (sub->vtr_op), sub->vtr_push_dot1q, + sub->vtr_tag1, sub->vtr_tag2); + } + } - /* compute (skip, match) params */ - *skipp = i / sizeof (u32x4); - vec_delete (mask, *skipp * sizeof (u32x4), 0); + return 0; +} - /* Pad mask to an even multiple of the vector size */ - while (vec_len (mask) % sizeof (u32x4)) - vec_add1 (mask, 0); +static int +name_sort_cmp (void *a1, void *a2) +{ + name_sort_t *n1 = a1; + name_sort_t *n2 = a2; - match = vec_len (mask) / sizeof (u32x4); + return strcmp ((char *) n1->name, (char *) n2->name); +} - for (i = match * sizeof (u32x4); i > 0; i -= sizeof (u32x4)) - { - u64 *tmp = (u64 *) (mask + (i - sizeof (u32x4))); - if (*tmp || *(tmp + 1)) - break; - match--; - } - if (match == 0) - clib_warning ("BUG: match 0"); +static int +dump_interface_table (vat_main_t * vam) +{ + hash_pair_t *p; + name_sort_t *nses = 0, *ns; - _vec_len (mask) = match * sizeof (u32x4); + if (vam->json_output) + { + clib_warning + ("JSON output supported only for VPE API calls and dump_stats_table"); + return -99; + } - *matchp = match; - *maskp = mask; + /* *INDENT-OFF* */ + hash_foreach_pair (p, vam->sw_if_index_by_interface_name, + ({ + vec_add2 (nses, ns, 1); + ns->name = (u8 *)(p->key); + ns->value = (u32) p->value[0]; + })); + /* *INDENT-ON* */ - return 1; - } + vec_sort_with_function (nses, name_sort_cmp); + print (vam->ofp, "%-25s%-15s", "Interface", "sw_if_index"); + vec_foreach (ns, nses) + { + print (vam->ofp, "%-25s%-15d", ns->name, ns->value); + } + vec_free (nses); return 0; } -#endif /* VPP_API_TEST_BUILTIN */ - -#define foreach_l2_next \ -_(drop, DROP) \ -_(ethernet, ETHERNET_INPUT) \ -_(ip4, IP4_INPUT) \ -_(ip6, IP6_INPUT) -uword -unformat_l2_next_index (unformat_input_t * input, va_list * args) +static int +dump_ip_table (vat_main_t * vam, int is_ipv6) { - u32 *miss_next_indexp = va_arg (*args, u32 *); - u32 next_index = 0; - u32 tmp; + const ip_details_t *det = NULL; + const ip_address_details_t *address = NULL; + u32 i = ~0; -#define _(n,N) \ - if (unformat (input, #n)) { next_index = L2_INPUT_CLASSIFY_NEXT_##N; goto out;} - foreach_l2_next; -#undef _ + print (vam->ofp, "%-12s", "sw_if_index"); - if (unformat (input, "%d", &tmp)) + vec_foreach (det, vam->ip_details_by_sw_if_index[is_ipv6]) + { + i++; + if (!det->present) + { + continue; + } + print (vam->ofp, "%-12d", i); + print (vam->ofp, " %-30s%-13s", "Address", "Prefix length"); + if (!det->addr) + { + continue; + } + vec_foreach (address, det->addr) { - next_index = tmp; - goto out; + print (vam->ofp, + " %-30U%-13d", + is_ipv6 ? format_ip6_address : format_ip4_address, + address->ip, address->prefix_length); } + } return 0; - -out: - *miss_next_indexp = next_index; - return 1; } -#define foreach_ip_next \ -_(drop, DROP) \ -_(local, LOCAL) \ -_(rewrite, REWRITE) - -uword -api_unformat_ip_next_index (unformat_input_t * input, va_list * args) +static int +dump_ipv4_table (vat_main_t * vam) { - u32 *miss_next_indexp = va_arg (*args, u32 *); - u32 next_index = 0; - u32 tmp; + if (vam->json_output) + { + clib_warning + ("JSON output supported only for VPE API calls and dump_stats_table"); + return -99; + } -#define _(n,N) \ - if (unformat (input, #n)) { next_index = IP_LOOKUP_NEXT_##N; goto out;} - foreach_ip_next; -#undef _ + return dump_ip_table (vam, 0); +} - if (unformat (input, "%d", &tmp)) +static int +dump_ipv6_table (vat_main_t * vam) +{ + if (vam->json_output) { - next_index = tmp; - goto out; + clib_warning + ("JSON output supported only for VPE API calls and dump_stats_table"); + return -99; } - return 0; - -out: - *miss_next_indexp = next_index; - return 1; + return dump_ip_table (vam, 1); } -#define foreach_acl_next \ -_(deny, DENY) - -uword -api_unformat_acl_next_index (unformat_input_t * input, va_list * args) +/* + * Pass CLI buffers directly in the CLI_INBAND API message, + * instead of an additional shared memory area. + */ +static int +exec_inband (vat_main_t * vam) { - u32 *miss_next_indexp = va_arg (*args, u32 *); - u32 next_index = 0; - u32 tmp; + vl_api_cli_inband_t *mp; + unformat_input_t *i = vam->input; + int ret; -#define _(n,N) \ - if (unformat (input, #n)) { next_index = ACL_NEXT_INDEX_##N; goto out;} - foreach_acl_next; -#undef _ + if (vec_len (i->buffer) == 0) + return -1; - if (unformat (input, "permit")) + if (vam->exec_mode == 0 && unformat (i, "mode")) { - next_index = ~0; - goto out; + vam->exec_mode = 1; + return 0; } - else if (unformat (input, "%d", &tmp)) + if (vam->exec_mode == 1 && (unformat (i, "exit") || unformat (i, "quit"))) { - next_index = tmp; - goto out; + vam->exec_mode = 0; + return 0; } - return 0; + /* + * In order for the CLI command to work, it + * must be a vector ending in \n, not a C-string ending + * in \n\0. + */ + M2 (CLI_INBAND, mp, vec_len (vam->input->buffer)); + vl_api_vec_to_api_string (vam->input->buffer, &mp->cmd); -out: - *miss_next_indexp = next_index; - return 1; + S (mp); + W (ret); + /* json responses may or may not include a useful reply... */ + if (vec_len (vam->cmd_reply)) + print (vam->ofp, "%v", (char *) (vam->cmd_reply)); + return ret; } -uword -unformat_policer_precolor (unformat_input_t * input, va_list * args) +int +exec (vat_main_t * vam) { - u32 *r = va_arg (*args, u32 *); + return exec_inband (vam); +} - if (unformat (input, "conform-color")) - *r = POLICE_CONFORM; - else if (unformat (input, "exceed-color")) - *r = POLICE_EXCEED; +static int +api_create_loopback (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_create_loopback_t *mp; + vl_api_create_loopback_instance_t *mp_lbi; + u8 mac_address[6]; + u8 mac_set = 0; + u8 is_specified = 0; + u32 user_instance = 0; + int ret; + + clib_memset (mac_address, 0, sizeof (mac_address)); + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "mac %U", unformat_ethernet_address, mac_address)) + mac_set = 1; + if (unformat (i, "instance %d", &user_instance)) + is_specified = 1; + else + break; + } + + if (is_specified) + { + M (CREATE_LOOPBACK_INSTANCE, mp_lbi); + mp_lbi->is_specified = is_specified; + if (is_specified) + mp_lbi->user_instance = htonl (user_instance); + if (mac_set) + clib_memcpy (mp_lbi->mac_address, mac_address, sizeof (mac_address)); + S (mp_lbi); + } else - return 0; + { + /* Construct the API message */ + M (CREATE_LOOPBACK, mp); + if (mac_set) + clib_memcpy (mp->mac_address, mac_address, sizeof (mac_address)); + S (mp); + } - return 1; + W (ret); + return ret; } static int -api_classify_add_del_table (vat_main_t * vam) +api_delete_loopback (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_classify_add_del_table_t *mp; - - u32 nbuckets = 2; - u32 skip = ~0; - u32 match = ~0; - int is_add = 1; - int del_chain = 0; - u32 table_index = ~0; - u32 next_table_index = ~0; - u32 miss_next_index = ~0; - u32 memory_size = 32 << 20; - u8 *mask = 0; - u32 current_data_flag = 0; - int current_data_offset = 0; + vl_api_delete_loopback_t *mp; + u32 sw_if_index = ~0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "del-chain")) - { - is_add = 0; - del_chain = 1; - } - else if (unformat (i, "buckets %d", &nbuckets)) - ; - else if (unformat (i, "memory_size %d", &memory_size)) - ; - else if (unformat (i, "skip %d", &skip)) - ; - else if (unformat (i, "match %d", &match)) - ; - else if (unformat (i, "table %d", &table_index)) - ; - else if (unformat (i, "mask %U", unformat_classify_mask, - &mask, &skip, &match)) - ; - else if (unformat (i, "next-table %d", &next_table_index)) - ; - else if (unformat (i, "miss-next %U", api_unformat_ip_next_index, - &miss_next_index)) - ; - else if (unformat (i, "l2-miss-next %U", unformat_l2_next_index, - &miss_next_index)) - ; - else if (unformat (i, "acl-miss-next %U", api_unformat_acl_next_index, - &miss_next_index)) - ; - else if (unformat (i, "current-data-flag %d", ¤t_data_flag)) - ; - else if (unformat (i, "current-data-offset %d", ¤t_data_offset)) + if (unformat (i, "sw_if_index %d", &sw_if_index)) ; else break; } - if (is_add && mask == 0) + if (sw_if_index == ~0) { - errmsg ("Mask required"); + errmsg ("missing sw_if_index"); return -99; } - if (is_add && skip == ~0) - { - errmsg ("skip count required"); - return -99; - } + /* Construct the API message */ + M (DELETE_LOOPBACK, mp); + mp->sw_if_index = ntohl (sw_if_index); - if (is_add && match == ~0) + S (mp); + W (ret); + return ret; +} + +static int +api_want_interface_events (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_want_interface_events_t *mp; + int enable = -1; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - errmsg ("match count required"); - return -99; + if (unformat (i, "enable")) + enable = 1; + else if (unformat (i, "disable")) + enable = 0; + else + break; } - if (!is_add && table_index == ~0) + if (enable == -1) { - errmsg ("table index required for delete"); + errmsg ("missing enable|disable"); return -99; } - M2 (CLASSIFY_ADD_DEL_TABLE, mp, vec_len (mask)); - - mp->is_add = is_add; - mp->del_chain = del_chain; - mp->table_index = ntohl (table_index); - mp->nbuckets = ntohl (nbuckets); - mp->memory_size = ntohl (memory_size); - mp->skip_n_vectors = ntohl (skip); - mp->match_n_vectors = ntohl (match); - mp->next_table_index = ntohl (next_table_index); - mp->miss_next_index = ntohl (miss_next_index); - mp->current_data_flag = ntohl (current_data_flag); - mp->current_data_offset = ntohl (current_data_offset); - mp->mask_len = ntohl (vec_len (mask)); - clib_memcpy (mp->mask, mask, vec_len (mask)); + M (WANT_INTERFACE_EVENTS, mp); + mp->enable_disable = enable; - vec_free (mask); + vam->interface_event_display = enable; S (mp); W (ret); return ret; } -#if VPP_API_TEST_BUILTIN == 0 -uword -unformat_l4_match (unformat_input_t * input, va_list * args) -{ - u8 **matchp = va_arg (*args, u8 **); - - u8 *proto_header = 0; - int src_port = 0; - int dst_port = 0; - - tcpudp_header_t h; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "src_port %d", &src_port)) - ; - else if (unformat (input, "dst_port %d", &dst_port)) - ; - else - return 0; - } +/* Note: non-static, called once to set up the initial intfc table */ +int +api_sw_interface_dump (vat_main_t * vam) +{ + vl_api_sw_interface_dump_t *mp; + vl_api_control_ping_t *mp_ping; + hash_pair_t *p; + name_sort_t *nses = 0, *ns; + sw_interface_subif_t *sub = NULL; + int ret; - h.src_port = clib_host_to_net_u16 (src_port); - h.dst_port = clib_host_to_net_u16 (dst_port); - vec_validate (proto_header, sizeof (h) - 1); - memcpy (proto_header, &h, sizeof (h)); + /* Toss the old name table */ + /* *INDENT-OFF* */ + hash_foreach_pair (p, vam->sw_if_index_by_interface_name, + ({ + vec_add2 (nses, ns, 1); + ns->name = (u8 *)(p->key); + ns->value = (u32) p->value[0]; + })); + /* *INDENT-ON* */ - *matchp = proto_header; + hash_free (vam->sw_if_index_by_interface_name); - return 1; -} + vec_foreach (ns, nses) vec_free (ns->name); -uword -unformat_ip4_match (unformat_input_t * input, va_list * args) -{ - u8 **matchp = va_arg (*args, u8 **); - u8 *match = 0; - ip4_header_t *ip; - int version = 0; - u32 version_val; - int hdr_length = 0; - u32 hdr_length_val; - int src = 0, dst = 0; - ip4_address_t src_val, dst_val; - int proto = 0; - u32 proto_val; - int tos = 0; - u32 tos_val; - int length = 0; - u32 length_val; - int fragment_id = 0; - u32 fragment_id_val; - int ttl = 0; - int ttl_val; - int checksum = 0; - u32 checksum_val; + vec_free (nses); - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "version %d", &version_val)) - version = 1; - else if (unformat (input, "hdr_length %d", &hdr_length_val)) - hdr_length = 1; - else if (unformat (input, "src %U", unformat_ip4_address, &src_val)) - src = 1; - else if (unformat (input, "dst %U", unformat_ip4_address, &dst_val)) - dst = 1; - else if (unformat (input, "proto %d", &proto_val)) - proto = 1; - else if (unformat (input, "tos %d", &tos_val)) - tos = 1; - else if (unformat (input, "length %d", &length_val)) - length = 1; - else if (unformat (input, "fragment_id %d", &fragment_id_val)) - fragment_id = 1; - else if (unformat (input, "ttl %d", &ttl_val)) - ttl = 1; - else if (unformat (input, "checksum %d", &checksum_val)) - checksum = 1; - else - break; - } + vec_foreach (sub, vam->sw_if_subif_table) + { + vec_free (sub->interface_name); + } + vec_free (vam->sw_if_subif_table); - if (version + hdr_length + src + dst + proto + tos + length + fragment_id - + ttl + checksum == 0) - return 0; + /* recreate the interface name hash table */ + vam->sw_if_index_by_interface_name = hash_create_string (0, sizeof (uword)); /* - * Aligned because we use the real comparison functions + * Ask for all interface names. Otherwise, the epic catalog of + * name filters becomes ridiculously long, and vat ends up needing + * to be taught about new interface types. */ - vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4)); + M (SW_INTERFACE_DUMP, mp); + S (mp); - ip = (ip4_header_t *) match; + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - /* These are realistically matched in practice */ - if (src) - ip->src_address.as_u32 = src_val.as_u32; + W (ret); + return ret; +} + +static int +api_sw_interface_set_flags (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_flags_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u8 admin_up = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "admin-up")) + admin_up = 1; + else if (unformat (i, "admin-down")) + admin_up = 0; + else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; + } - if (dst) - ip->dst_address.as_u32 = dst_val.as_u32; + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } - if (proto) - ip->protocol = proto_val; + /* Construct the API message */ + M (SW_INTERFACE_SET_FLAGS, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->flags = ntohl ((admin_up) ? IF_STATUS_API_FLAG_ADMIN_UP : 0); + /* send it... */ + S (mp); - /* These are not, but they're included for completeness */ - if (version) - ip->ip_version_and_header_length |= (version_val & 0xF) << 4; + /* Wait for a reply, return the good/bad news... */ + W (ret); + return ret; +} - if (hdr_length) - ip->ip_version_and_header_length |= (hdr_length_val & 0xF); +static int +api_sw_interface_set_rx_mode (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_rx_mode_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + int ret; + u8 queue_id_valid = 0; + u32 queue_id; + vnet_hw_if_rx_mode mode = VNET_HW_IF_RX_MODE_UNKNOWN; - if (tos) - ip->tos = tos_val; + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "queue %d", &queue_id)) + queue_id_valid = 1; + else if (unformat (i, "polling")) + mode = VNET_HW_IF_RX_MODE_POLLING; + else if (unformat (i, "interrupt")) + mode = VNET_HW_IF_RX_MODE_INTERRUPT; + else if (unformat (i, "adaptive")) + mode = VNET_HW_IF_RX_MODE_ADAPTIVE; + else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; + } - if (length) - ip->length = clib_host_to_net_u16 (length_val); + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } + if (mode == VNET_HW_IF_RX_MODE_UNKNOWN) + { + errmsg ("missing rx-mode"); + return -99; + } - if (ttl) - ip->ttl = ttl_val; + /* Construct the API message */ + M (SW_INTERFACE_SET_RX_MODE, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->mode = (vl_api_rx_mode_t) mode; + mp->queue_id_valid = queue_id_valid; + mp->queue_id = queue_id_valid ? ntohl (queue_id) : ~0; - if (checksum) - ip->checksum = clib_host_to_net_u16 (checksum_val); + /* send it... */ + S (mp); - *matchp = match; - return 1; + /* Wait for a reply, return the good/bad news... */ + W (ret); + return ret; } -uword -unformat_ip6_match (unformat_input_t * input, va_list * args) +static int +api_sw_interface_set_rx_placement (vat_main_t * vam) { - u8 **matchp = va_arg (*args, u8 **); - u8 *match = 0; - ip6_header_t *ip; - int version = 0; - u32 version_val; - u8 traffic_class = 0; - u32 traffic_class_val = 0; - u8 flow_label = 0; - u8 flow_label_val; - int src = 0, dst = 0; - ip6_address_t src_val, dst_val; - int proto = 0; - u32 proto_val; - int payload_length = 0; - u32 payload_length_val; - int hop_limit = 0; - int hop_limit_val; - u32 ip_version_traffic_class_and_flow_label; + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_rx_placement_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + int ret; + u8 is_main = 0; + u32 queue_id, thread_index; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "version %d", &version_val)) - version = 1; - else if (unformat (input, "traffic_class %d", &traffic_class_val)) - traffic_class = 1; - else if (unformat (input, "flow_label %d", &flow_label_val)) - flow_label = 1; - else if (unformat (input, "src %U", unformat_ip6_address, &src_val)) - src = 1; - else if (unformat (input, "dst %U", unformat_ip6_address, &dst_val)) - dst = 1; - else if (unformat (input, "proto %d", &proto_val)) - proto = 1; - else if (unformat (input, "payload_length %d", &payload_length_val)) - payload_length = 1; - else if (unformat (input, "hop_limit %d", &hop_limit_val)) - hop_limit = 1; + if (unformat (i, "queue %d", &queue_id)) + ; + else if (unformat (i, "main")) + is_main = 1; + else if (unformat (i, "worker %d", &thread_index)) + ; + else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else break; } - if (version + traffic_class + flow_label + src + dst + proto + - payload_length + hop_limit == 0) - return 0; + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } - /* - * Aligned because we use the real comparison functions - */ - vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4)); + if (is_main) + thread_index = 0; + /* Construct the API message */ + M (SW_INTERFACE_SET_RX_PLACEMENT, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->worker_id = ntohl (thread_index); + mp->queue_id = ntohl (queue_id); + mp->is_main = is_main; - ip = (ip6_header_t *) match; + /* send it... */ + S (mp); + /* Wait for a reply, return the good/bad news... */ + W (ret); + return ret; +} - if (src) - clib_memcpy (&ip->src_address, &src_val, sizeof (ip->src_address)); +static void vl_api_sw_interface_rx_placement_details_t_handler + (vl_api_sw_interface_rx_placement_details_t * mp) +{ + vat_main_t *vam = &vat_main; + u32 worker_id = ntohl (mp->worker_id); - if (dst) - clib_memcpy (&ip->dst_address, &dst_val, sizeof (ip->dst_address)); + print (vam->ofp, + "\n%-11d %-11s %-6d %-5d %-9s", + ntohl (mp->sw_if_index), (worker_id == 0) ? "main" : "worker", + worker_id, ntohl (mp->queue_id), + (mp->mode == + 1) ? "polling" : ((mp->mode == 2) ? "interrupt" : "adaptive")); +} - if (proto) - ip->protocol = proto_val; +static void vl_api_sw_interface_rx_placement_details_t_handler_json + (vl_api_sw_interface_rx_placement_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; - ip_version_traffic_class_and_flow_label = 0; + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); - if (version) - ip_version_traffic_class_and_flow_label |= (version_val & 0xF) << 28; + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "worker_id", ntohl (mp->worker_id)); + vat_json_object_add_uint (node, "queue_id", ntohl (mp->queue_id)); + vat_json_object_add_uint (node, "mode", mp->mode); +} - if (traffic_class) - ip_version_traffic_class_and_flow_label |= - (traffic_class_val & 0xFF) << 20; +static int +api_sw_interface_rx_placement_dump (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_sw_interface_rx_placement_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + u32 sw_if_index; + u8 sw_if_index_set = 0; - if (flow_label) - ip_version_traffic_class_and_flow_label |= (flow_label_val & 0xFFFFF); + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set++; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set++; + else + break; + } - ip->ip_version_traffic_class_and_flow_label = - clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label); + print (vam->ofp, + "\n%-11s %-11s %-6s %-5s %-4s", + "sw_if_index", "main/worker", "thread", "queue", "mode"); - if (payload_length) - ip->payload_length = clib_host_to_net_u16 (payload_length_val); + /* Dump Interface rx placement */ + M (SW_INTERFACE_RX_PLACEMENT_DUMP, mp); - if (hop_limit) - ip->hop_limit = hop_limit_val; + if (sw_if_index_set) + mp->sw_if_index = htonl (sw_if_index); + else + mp->sw_if_index = ~0; + + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - *matchp = match; - return 1; + W (ret); + return ret; } -uword -unformat_l3_match (unformat_input_t * input, va_list * args) +static int +api_sw_interface_clear_stats (vat_main_t * vam) { - u8 **matchp = va_arg (*args, u8 **); + unformat_input_t *i = vam->input; + vl_api_sw_interface_clear_stats_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "ip4 %U", unformat_ip4_match, matchp)) - return 1; - else if (unformat (input, "ip6 %U", unformat_ip6_match, matchp)) - return 1; + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else break; } - return 0; -} -uword -unformat_vlan_tag (unformat_input_t * input, va_list * args) -{ - u8 *tagp = va_arg (*args, u8 *); - u32 tag; + /* Construct the API message */ + M (SW_INTERFACE_CLEAR_STATS, mp); - if (unformat (input, "%d", &tag)) - { - tagp[0] = (tag >> 8) & 0x0F; - tagp[1] = tag & 0xFF; - return 1; - } + if (sw_if_index_set == 1) + mp->sw_if_index = ntohl (sw_if_index); + else + mp->sw_if_index = ~0; - return 0; + /* send it... */ + S (mp); + + /* Wait for a reply, return the good/bad news... */ + W (ret); + return ret; } -uword -unformat_l2_match (unformat_input_t * input, va_list * args) +static int +api_sw_interface_add_del_address (vat_main_t * vam) { - u8 **matchp = va_arg (*args, u8 **); - u8 *match = 0; - u8 src = 0; - u8 src_val[6]; - u8 dst = 0; - u8 dst_val[6]; - u8 proto = 0; - u16 proto_val; - u8 tag1 = 0; - u8 tag1_val[2]; - u8 tag2 = 0; - u8 tag2_val[2]; - int len = 14; - u8 ignore_tag1 = 0; - u8 ignore_tag2 = 0; - u8 cos1 = 0; - u8 cos2 = 0; - u32 cos1_val = 0; - u32 cos2_val = 0; + unformat_input_t *i = vam->input; + vl_api_sw_interface_add_del_address_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u8 is_add = 1, del_all = 0; + u32 address_length = 0; + u8 v4_address_set = 0; + u8 v6_address_set = 0; + ip4_address_t v4address; + ip6_address_t v6address; + int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "src %U", unformat_ethernet_address, &src_val)) - src = 1; + if (unformat (i, "del-all")) + del_all = 1; + else if (unformat (i, "del")) + is_add = 0; else - if (unformat (input, "dst %U", unformat_ethernet_address, &dst_val)) - dst = 1; - else if (unformat (input, "proto %U", - unformat_ethernet_type_host_byte_order, &proto_val)) - proto = 1; - else if (unformat (input, "tag1 %U", unformat_vlan_tag, tag1_val)) - tag1 = 1; - else if (unformat (input, "tag2 %U", unformat_vlan_tag, tag2_val)) - tag2 = 1; - else if (unformat (input, "ignore-tag1")) - ignore_tag1 = 1; - else if (unformat (input, "ignore-tag2")) - ignore_tag2 = 1; - else if (unformat (input, "cos1 %d", &cos1_val)) - cos1 = 1; - else if (unformat (input, "cos2 %d", &cos2_val)) - cos2 = 1; + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "%U/%d", + unformat_ip4_address, &v4address, &address_length)) + v4_address_set = 1; + else if (unformat (i, "%U/%d", + unformat_ip6_address, &v6address, &address_length)) + v6_address_set = 1; else break; } - if ((src + dst + proto + tag1 + tag2 + - ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0) - return 0; - - if (tag1 || ignore_tag1 || cos1) - len = 18; - if (tag2 || ignore_tag2 || cos2) - len = 22; - - vec_validate_aligned (match, len - 1, sizeof (u32x4)); - - if (dst) - clib_memcpy (match, dst_val, 6); - - if (src) - clib_memcpy (match + 6, src_val, 6); - if (tag2) + if (sw_if_index_set == 0) { - /* inner vlan tag */ - match[19] = tag2_val[1]; - match[18] = tag2_val[0]; - if (cos2) - match[18] |= (cos2_val & 0x7) << 5; - if (proto) - { - match[21] = proto_val & 0xff; - match[20] = proto_val >> 8; - } - if (tag1) - { - match[15] = tag1_val[1]; - match[14] = tag1_val[0]; - } - if (cos1) - match[14] |= (cos1_val & 0x7) << 5; - *matchp = match; - return 1; + errmsg ("missing interface name or sw_if_index"); + return -99; } - if (tag1) + if (v4_address_set && v6_address_set) { - match[15] = tag1_val[1]; - match[14] = tag1_val[0]; - if (proto) - { - match[17] = proto_val & 0xff; - match[16] = proto_val >> 8; - } - if (cos1) - match[14] |= (cos1_val & 0x7) << 5; + errmsg ("both v4 and v6 addresses set"); + return -99; + } + if (!v4_address_set && !v6_address_set && !del_all) + { + errmsg ("no addresses set"); + return -99; + } - *matchp = match; - return 1; + /* Construct the API message */ + M (SW_INTERFACE_ADD_DEL_ADDRESS, mp); + + mp->sw_if_index = ntohl (sw_if_index); + mp->is_add = is_add; + mp->del_all = del_all; + if (v6_address_set) + { + mp->prefix.address.af = ADDRESS_IP6; + clib_memcpy (mp->prefix.address.un.ip6, &v6address, sizeof (v6address)); } - if (cos2) - match[18] |= (cos2_val & 0x7) << 5; - if (cos1) - match[14] |= (cos1_val & 0x7) << 5; - if (proto) + else { - match[13] = proto_val & 0xff; - match[12] = proto_val >> 8; + mp->prefix.address.af = ADDRESS_IP4; + clib_memcpy (mp->prefix.address.un.ip4, &v4address, sizeof (v4address)); } + mp->prefix.len = address_length; - *matchp = match; - return 1; + /* send it... */ + S (mp); + + /* Wait for a reply, return good/bad news */ + W (ret); + return ret; } -uword -unformat_qos_source (unformat_input_t * input, va_list * args) +static int +api_sw_interface_set_mpls_enable (vat_main_t * vam) { - int *qs = va_arg (*args, int *); + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_mpls_enable_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u8 enable = 1; + int ret; - if (unformat (input, "ip")) - *qs = QOS_SOURCE_IP; - else if (unformat (input, "mpls")) - *qs = QOS_SOURCE_MPLS; - else if (unformat (input, "ext")) - *qs = QOS_SOURCE_EXT; - else if (unformat (input, "vlan")) - *qs = QOS_SOURCE_VLAN; - else - return 0; + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "disable")) + enable = 0; + else if (unformat (i, "dis")) + enable = 0; + else + break; + } + + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } + + /* Construct the API message */ + M (SW_INTERFACE_SET_MPLS_ENABLE, mp); + + mp->sw_if_index = ntohl (sw_if_index); + mp->enable = enable; - return 1; + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; } -#endif -uword -api_unformat_classify_match (unformat_input_t * input, va_list * args) +static int +api_sw_interface_set_table (vat_main_t * vam) { - u8 **matchp = va_arg (*args, u8 **); - u32 skip_n_vectors = va_arg (*args, u32); - u32 match_n_vectors = va_arg (*args, u32); - - u8 *match = 0; - u8 *l2 = 0; - u8 *l3 = 0; - u8 *l4 = 0; + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_table_t *mp; + u32 sw_if_index, vrf_id = 0; + u8 sw_if_index_set = 0; + u8 is_ipv6 = 0; + int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "hex %U", unformat_hex_string, &match)) - ; - else if (unformat (input, "l2 %U", unformat_l2_match, &l2)) - ; - else if (unformat (input, "l3 %U", unformat_l3_match, &l3)) - ; - else if (unformat (input, "l4 %U", unformat_l4_match, &l4)) + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "vrf %d", &vrf_id)) ; + else if (unformat (i, "ipv6")) + is_ipv6 = 1; else break; } - if (l4 && !l3) + if (sw_if_index_set == 0) { - vec_free (match); - vec_free (l2); - vec_free (l4); - return 0; + errmsg ("missing interface name or sw_if_index"); + return -99; } - if (match || l2 || l3 || l4) - { - if (l2 || l3 || l4) - { - /* "Win a free Ethernet header in every packet" */ - if (l2 == 0) - vec_validate_aligned (l2, 13, sizeof (u32x4)); - match = l2; - if (vec_len (l3)) - { - vec_append_aligned (match, l3, sizeof (u32x4)); - vec_free (l3); - } - if (vec_len (l4)) - { - vec_append_aligned (match, l4, sizeof (u32x4)); - vec_free (l4); - } - } + /* Construct the API message */ + M (SW_INTERFACE_SET_TABLE, mp); - /* Make sure the vector is big enough even if key is all 0's */ - vec_validate_aligned - (match, ((match_n_vectors + skip_n_vectors) * sizeof (u32x4)) - 1, - sizeof (u32x4)); + mp->sw_if_index = ntohl (sw_if_index); + mp->is_ipv6 = is_ipv6; + mp->vrf_id = ntohl (vrf_id); - /* Set size, include skipped vectors */ - _vec_len (match) = (match_n_vectors + skip_n_vectors) * sizeof (u32x4); + /* send it... */ + S (mp); - *matchp = match; + /* Wait for a reply... */ + W (ret); + return ret; +} - return 1; - } +static void vl_api_sw_interface_get_table_reply_t_handler + (vl_api_sw_interface_get_table_reply_t * mp) +{ + vat_main_t *vam = &vat_main; - return 0; + print (vam->ofp, "%d", ntohl (mp->vrf_id)); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; + +} + +static void vl_api_sw_interface_get_table_reply_t_handler_json + (vl_api_sw_interface_get_table_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + + vat_json_init_object (&node); + vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); + vat_json_object_add_int (&node, "vrf_id", ntohl (mp->vrf_id)); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; } static int -api_classify_add_del_session (vat_main_t * vam) +api_sw_interface_get_table (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_classify_add_del_session_t *mp; - int is_add = 1; - u32 table_index = ~0; - u32 hit_next_index = ~0; - u32 opaque_index = ~0; - u8 *match = 0; - i32 advance = 0; - u32 skip_n_vectors = 0; - u32 match_n_vectors = 0; - u32 action = 0; - u32 metadata = 0; + vl_api_sw_interface_get_table_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u8 is_ipv6 = 0; int ret; - /* - * Warning: you have to supply skip_n and match_n - * because the API client cant simply look at the classify - * table object. - */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "hit-next %U", api_unformat_ip_next_index, - &hit_next_index)) - ; - else if (unformat (i, "l2-hit-next %U", unformat_l2_next_index, - &hit_next_index)) - ; - else if (unformat (i, "acl-hit-next %U", api_unformat_acl_next_index, - &hit_next_index)) - ; - else if (unformat (i, "policer-hit-next %d", &hit_next_index)) - ; - else if (unformat (i, "%U", unformat_policer_precolor, &opaque_index)) - ; - else if (unformat (i, "opaque-index %d", &opaque_index)) - ; - else if (unformat (i, "skip_n %d", &skip_n_vectors)) - ; - else if (unformat (i, "match_n %d", &match_n_vectors)) - ; - else if (unformat (i, "match %U", api_unformat_classify_match, - &match, skip_n_vectors, match_n_vectors)) - ; - else if (unformat (i, "advance %d", &advance)) - ; - else if (unformat (i, "table-index %d", &table_index)) - ; - else if (unformat (i, "action set-ip4-fib-id %d", &metadata)) - action = 1; - else if (unformat (i, "action set-ip6-fib-id %d", &metadata)) - action = 2; - else if (unformat (i, "action %d", &action)) - ; - else if (unformat (i, "metadata %d", &metadata)) - ; + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "ipv6")) + is_ipv6 = 1; else break; } - if (table_index == ~0) + if (sw_if_index_set == 0) { - errmsg ("Table index required"); + errmsg ("missing interface name or sw_if_index"); return -99; } - if (is_add && match == 0) + M (SW_INTERFACE_GET_TABLE, mp); + mp->sw_if_index = htonl (sw_if_index); + mp->is_ipv6 = is_ipv6; + + S (mp); + W (ret); + return ret; +} + +static int +api_sw_interface_set_vpath (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_vpath_t *mp; + u32 sw_if_index = 0; + u8 sw_if_index_set = 0; + u8 is_enable = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - errmsg ("Match value required"); + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "enable")) + is_enable = 1; + else if (unformat (i, "disable")) + is_enable = 0; + else + break; + } + + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); return -99; } - M2 (CLASSIFY_ADD_DEL_SESSION, mp, vec_len (match)); + /* Construct the API message */ + M (SW_INTERFACE_SET_VPATH, mp); - mp->is_add = is_add; - mp->table_index = ntohl (table_index); - mp->hit_next_index = ntohl (hit_next_index); - mp->opaque_index = ntohl (opaque_index); - mp->advance = ntohl (advance); - mp->action = action; - mp->metadata = ntohl (metadata); - mp->match_len = ntohl (vec_len (match)); - clib_memcpy (mp->match, match, vec_len (match)); - vec_free (match); + mp->sw_if_index = ntohl (sw_if_index); + mp->enable = is_enable; + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; } static int -api_classify_set_interface_ip_table (vat_main_t * vam) +api_sw_interface_set_vxlan_bypass (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_classify_set_interface_ip_table_t *mp; - u32 sw_if_index; - int sw_if_index_set; - u32 table_index = ~0; + vl_api_sw_interface_set_vxlan_bypass_t *mp; + u32 sw_if_index = 0; + u8 sw_if_index_set = 0; + u8 is_enable = 1; u8 is_ipv6 = 0; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) sw_if_index_set = 1; else if (unformat (i, "sw_if_index %d", &sw_if_index)) sw_if_index_set = 1; - else if (unformat (i, "table %d", &table_index)) - ; + else if (unformat (i, "enable")) + is_enable = 1; + else if (unformat (i, "disable")) + is_enable = 0; + else if (unformat (i, "ip4")) + is_ipv6 = 0; + else if (unformat (i, "ip6")) + is_ipv6 = 1; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } if (sw_if_index_set == 0) @@ -10678,66 +4475,87 @@ api_classify_set_interface_ip_table (vat_main_t * vam) return -99; } - - M (CLASSIFY_SET_INTERFACE_IP_TABLE, mp); + /* Construct the API message */ + M (SW_INTERFACE_SET_VXLAN_BYPASS, mp); mp->sw_if_index = ntohl (sw_if_index); - mp->table_index = ntohl (table_index); + mp->enable = is_enable; mp->is_ipv6 = is_ipv6; + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; } static int -api_classify_set_interface_l2_tables (vat_main_t * vam) +api_sw_interface_set_l2_xconnect (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_classify_set_interface_l2_tables_t *mp; - u32 sw_if_index; - int sw_if_index_set; - u32 ip4_table_index = ~0; - u32 ip6_table_index = ~0; - u32 other_table_index = ~0; - u32 is_input = 1; + vl_api_sw_interface_set_l2_xconnect_t *mp; + u32 rx_sw_if_index; + u8 rx_sw_if_index_set = 0; + u32 tx_sw_if_index; + u8 tx_sw_if_index_set = 0; + u8 enable = 1; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "ip4-table %d", &ip4_table_index)) - ; - else if (unformat (i, "ip6-table %d", &ip6_table_index)) - ; - else if (unformat (i, "other-table %d", &other_table_index)) - ; - else if (unformat (i, "is-input %d", &is_input)) - ; - else + if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index)) + rx_sw_if_index_set = 1; + else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index)) + tx_sw_if_index_set = 1; + else if (unformat (i, "rx")) { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; + if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, + &rx_sw_if_index)) + rx_sw_if_index_set = 1; + } + else + break; + } + else if (unformat (i, "tx")) + { + if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, + &tx_sw_if_index)) + tx_sw_if_index_set = 1; + } + else + break; } + else if (unformat (i, "enable")) + enable = 1; + else if (unformat (i, "disable")) + enable = 0; + else + break; } - if (sw_if_index_set == 0) + if (rx_sw_if_index_set == 0) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("missing rx interface name or rx_sw_if_index"); return -99; } + if (enable && (tx_sw_if_index_set == 0)) + { + errmsg ("missing tx interface name or tx_sw_if_index"); + return -99; + } - M (CLASSIFY_SET_INTERFACE_L2_TABLES, mp); + M (SW_INTERFACE_SET_L2_XCONNECT, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->ip4_table_index = ntohl (ip4_table_index); - mp->ip6_table_index = ntohl (ip6_table_index); - mp->other_table_index = ntohl (other_table_index); - mp->is_input = (u8) is_input; + mp->rx_sw_if_index = ntohl (rx_sw_if_index); + mp->tx_sw_if_index = ntohl (tx_sw_if_index); + mp->enable = enable; S (mp); W (ret); @@ -10745,66 +4563,65 @@ api_classify_set_interface_l2_tables (vat_main_t * vam) } static int -api_set_ipfix_exporter (vat_main_t * vam) +api_sw_interface_set_l2_bridge (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_set_ipfix_exporter_t *mp; - ip4_address_t collector_address; - u8 collector_address_set = 0; - u32 collector_port = ~0; - ip4_address_t src_address; - u8 src_address_set = 0; - u32 vrf_id = ~0; - u32 path_mtu = ~0; - u32 template_interval = ~0; - u8 udp_checksum = 0; + vl_api_sw_interface_set_l2_bridge_t *mp; + vl_api_l2_port_type_t port_type; + u32 rx_sw_if_index; + u8 rx_sw_if_index_set = 0; + u32 bd_id; + u8 bd_id_set = 0; + u32 shg = 0; + u8 enable = 1; int ret; + port_type = L2_API_PORT_TYPE_NORMAL; + + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "collector_address %U", unformat_ip4_address, - &collector_address)) - collector_address_set = 1; - else if (unformat (i, "collector_port %d", &collector_port)) - ; - else if (unformat (i, "src_address %U", unformat_ip4_address, - &src_address)) - src_address_set = 1; - else if (unformat (i, "vrf_id %d", &vrf_id)) - ; - else if (unformat (i, "path_mtu %d", &path_mtu)) - ; - else if (unformat (i, "template_interval %d", &template_interval)) + if (unformat (i, "sw_if_index %d", &rx_sw_if_index)) + rx_sw_if_index_set = 1; + else if (unformat (i, "bd_id %d", &bd_id)) + bd_id_set = 1; + else + if (unformat + (i, "%U", api_unformat_sw_if_index, vam, &rx_sw_if_index)) + rx_sw_if_index_set = 1; + else if (unformat (i, "shg %d", &shg)) ; - else if (unformat (i, "udp_checksum")) - udp_checksum = 1; + else if (unformat (i, "bvi")) + port_type = L2_API_PORT_TYPE_BVI; + else if (unformat (i, "uu-fwd")) + port_type = L2_API_PORT_TYPE_UU_FWD; + else if (unformat (i, "enable")) + enable = 1; + else if (unformat (i, "disable")) + enable = 0; else break; } - if (collector_address_set == 0) + if (rx_sw_if_index_set == 0) { - errmsg ("collector_address required"); + errmsg ("missing rx interface name or sw_if_index"); return -99; } - if (src_address_set == 0) + if (enable && (bd_id_set == 0)) { - errmsg ("src_address required"); + errmsg ("missing bridge domain"); return -99; } - M (SET_IPFIX_EXPORTER, mp); + M (SW_INTERFACE_SET_L2_BRIDGE, mp); - memcpy (mp->collector_address.un.ip4, collector_address.data, - sizeof (collector_address.data)); - mp->collector_port = htons ((u16) collector_port); - memcpy (mp->src_address.un.ip4, src_address.data, - sizeof (src_address.data)); - mp->vrf_id = htonl (vrf_id); - mp->path_mtu = htonl (path_mtu); - mp->template_interval = htonl (template_interval); - mp->udp_checksum = udp_checksum; + mp->rx_sw_if_index = ntohl (rx_sw_if_index); + mp->bd_id = ntohl (bd_id); + mp->shg = (u8) shg; + mp->port_type = ntohl (port_type); + mp->enable = enable; S (mp); W (ret); @@ -10812,128 +4629,144 @@ api_set_ipfix_exporter (vat_main_t * vam) } static int -api_set_ipfix_classify_stream (vat_main_t * vam) +api_bridge_domain_dump (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_set_ipfix_classify_stream_t *mp; - u32 domain_id = 0; - u32 src_port = UDP_DST_PORT_ipfix; + vl_api_bridge_domain_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u32 bd_id = ~0; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "domain %d", &domain_id)) - ; - else if (unformat (i, "src_port %d", &src_port)) + if (unformat (i, "bd_id %d", &bd_id)) ; else - { - errmsg ("unknown input `%U'", format_unformat_error, i); - return -99; - } + break; } - M (SET_IPFIX_CLASSIFY_STREAM, mp); + M (BRIDGE_DOMAIN_DUMP, mp); + mp->bd_id = ntohl (bd_id); + S (mp); - mp->domain_id = htonl (domain_id); - mp->src_port = htons ((u16) src_port); + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - S (mp); W (ret); return ret; } static int -api_ipfix_classify_table_add_del (vat_main_t * vam) +api_bridge_domain_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ipfix_classify_table_add_del_t *mp; - int is_add = -1; - u32 classify_table_index = ~0; - u8 ip_version = 0; - u8 transport_protocol = 255; + vl_api_bridge_domain_add_del_t *mp; + u32 bd_id = ~0; + u8 is_add = 1; + u32 flood = 1, forward = 1, learn = 1, uu_flood = 1, arp_term = 0; + u8 *bd_tag = NULL; + u32 mac_age = 0; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "add")) - is_add = 1; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "table %d", &classify_table_index)) + if (unformat (i, "bd_id %d", &bd_id)) ; - else if (unformat (i, "ip4")) - ip_version = 4; - else if (unformat (i, "ip6")) - ip_version = 6; - else if (unformat (i, "tcp")) - transport_protocol = 6; - else if (unformat (i, "udp")) - transport_protocol = 17; - else - { - errmsg ("unknown input `%U'", format_unformat_error, i); - return -99; + else if (unformat (i, "flood %d", &flood)) + ; + else if (unformat (i, "uu-flood %d", &uu_flood)) + ; + else if (unformat (i, "forward %d", &forward)) + ; + else if (unformat (i, "learn %d", &learn)) + ; + else if (unformat (i, "arp-term %d", &arp_term)) + ; + else if (unformat (i, "mac-age %d", &mac_age)) + ; + else if (unformat (i, "bd-tag %s", &bd_tag)) + ; + else if (unformat (i, "del")) + { + is_add = 0; + flood = uu_flood = forward = learn = 0; } + else + break; } - if (is_add == -1) + if (bd_id == ~0) { - errmsg ("expecting: add|del"); - return -99; + errmsg ("missing bridge domain"); + ret = -99; + goto done; } - if (classify_table_index == ~0) + + if (mac_age > 255) { - errmsg ("classifier table not specified"); - return -99; + errmsg ("mac age must be less than 256 "); + ret = -99; + goto done; } - if (ip_version == 0) + + if ((bd_tag) && (vec_len (bd_tag) > 63)) { - errmsg ("IP version not specified"); - return -99; + errmsg ("bd-tag cannot be longer than 63"); + ret = -99; + goto done; } - M (IPFIX_CLASSIFY_TABLE_ADD_DEL, mp); + M (BRIDGE_DOMAIN_ADD_DEL, mp); + mp->bd_id = ntohl (bd_id); + mp->flood = flood; + mp->uu_flood = uu_flood; + mp->forward = forward; + mp->learn = learn; + mp->arp_term = arp_term; mp->is_add = is_add; - mp->table_id = htonl (classify_table_index); - mp->ip_version = ip_version; - mp->transport_protocol = transport_protocol; - + mp->mac_age = (u8) mac_age; + if (bd_tag) + { + clib_memcpy (mp->bd_tag, bd_tag, vec_len (bd_tag)); + mp->bd_tag[vec_len (bd_tag)] = 0; + } S (mp); W (ret); + +done: + vec_free (bd_tag); return ret; } static int -api_get_node_index (vat_main_t * vam) +api_l2fib_flush_bd (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_get_node_index_t *mp; - u8 *name = 0; + vl_api_l2fib_flush_bd_t *mp; + u32 bd_id = ~0; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "node %s", &name)) - ; + if (unformat (i, "bd_id %d", &bd_id)); else break; } - if (name == 0) - { - errmsg ("node name required"); - return -99; - } - if (vec_len (name) >= ARRAY_LEN (mp->node_name)) + + if (bd_id == ~0) { - errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); + errmsg ("missing bridge domain"); return -99; } - M (GET_NODE_INDEX, mp); - clib_memcpy (mp->node_name, name, vec_len (name)); - vec_free (name); + M (L2FIB_FLUSH_BD, mp); + + mp->bd_id = htonl (bd_id); S (mp); W (ret); @@ -10941,48 +4774,32 @@ api_get_node_index (vat_main_t * vam) } static int -api_get_next_index (vat_main_t * vam) +api_l2fib_flush_int (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_get_next_index_t *mp; - u8 *node_name = 0, *next_node_name = 0; + vl_api_l2fib_flush_int_t *mp; + u32 sw_if_index = ~0; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "node-name %s", &node_name)) - ; - else if (unformat (i, "next-node-name %s", &next_node_name)) + if (unformat (i, "sw_if_index %d", &sw_if_index)); + else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)); + else break; } - if (node_name == 0) - { - errmsg ("node name required"); - return -99; - } - if (vec_len (node_name) >= ARRAY_LEN (mp->node_name)) + if (sw_if_index == ~0) { - errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); + errmsg ("missing interface name or sw_if_index"); return -99; } - if (next_node_name == 0) - { - errmsg ("next node name required"); - return -99; - } - if (vec_len (next_node_name) >= ARRAY_LEN (mp->next_name)) - { - errmsg ("next node name too long, max %d", ARRAY_LEN (mp->next_name)); - return -99; - } + M (L2FIB_FLUSH_INT, mp); - M (GET_NEXT_INDEX, mp); - clib_memcpy (mp->node_name, node_name, vec_len (node_name)); - clib_memcpy (mp->next_name, next_node_name, vec_len (next_node_name)); - vec_free (node_name); - vec_free (next_node_name); + mp->sw_if_index = ntohl (sw_if_index); S (mp); W (ret); @@ -10990,117 +4807,189 @@ api_get_next_index (vat_main_t * vam) } static int -api_add_node_next (vat_main_t * vam) +api_l2fib_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_add_node_next_t *mp; - u8 *name = 0; - u8 *next = 0; - int ret; + vl_api_l2fib_add_del_t *mp; + f64 timeout; + u8 mac[6] = { 0 }; + u8 mac_set = 0; + u32 bd_id; + u8 bd_id_set = 0; + u32 sw_if_index = 0; + u8 sw_if_index_set = 0; + u8 is_add = 1; + u8 static_mac = 0; + u8 filter_mac = 0; + u8 bvi_mac = 0; + int count = 1; + f64 before = 0; + int j; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "node %s", &name)) - ; - else if (unformat (i, "next %s", &next)) + if (unformat (i, "mac %U", unformat_ethernet_address, mac)) + mac_set = 1; + else if (unformat (i, "bd_id %d", &bd_id)) + bd_id_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if")) + { + if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat + (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + } + else + break; + } + else if (unformat (i, "static")) + static_mac = 1; + else if (unformat (i, "filter")) + { + filter_mac = 1; + static_mac = 1; + } + else if (unformat (i, "bvi")) + { + bvi_mac = 1; + static_mac = 1; + } + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "count %d", &count)) ; else break; } - if (name == 0) + + if (mac_set == 0) { - errmsg ("node name required"); + errmsg ("missing mac address"); return -99; } - if (vec_len (name) >= ARRAY_LEN (mp->node_name)) + + if (bd_id_set == 0) { - errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); + errmsg ("missing bridge domain"); return -99; } - if (next == 0) + + if (is_add && sw_if_index_set == 0 && filter_mac == 0) { - errmsg ("next node required"); + errmsg ("missing interface name or sw_if_index"); return -99; } - if (vec_len (next) >= ARRAY_LEN (mp->next_name)) + + if (count > 1) { - errmsg ("next name too long, max %d", ARRAY_LEN (mp->next_name)); - return -99; + /* Turn on async mode */ + vam->async_mode = 1; + vam->async_errors = 0; + before = vat_time_now (vam); } - M (ADD_NODE_NEXT, mp); - clib_memcpy (mp->node_name, name, vec_len (name)); - clib_memcpy (mp->next_name, next, vec_len (next)); - vec_free (name); - vec_free (next); + for (j = 0; j < count; j++) + { + M (L2FIB_ADD_DEL, mp); + + clib_memcpy (mp->mac, mac, 6); + mp->bd_id = ntohl (bd_id); + mp->is_add = is_add; + mp->sw_if_index = ntohl (sw_if_index); + + if (is_add) + { + mp->static_mac = static_mac; + mp->filter_mac = filter_mac; + mp->bvi_mac = bvi_mac; + } + increment_mac_address (mac); + /* send it... */ + S (mp); + } + + if (count > 1) + { + vl_api_control_ping_t *mp_ping; + f64 after; + + /* Shut off async mode */ + vam->async_mode = 0; + + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + timeout = vat_time_now (vam) + 1.0; + while (vat_time_now (vam) < timeout) + if (vam->result_ready == 1) + goto out; + vam->retval = -99; + + out: + if (vam->retval == -99) + errmsg ("timeout"); + + if (vam->async_errors > 0) + { + errmsg ("%d asynchronous errors", vam->async_errors); + vam->retval = -98; + } + vam->async_errors = 0; + after = vat_time_now (vam); + + print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec", + count, after - before, count / (after - before)); + } + else + { + int ret; - S (mp); - W (ret); - return ret; + /* Wait for a reply... */ + W (ret); + return ret; + } + /* Return the good/bad news */ + return (vam->retval); } static int -api_l2tpv3_create_tunnel (vat_main_t * vam) +api_bridge_domain_set_mac_age (vat_main_t * vam) { unformat_input_t *i = vam->input; - ip6_address_t client_address, our_address; - int client_address_set = 0; - int our_address_set = 0; - u32 local_session_id = 0; - u32 remote_session_id = 0; - u64 local_cookie = 0; - u64 remote_cookie = 0; - u8 l2_sublayer_present = 0; - vl_api_l2tpv3_create_tunnel_t *mp; + vl_api_bridge_domain_set_mac_age_t *mp; + u32 bd_id = ~0; + u32 mac_age = 0; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "client_address %U", unformat_ip6_address, - &client_address)) - client_address_set = 1; - else if (unformat (i, "our_address %U", unformat_ip6_address, - &our_address)) - our_address_set = 1; - else if (unformat (i, "local_session_id %d", &local_session_id)) - ; - else if (unformat (i, "remote_session_id %d", &remote_session_id)) - ; - else if (unformat (i, "local_cookie %lld", &local_cookie)) - ; - else if (unformat (i, "remote_cookie %lld", &remote_cookie)) - ; - else if (unformat (i, "l2-sublayer-present")) - l2_sublayer_present = 1; + if (unformat (i, "bd_id %d", &bd_id)); + else if (unformat (i, "mac-age %d", &mac_age)); else break; } - if (client_address_set == 0) + if (bd_id == ~0) { - errmsg ("client_address required"); + errmsg ("missing bridge domain"); return -99; } - if (our_address_set == 0) + if (mac_age > 255) { - errmsg ("our_address required"); + errmsg ("mac age must be less than 256 "); return -99; } - M (L2TPV3_CREATE_TUNNEL, mp); - - clib_memcpy (mp->client_address.un.ip6, client_address.as_u8, - sizeof (ip6_address_t)); - - clib_memcpy (mp->our_address.un.ip6, our_address.as_u8, - sizeof (ip6_address_t)); + M (BRIDGE_DOMAIN_SET_MAC_AGE, mp); - mp->local_session_id = ntohl (local_session_id); - mp->remote_session_id = ntohl (remote_session_id); - mp->local_cookie = clib_host_to_net_u64 (local_cookie); - mp->remote_cookie = clib_host_to_net_u64 (remote_cookie); - mp->l2_sublayer_present = l2_sublayer_present; + mp->bd_id = htonl (bd_id); + mp->mac_age = (u8) mac_age; S (mp); W (ret); @@ -11108,26 +4997,46 @@ api_l2tpv3_create_tunnel (vat_main_t * vam) } static int -api_l2tpv3_set_tunnel_cookies (vat_main_t * vam) +api_l2_flags (vat_main_t * vam) { unformat_input_t *i = vam->input; + vl_api_l2_flags_t *mp; u32 sw_if_index; + u32 flags = 0; u8 sw_if_index_set = 0; - u64 new_local_cookie = 0; - u64 new_remote_cookie = 0; - vl_api_l2tpv3_set_tunnel_cookies_t *mp; + u8 is_set = 0; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) + if (unformat (i, "sw_if_index %d", &sw_if_index)) sw_if_index_set = 1; - else if (unformat (i, "new_local_cookie %lld", &new_local_cookie)) - ; - else if (unformat (i, "new_remote_cookie %lld", &new_remote_cookie)) - ; + else if (unformat (i, "sw_if")) + { + if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat + (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + } + else + break; + } + else if (unformat (i, "learn")) + flags |= L2_LEARN; + else if (unformat (i, "forward")) + flags |= L2_FWD; + else if (unformat (i, "flood")) + flags |= L2_FLOOD; + else if (unformat (i, "uu-flood")) + flags |= L2_UU_FLOOD; + else if (unformat (i, "arp-term")) + flags |= L2_ARP_TERM; + else if (unformat (i, "off")) + is_set = 0; + else if (unformat (i, "disable")) + is_set = 0; else break; } @@ -11138,11 +5047,11 @@ api_l2tpv3_set_tunnel_cookies (vat_main_t * vam) return -99; } - M (L2TPV3_SET_TUNNEL_COOKIES, mp); + M (L2_FLAGS, mp); mp->sw_if_index = ntohl (sw_if_index); - mp->new_local_cookie = clib_host_to_net_u64 (new_local_cookie); - mp->new_remote_cookie = clib_host_to_net_u64 (new_remote_cookie); + mp->feature_bitmap = ntohl (flags); + mp->is_set = is_set; S (mp); W (ret); @@ -11150,39 +5059,50 @@ api_l2tpv3_set_tunnel_cookies (vat_main_t * vam) } static int -api_l2tpv3_interface_enable_disable (vat_main_t * vam) +api_bridge_flags (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_l2tpv3_interface_enable_disable_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u8 enable_disable = 1; + vl_api_bridge_flags_t *mp; + u32 bd_id; + u8 bd_id_set = 0; + u8 is_set = 1; + bd_flags_t flags = 0; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "enable")) - enable_disable = 1; + if (unformat (i, "bd_id %d", &bd_id)) + bd_id_set = 1; + else if (unformat (i, "learn")) + flags |= BRIDGE_API_FLAG_LEARN; + else if (unformat (i, "forward")) + flags |= BRIDGE_API_FLAG_FWD; + else if (unformat (i, "flood")) + flags |= BRIDGE_API_FLAG_FLOOD; + else if (unformat (i, "uu-flood")) + flags |= BRIDGE_API_FLAG_UU_FLOOD; + else if (unformat (i, "arp-term")) + flags |= BRIDGE_API_FLAG_ARP_TERM; + else if (unformat (i, "off")) + is_set = 0; else if (unformat (i, "disable")) - enable_disable = 0; + is_set = 0; else break; } - if (sw_if_index_set == 0) + if (bd_id_set == 0) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("missing bridge domain"); return -99; } - M (L2TPV3_INTERFACE_ENABLE_DISABLE, mp); + M (BRIDGE_FLAGS, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->enable_disable = enable_disable; + mp->bd_id = ntohl (bd_id); + mp->flags = ntohl (flags); + mp->is_set = is_set; S (mp); W (ret); @@ -11190,148 +5110,118 @@ api_l2tpv3_interface_enable_disable (vat_main_t * vam) } static int -api_l2tpv3_set_lookup_key (vat_main_t * vam) +api_bd_ip_mac_add_del (vat_main_t * vam) { + vl_api_address_t ip = VL_API_ZERO_ADDRESS; + vl_api_mac_address_t mac = { 0 }; unformat_input_t *i = vam->input; - vl_api_l2tpv3_set_lookup_key_t *mp; - u8 key = ~0; + vl_api_bd_ip_mac_add_del_t *mp; + u32 bd_id; + u8 is_add = 1; + u8 bd_id_set = 0; + u8 ip_set = 0; + u8 mac_set = 0; int ret; + + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "lookup_v6_src")) - key = L2T_LOOKUP_SRC_ADDRESS; - else if (unformat (i, "lookup_v6_dst")) - key = L2T_LOOKUP_DST_ADDRESS; - else if (unformat (i, "lookup_session_id")) - key = L2T_LOOKUP_SESSION_ID; + if (unformat (i, "bd_id %d", &bd_id)) + { + bd_id_set++; + } + else if (unformat (i, "%U", unformat_vl_api_address, &ip)) + { + ip_set++; + } + else if (unformat (i, "%U", unformat_vl_api_mac_address, &mac)) + { + mac_set++; + } + else if (unformat (i, "del")) + is_add = 0; else break; } - if (key == (u8) ~ 0) + if (bd_id_set == 0) + { + errmsg ("missing bridge domain"); + return -99; + } + else if (ip_set == 0) + { + errmsg ("missing IP address"); + return -99; + } + else if (mac_set == 0) { - errmsg ("l2tp session lookup key unset"); + errmsg ("missing MAC address"); return -99; } - M (L2TPV3_SET_LOOKUP_KEY, mp); + M (BD_IP_MAC_ADD_DEL, mp); + + mp->entry.bd_id = ntohl (bd_id); + mp->is_add = is_add; - mp->key = key; + clib_memcpy (&mp->entry.ip, &ip, sizeof (ip)); + clib_memcpy (&mp->entry.mac, &mac, sizeof (mac)); S (mp); W (ret); return ret; } -static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler - (vl_api_sw_if_l2tpv3_tunnel_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "* %U (our) %U (client) (sw_if_index %d)", - format_ip6_address, mp->our_address, - format_ip6_address, mp->client_address, - clib_net_to_host_u32 (mp->sw_if_index)); - - print (vam->ofp, - " local cookies %016llx %016llx remote cookie %016llx", - clib_net_to_host_u64 (mp->local_cookie[0]), - clib_net_to_host_u64 (mp->local_cookie[1]), - clib_net_to_host_u64 (mp->remote_cookie)); - - print (vam->ofp, " local session-id %d remote session-id %d", - clib_net_to_host_u32 (mp->local_session_id), - clib_net_to_host_u32 (mp->remote_session_id)); - - print (vam->ofp, " l2 specific sublayer %s\n", - mp->l2_sublayer_present ? "preset" : "absent"); - -} - -static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler_json - (vl_api_sw_if_l2tpv3_tunnel_details_t * mp) +static int +api_bd_ip_mac_flush (vat_main_t * vam) { - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - struct in6_addr addr; + unformat_input_t *i = vam->input; + vl_api_bd_ip_mac_flush_t *mp; + u32 bd_id; + u8 bd_id_set = 0; + int ret; - if (VAT_JSON_ARRAY != vam->json_tree.type) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + if (unformat (i, "bd_id %d", &bd_id)) + { + bd_id_set++; + } + else + break; } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - - clib_memcpy (&addr, mp->our_address.un.ip6, sizeof (addr)); - vat_json_object_add_ip6 (node, "our_address", addr); - clib_memcpy (&addr, mp->client_address.un.ip6, sizeof (addr)); - vat_json_object_add_ip6 (node, "client_address", addr); - vat_json_node_t *lc = vat_json_object_add (node, "local_cookie"); - vat_json_init_array (lc); - vat_json_array_add_uint (lc, clib_net_to_host_u64 (mp->local_cookie[0])); - vat_json_array_add_uint (lc, clib_net_to_host_u64 (mp->local_cookie[1])); - vat_json_object_add_uint (node, "remote_cookie", - clib_net_to_host_u64 (mp->remote_cookie)); + if (bd_id_set == 0) + { + errmsg ("missing bridge domain"); + return -99; + } - printf ("local id: %u", clib_net_to_host_u32 (mp->local_session_id)); - vat_json_object_add_uint (node, "local_session_id", - clib_net_to_host_u32 (mp->local_session_id)); - vat_json_object_add_uint (node, "remote_session_id", - clib_net_to_host_u32 (mp->remote_session_id)); - vat_json_object_add_string_copy (node, "l2_sublayer", - mp->l2_sublayer_present ? (u8 *) "present" - : (u8 *) "absent"); -} + M (BD_IP_MAC_FLUSH, mp); -static int -api_sw_if_l2tpv3_tunnel_dump (vat_main_t * vam) -{ - vl_api_sw_if_l2tpv3_tunnel_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; + mp->bd_id = ntohl (bd_id); - /* Get list of l2tpv3-tunnel interfaces */ - M (SW_IF_L2TPV3_TUNNEL_DUMP, mp); S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - W (ret); return ret; } - -static void vl_api_sw_interface_tap_v2_details_t_handler - (vl_api_sw_interface_tap_v2_details_t * mp) +static void vl_api_bd_ip_mac_details_t_handler + (vl_api_bd_ip_mac_details_t * mp) { vat_main_t *vam = &vat_main; - u8 *ip4 = - format (0, "%U/%d", format_ip4_address, mp->host_ip4_prefix.address, - mp->host_ip4_prefix.len); - u8 *ip6 = - format (0, "%U/%d", format_ip6_address, mp->host_ip6_prefix.address, - mp->host_ip6_prefix.len); - print (vam->ofp, - "\n%-16s %-12d %-5d %-12d %-12d %-14U %-30s %-20s %-20s %-30s 0x%-08x", - mp->dev_name, ntohl (mp->sw_if_index), ntohl (mp->id), - ntohs (mp->rx_ring_sz), ntohs (mp->tx_ring_sz), - format_ethernet_address, mp->host_mac_addr, mp->host_namespace, - mp->host_bridge, ip4, ip6, ntohl (mp->tap_flags)); - - vec_free (ip4); - vec_free (ip6); + "\n%-5d %U %U", + ntohl (mp->entry.bd_id), + format_vl_api_mac_address, mp->entry.mac, + format_vl_api_address, &mp->entry.ip); } -static void vl_api_sw_interface_tap_v2_details_t_handler_json - (vl_api_sw_interface_tap_v2_details_t * mp) +static void vl_api_bd_ip_mac_details_t_handler_json + (vl_api_bd_ip_mac_details_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t *node = NULL; @@ -11339,49 +5229,54 @@ static void vl_api_sw_interface_tap_v2_details_t_handler_json if (VAT_JSON_ARRAY != vam->json_tree.type) { ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_uint (node, "id", ntohl (mp->id)); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_uint (node, "tap_flags", ntohl (mp->tap_flags)); - vat_json_object_add_string_copy (node, "dev_name", mp->dev_name); - vat_json_object_add_uint (node, "rx_ring_sz", ntohs (mp->rx_ring_sz)); - vat_json_object_add_uint (node, "tx_ring_sz", ntohs (mp->tx_ring_sz)); - vat_json_object_add_string_copy (node, "host_mac_addr", - format (0, "%U", format_ethernet_address, - &mp->host_mac_addr)); - vat_json_object_add_string_copy (node, "host_namespace", - mp->host_namespace); - vat_json_object_add_string_copy (node, "host_bridge", mp->host_bridge); - vat_json_object_add_string_copy (node, "host_ip4_addr", - format (0, "%U/%d", format_ip4_address, - mp->host_ip4_prefix.address, - mp->host_ip4_prefix.len)); - vat_json_object_add_string_copy (node, "host_ip6_prefix", - format (0, "%U/%d", format_ip6_address, - mp->host_ip6_prefix.address, - mp->host_ip6_prefix.len)); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "bd_id", ntohl (mp->entry.bd_id)); + vat_json_object_add_string_copy (node, "mac_address", + format (0, "%U", format_vl_api_mac_address, + &mp->entry.mac)); + u8 *ip = 0; + ip = format (0, "%U", format_vl_api_address, &mp->entry.ip); + vat_json_object_add_string_copy (node, "ip_address", ip); + vec_free (ip); } static int -api_sw_interface_tap_v2_dump (vat_main_t * vam) +api_bd_ip_mac_dump (vat_main_t * vam) { - vl_api_sw_interface_tap_v2_dump_t *mp; + unformat_input_t *i = vam->input; + vl_api_bd_ip_mac_dump_t *mp; vl_api_control_ping_t *mp_ping; int ret; + u32 bd_id; + u8 bd_id_set = 0; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "bd_id %d", &bd_id)) + { + bd_id_set++; + } + else + break; + } print (vam->ofp, - "\n%-16s %-12s %-5s %-12s %-12s %-14s %-30s %-20s %-20s %-30s", - "dev_name", "sw_if_index", "id", "rx_ring_sz", "tx_ring_sz", - "host_mac_addr", "host_namespace", "host_bridge", "host_ip4_addr", - "host_ip6_addr"); + "\n%-5s %-7s %-20s %-30s", + "bd_id", "is_ipv6", "mac_address", "ip_address"); + + /* Dump Bridge Domain Ip to Mac entries */ + M (BD_IP_MAC_DUMP, mp); + + if (bd_id_set) + mp->bd_id = htonl (bd_id); + else + mp->bd_id = ~0; - /* Get list of tap interfaces */ - M (SW_INTERFACE_TAP_V2_DUMP, mp); S (mp); /* Use a control ping for synchronization */ @@ -11392,912 +5287,1289 @@ api_sw_interface_tap_v2_dump (vat_main_t * vam) return ret; } -static void vl_api_sw_interface_virtio_pci_details_t_handler - (vl_api_sw_interface_virtio_pci_details_t * mp) +static int +api_tap_create_v2 (vat_main_t * vam) { - vat_main_t *vam = &vat_main; + unformat_input_t *i = vam->input; + vl_api_tap_create_v2_t *mp; + u8 mac_address[6]; + u8 random_mac = 1; + u32 id = ~0; + u32 num_rx_queues = 0; + u8 *host_if_name = 0; + u8 host_if_name_set = 0; + u8 *host_ns = 0; + u8 host_ns_set = 0; + u8 host_mac_addr[6]; + u8 host_mac_addr_set = 0; + u8 *host_bridge = 0; + u8 host_bridge_set = 0; + u8 host_ip4_prefix_set = 0; + u8 host_ip6_prefix_set = 0; + ip4_address_t host_ip4_addr; + ip4_address_t host_ip4_gw; + u8 host_ip4_gw_set = 0; + u32 host_ip4_prefix_len = 0; + ip6_address_t host_ip6_addr; + ip6_address_t host_ip6_gw; + u8 host_ip6_gw_set = 0; + u32 host_ip6_prefix_len = 0; + u32 host_mtu_size = 0; + u8 host_mtu_set = 0; + u32 tap_flags = 0; + int ret; + u32 rx_ring_sz = 0, tx_ring_sz = 0; - typedef union - { - struct - { - u16 domain; - u8 bus; - u8 slot:5; - u8 function:3; - }; - u32 as_u32; - } pci_addr_t; - pci_addr_t addr; + clib_memset (mac_address, 0, sizeof (mac_address)); - addr.domain = ntohs (mp->pci_addr.domain); - addr.bus = mp->pci_addr.bus; - addr.slot = mp->pci_addr.slot; - addr.function = mp->pci_addr.function; + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "id %u", &id)) + ; + else + if (unformat + (i, "hw-addr %U", unformat_ethernet_address, mac_address)) + random_mac = 0; + else if (unformat (i, "host-if-name %s", &host_if_name)) + host_if_name_set = 1; + else if (unformat (i, "num-rx-queues %u", &num_rx_queues)) + ; + else if (unformat (i, "host-ns %s", &host_ns)) + host_ns_set = 1; + else if (unformat (i, "host-mac-addr %U", unformat_ethernet_address, + host_mac_addr)) + host_mac_addr_set = 1; + else if (unformat (i, "host-bridge %s", &host_bridge)) + host_bridge_set = 1; + else if (unformat (i, "host-ip4-addr %U/%u", unformat_ip4_address, + &host_ip4_addr, &host_ip4_prefix_len)) + host_ip4_prefix_set = 1; + else if (unformat (i, "host-ip6-addr %U/%u", unformat_ip6_address, + &host_ip6_addr, &host_ip6_prefix_len)) + host_ip6_prefix_set = 1; + else if (unformat (i, "host-ip4-gw %U", unformat_ip4_address, + &host_ip4_gw)) + host_ip4_gw_set = 1; + else if (unformat (i, "host-ip6-gw %U", unformat_ip6_address, + &host_ip6_gw)) + host_ip6_gw_set = 1; + else if (unformat (i, "rx-ring-size %u", &rx_ring_sz)) + ; + else if (unformat (i, "tx-ring-size %u", &tx_ring_sz)) + ; + else if (unformat (i, "host-mtu-size %u", &host_mtu_size)) + host_mtu_set = 1; + else if (unformat (i, "no-gso")) + tap_flags &= ~TAP_API_FLAG_GSO; + else if (unformat (i, "gso")) + tap_flags |= TAP_API_FLAG_GSO; + else if (unformat (i, "csum-offload")) + tap_flags |= TAP_API_FLAG_CSUM_OFFLOAD; + else if (unformat (i, "persist")) + tap_flags |= TAP_API_FLAG_PERSIST; + else if (unformat (i, "attach")) + tap_flags |= TAP_API_FLAG_ATTACH; + else if (unformat (i, "tun")) + tap_flags |= TAP_API_FLAG_TUN; + else if (unformat (i, "gro-coalesce")) + tap_flags |= TAP_API_FLAG_GRO_COALESCE; + else if (unformat (i, "packed")) + tap_flags |= TAP_API_FLAG_PACKED; + else if (unformat (i, "in-order")) + tap_flags |= TAP_API_FLAG_IN_ORDER; + else + break; + } - u8 *pci_addr = format (0, "%04x:%02x:%02x.%x", addr.domain, addr.bus, - addr.slot, addr.function); + if (vec_len (host_if_name) > 63) + { + errmsg ("tap name too long. "); + return -99; + } + if (vec_len (host_ns) > 63) + { + errmsg ("host name space too long. "); + return -99; + } + if (vec_len (host_bridge) > 63) + { + errmsg ("host bridge name too long. "); + return -99; + } + if (host_ip4_prefix_len > 32) + { + errmsg ("host ip4 prefix length not valid. "); + return -99; + } + if (host_ip6_prefix_len > 128) + { + errmsg ("host ip6 prefix length not valid. "); + return -99; + } + if (!is_pow2 (rx_ring_sz)) + { + errmsg ("rx ring size must be power of 2. "); + return -99; + } + if (rx_ring_sz > 32768) + { + errmsg ("rx ring size must be 32768 or lower. "); + return -99; + } + if (!is_pow2 (tx_ring_sz)) + { + errmsg ("tx ring size must be power of 2. "); + return -99; + } + if (tx_ring_sz > 32768) + { + errmsg ("tx ring size must be 32768 or lower. "); + return -99; + } + if (host_mtu_set && (host_mtu_size < 64 || host_mtu_size > 65355)) + { + errmsg ("host MTU size must be in between 64 and 65355. "); + return -99; + } - print (vam->ofp, - "\n%-12s %-12d %-12d %-12d %-17U 0x%-08llx", - pci_addr, ntohl (mp->sw_if_index), - ntohs (mp->rx_ring_sz), ntohs (mp->tx_ring_sz), - format_ethernet_address, mp->mac_addr, - clib_net_to_host_u64 (mp->features)); - vec_free (pci_addr); -} + /* Construct the API message */ + M (TAP_CREATE_V2, mp); -static void vl_api_sw_interface_virtio_pci_details_t_handler_json - (vl_api_sw_interface_virtio_pci_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - vlib_pci_addr_t pci_addr; + mp->id = ntohl (id); + mp->use_random_mac = random_mac; + mp->num_rx_queues = (u8) num_rx_queues; + mp->tx_ring_sz = ntohs (tx_ring_sz); + mp->rx_ring_sz = ntohs (rx_ring_sz); + mp->host_mtu_set = host_mtu_set; + mp->host_mtu_size = ntohl (host_mtu_size); + mp->host_mac_addr_set = host_mac_addr_set; + mp->host_ip4_prefix_set = host_ip4_prefix_set; + mp->host_ip6_prefix_set = host_ip6_prefix_set; + mp->host_ip4_gw_set = host_ip4_gw_set; + mp->host_ip6_gw_set = host_ip6_gw_set; + mp->tap_flags = ntohl (tap_flags); + mp->host_namespace_set = host_ns_set; + mp->host_if_name_set = host_if_name_set; + mp->host_bridge_set = host_bridge_set; - if (VAT_JSON_ARRAY != vam->json_tree.type) + if (random_mac == 0) + clib_memcpy (mp->mac_address, mac_address, 6); + if (host_mac_addr_set) + clib_memcpy (mp->host_mac_addr, host_mac_addr, 6); + if (host_if_name_set) + clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name)); + if (host_ns_set) + clib_memcpy (mp->host_namespace, host_ns, vec_len (host_ns)); + if (host_bridge_set) + clib_memcpy (mp->host_bridge, host_bridge, vec_len (host_bridge)); + if (host_ip4_prefix_set) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + clib_memcpy (mp->host_ip4_prefix.address, &host_ip4_addr, 4); + mp->host_ip4_prefix.len = (u8) host_ip4_prefix_len; } - node = vat_json_array_add (&vam->json_tree); + if (host_ip6_prefix_set) + { + clib_memcpy (mp->host_ip6_prefix.address, &host_ip6_addr, 16); + mp->host_ip6_prefix.len = (u8) host_ip6_prefix_len; + } + if (host_ip4_gw_set) + clib_memcpy (mp->host_ip4_gw, &host_ip4_gw, 4); + if (host_ip6_gw_set) + clib_memcpy (mp->host_ip6_gw, &host_ip6_gw, 16); - pci_addr.domain = ntohs (mp->pci_addr.domain); - pci_addr.bus = mp->pci_addr.bus; - pci_addr.slot = mp->pci_addr.slot; - pci_addr.function = mp->pci_addr.function; + vec_free (host_ns); + vec_free (host_if_name); + vec_free (host_bridge); - vat_json_init_object (node); - vat_json_object_add_uint (node, "pci-addr", pci_addr.as_u32); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_uint (node, "rx_ring_sz", ntohs (mp->rx_ring_sz)); - vat_json_object_add_uint (node, "tx_ring_sz", ntohs (mp->tx_ring_sz)); - vat_json_object_add_uint (node, "features", - clib_net_to_host_u64 (mp->features)); - vat_json_object_add_string_copy (node, "mac_addr", - format (0, "%U", format_ethernet_address, - &mp->mac_addr)); + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; } static int -api_sw_interface_virtio_pci_dump (vat_main_t * vam) +api_tap_delete_v2 (vat_main_t * vam) { - vl_api_sw_interface_virtio_pci_dump_t *mp; - vl_api_control_ping_t *mp_ping; + unformat_input_t *i = vam->input; + vl_api_tap_delete_v2_t *mp; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; int ret; - print (vam->ofp, - "\n%-12s %-12s %-12s %-12s %-17s %-08s", - "pci_addr", "sw_if_index", "rx_ring_sz", "tx_ring_sz", - "mac_addr", "features"); + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; + } + + if (sw_if_index_set == 0) + { + errmsg ("missing vpp interface name. "); + return -99; + } + + /* Construct the API message */ + M (TAP_DELETE_V2, mp); - /* Get list of tap interfaces */ - M (SW_INTERFACE_VIRTIO_PCI_DUMP, mp); - S (mp); + mp->sw_if_index = ntohl (sw_if_index); - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + /* send it... */ + S (mp); + /* Wait for a reply... */ W (ret); return ret; } +uword +unformat_vlib_pci_addr (unformat_input_t * input, va_list * args) +{ + vlib_pci_addr_t *addr = va_arg (*args, vlib_pci_addr_t *); + u32 x[4]; + + if (!unformat (input, "%x:%x:%x.%x", &x[0], &x[1], &x[2], &x[3])) + return 0; + + addr->domain = x[0]; + addr->bus = x[1]; + addr->slot = x[2]; + addr->function = x[3]; + + return 1; +} + static int -api_vxlan_offload_rx (vat_main_t * vam) +api_virtio_pci_create_v2 (vat_main_t * vam) { - unformat_input_t *line_input = vam->input; - vl_api_vxlan_offload_rx_t *mp; - u32 hw_if_index = ~0, rx_if_index = ~0; - u8 is_add = 1; + unformat_input_t *i = vam->input; + vl_api_virtio_pci_create_v2_t *mp; + u8 mac_address[6]; + u8 random_mac = 1; + u32 pci_addr = 0; + u64 features = (u64) ~ (0ULL); + u32 virtio_flags = 0; int ret; - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + clib_memset (mac_address, 0, sizeof (mac_address)); + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "del")) - is_add = 0; - else if (unformat (line_input, "hw %U", api_unformat_hw_if_index, vam, - &hw_if_index)) - ; - else if (unformat (line_input, "hw hw_if_index %u", &hw_if_index)) - ; - else if (unformat (line_input, "rx %U", api_unformat_sw_if_index, vam, - &rx_if_index)) + if (unformat (i, "hw-addr %U", unformat_ethernet_address, mac_address)) + { + random_mac = 0; + } + else if (unformat (i, "pci-addr %U", unformat_vlib_pci_addr, &pci_addr)) ; - else if (unformat (line_input, "rx sw_if_index %u", &rx_if_index)) + else if (unformat (i, "features 0x%llx", &features)) ; + else if (unformat (i, "gso-enabled")) + virtio_flags |= VIRTIO_API_FLAG_GSO; + else if (unformat (i, "csum-offload-enabled")) + virtio_flags |= VIRTIO_API_FLAG_CSUM_OFFLOAD; + else if (unformat (i, "gro-coalesce")) + virtio_flags |= VIRTIO_API_FLAG_GRO_COALESCE; + else if (unformat (i, "packed")) + virtio_flags |= VIRTIO_API_FLAG_PACKED; + else if (unformat (i, "in-order")) + virtio_flags |= VIRTIO_API_FLAG_IN_ORDER; + else if (unformat (i, "buffering")) + virtio_flags |= VIRTIO_API_FLAG_BUFFERING; else - { - errmsg ("parse error '%U'", format_unformat_error, line_input); - return -99; - } + break; } - if (hw_if_index == ~0) + if (pci_addr == 0) { - errmsg ("no hw interface"); + errmsg ("pci address must be non zero. "); return -99; } - if (rx_if_index == ~0) - { - errmsg ("no rx tunnel"); - return -99; - } + /* Construct the API message */ + M (VIRTIO_PCI_CREATE_V2, mp); - M (VXLAN_OFFLOAD_RX, mp); + mp->use_random_mac = random_mac; - mp->hw_if_index = ntohl (hw_if_index); - mp->sw_if_index = ntohl (rx_if_index); - mp->enable = is_add; + mp->pci_addr.domain = htons (((vlib_pci_addr_t) pci_addr).domain); + mp->pci_addr.bus = ((vlib_pci_addr_t) pci_addr).bus; + mp->pci_addr.slot = ((vlib_pci_addr_t) pci_addr).slot; + mp->pci_addr.function = ((vlib_pci_addr_t) pci_addr).function; + + mp->features = clib_host_to_net_u64 (features); + mp->virtio_flags = clib_host_to_net_u32 (virtio_flags); + if (random_mac == 0) + clib_memcpy (mp->mac_address, mac_address, 6); + + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; } -static uword unformat_vxlan_decap_next - (unformat_input_t * input, va_list * args) +static int +api_virtio_pci_delete (vat_main_t * vam) { - u32 *result = va_arg (*args, u32 *); - u32 tmp; + unformat_input_t *i = vam->input; + vl_api_virtio_pci_delete_t *mp; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; + int ret; - if (unformat (input, "l2")) - *result = VXLAN_INPUT_NEXT_L2_INPUT; - else if (unformat (input, "%d", &tmp)) - *result = tmp; - else - return 0; - return 1; + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; + } + + if (sw_if_index_set == 0) + { + errmsg ("missing vpp interface name. "); + return -99; + } + + /* Construct the API message */ + M (VIRTIO_PCI_DELETE, mp); + + mp->sw_if_index = htonl (sw_if_index); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; } static int -api_vxlan_add_del_tunnel (vat_main_t * vam) +api_bond_create (vat_main_t * vam) { - unformat_input_t *line_input = vam->input; - vl_api_vxlan_add_del_tunnel_t *mp; - ip46_address_t src, dst; - u8 is_add = 1; - u8 ipv4_set = 0, ipv6_set = 0; - u8 src_set = 0; - u8 dst_set = 0; - u8 grp_set = 0; - u32 instance = ~0; - u32 mcast_sw_if_index = ~0; - u32 encap_vrf_id = 0; - u32 decap_next_index = ~0; - u32 vni = 0; + unformat_input_t *i = vam->input; + vl_api_bond_create_t *mp; + u8 mac_address[6]; + u8 custom_mac = 0; int ret; + u8 mode; + u8 lb; + u8 mode_is_set = 0; + u32 id = ~0; + u8 numa_only = 0; - /* Can't "universally zero init" (={0}) due to GCC bug 53119 */ - clib_memset (&src, 0, sizeof src); - clib_memset (&dst, 0, sizeof dst); + clib_memset (mac_address, 0, sizeof (mac_address)); + lb = BOND_LB_L2; - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "del")) - is_add = 0; - else if (unformat (line_input, "instance %d", &instance)) - ; - else - if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4)) - { - ipv4_set = 1; - src_set = 1; - } - else - if (unformat (line_input, "dst %U", unformat_ip4_address, &dst.ip4)) - { - ipv4_set = 1; - dst_set = 1; - } - else - if (unformat (line_input, "src %U", unformat_ip6_address, &src.ip6)) - { - ipv6_set = 1; - src_set = 1; - } - else - if (unformat (line_input, "dst %U", unformat_ip6_address, &dst.ip6)) - { - ipv6_set = 1; - dst_set = 1; - } - else if (unformat (line_input, "group %U %U", - unformat_ip4_address, &dst.ip4, - api_unformat_sw_if_index, vam, &mcast_sw_if_index)) - { - grp_set = dst_set = 1; - ipv4_set = 1; - } - else if (unformat (line_input, "group %U", - unformat_ip4_address, &dst.ip4)) - { - grp_set = dst_set = 1; - ipv4_set = 1; - } - else if (unformat (line_input, "group %U %U", - unformat_ip6_address, &dst.ip6, - api_unformat_sw_if_index, vam, &mcast_sw_if_index)) - { - grp_set = dst_set = 1; - ipv6_set = 1; - } - else if (unformat (line_input, "group %U", - unformat_ip6_address, &dst.ip6)) - { - grp_set = dst_set = 1; - ipv6_set = 1; - } - else - if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index)) - ; - else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) - ; - else if (unformat (line_input, "decap-next %U", - unformat_vxlan_decap_next, &decap_next_index)) + if (unformat (i, "mode %U", unformat_bond_mode, &mode)) + mode_is_set = 1; + else if (((mode == BOND_MODE_LACP) || (mode == BOND_MODE_XOR)) + && unformat (i, "lb %U", unformat_bond_load_balance, &lb)) ; - else if (unformat (line_input, "vni %d", &vni)) + else if (unformat (i, "hw-addr %U", unformat_ethernet_address, + mac_address)) + custom_mac = 1; + else if (unformat (i, "numa-only")) + numa_only = 1; + else if (unformat (i, "id %u", &id)) ; else - { - errmsg ("parse error '%U'", format_unformat_error, line_input); - return -99; - } + break; } - if (src_set == 0) + if (mode_is_set == 0) { - errmsg ("tunnel src address not specified"); + errmsg ("Missing bond mode. "); return -99; } - if (dst_set == 0) + + /* Construct the API message */ + M (BOND_CREATE, mp); + + mp->use_custom_mac = custom_mac; + + mp->mode = htonl (mode); + mp->lb = htonl (lb); + mp->id = htonl (id); + mp->numa_only = numa_only; + + if (custom_mac) + clib_memcpy (mp->mac_address, mac_address, 6); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_bond_create2 (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_bond_create2_t *mp; + u8 mac_address[6]; + u8 custom_mac = 0; + int ret; + u8 mode; + u8 lb; + u8 mode_is_set = 0; + u32 id = ~0; + u8 numa_only = 0; + u8 gso = 0; + + clib_memset (mac_address, 0, sizeof (mac_address)); + lb = BOND_LB_L2; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - errmsg ("tunnel dst address not specified"); - return -99; + if (unformat (i, "mode %U", unformat_bond_mode, &mode)) + mode_is_set = 1; + else if (((mode == BOND_MODE_LACP) || (mode == BOND_MODE_XOR)) + && unformat (i, "lb %U", unformat_bond_load_balance, &lb)) + ; + else if (unformat (i, "hw-addr %U", unformat_ethernet_address, + mac_address)) + custom_mac = 1; + else if (unformat (i, "numa-only")) + numa_only = 1; + else if (unformat (i, "gso")) + gso = 1; + else if (unformat (i, "id %u", &id)) + ; + else + break; } - if (grp_set && !ip46_address_is_multicast (&dst)) + if (mode_is_set == 0) { - errmsg ("tunnel group address not multicast"); + errmsg ("Missing bond mode. "); return -99; } - if (grp_set && mcast_sw_if_index == ~0) + + /* Construct the API message */ + M (BOND_CREATE2, mp); + + mp->use_custom_mac = custom_mac; + + mp->mode = htonl (mode); + mp->lb = htonl (lb); + mp->id = htonl (id); + mp->numa_only = numa_only; + mp->enable_gso = gso; + + if (custom_mac) + clib_memcpy (mp->mac_address, mac_address, 6); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_bond_delete (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_bond_delete_t *mp; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - errmsg ("tunnel nonexistent multicast device"); - return -99; + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; } - if (grp_set == 0 && ip46_address_is_multicast (&dst)) + + if (sw_if_index_set == 0) { - errmsg ("tunnel dst address must be unicast"); + errmsg ("missing vpp interface name. "); return -99; } + /* Construct the API message */ + M (BOND_DELETE, mp); - if (ipv4_set && ipv6_set) - { - errmsg ("both IPv4 and IPv6 addresses specified"); - return -99; - } + mp->sw_if_index = ntohl (sw_if_index); - if ((vni == 0) || (vni >> 24)) + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_bond_add_member (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_bond_add_member_t *mp; + u32 bond_sw_if_index; + int ret; + u8 is_passive; + u8 is_long_timeout; + u32 bond_sw_if_index_is_set = 0; + u32 sw_if_index; + u8 sw_if_index_is_set = 0; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - errmsg ("vni not specified or out of range"); - return -99; + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_is_set = 1; + else if (unformat (i, "bond %u", &bond_sw_if_index)) + bond_sw_if_index_is_set = 1; + else if (unformat (i, "passive %d", &is_passive)) + ; + else if (unformat (i, "long-timeout %d", &is_long_timeout)) + ; + else + break; } - M (VXLAN_ADD_DEL_TUNNEL, mp); - - if (ipv6_set) + if (bond_sw_if_index_is_set == 0) { - clib_memcpy (mp->src_address, &src.ip6, sizeof (src.ip6)); - clib_memcpy (mp->dst_address, &dst.ip6, sizeof (dst.ip6)); + errmsg ("Missing bond sw_if_index. "); + return -99; } - else + if (sw_if_index_is_set == 0) { - clib_memcpy (mp->src_address, &src.ip4, sizeof (src.ip4)); - clib_memcpy (mp->dst_address, &dst.ip4, sizeof (dst.ip4)); + errmsg ("Missing member sw_if_index. "); + return -99; } - mp->instance = htonl (instance); - mp->encap_vrf_id = ntohl (encap_vrf_id); - mp->decap_next_index = ntohl (decap_next_index); - mp->mcast_sw_if_index = ntohl (mcast_sw_if_index); - mp->vni = ntohl (vni); - mp->is_add = is_add; - mp->is_ipv6 = ipv6_set; + /* Construct the API message */ + M (BOND_ADD_MEMBER, mp); + + mp->bond_sw_if_index = ntohl (bond_sw_if_index); + mp->sw_if_index = ntohl (sw_if_index); + mp->is_long_timeout = is_long_timeout; + mp->is_passive = is_passive; + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; } -static void vl_api_vxlan_tunnel_details_t_handler - (vl_api_vxlan_tunnel_details_t * mp) -{ - vat_main_t *vam = &vat_main; - ip46_address_t src = to_ip46 (mp->is_ipv6, mp->dst_address); - ip46_address_t dst = to_ip46 (mp->is_ipv6, mp->src_address); - - print (vam->ofp, "%11d%11d%24U%24U%14d%18d%13d%19d", - ntohl (mp->sw_if_index), - ntohl (mp->instance), - format_ip46_address, &src, IP46_TYPE_ANY, - format_ip46_address, &dst, IP46_TYPE_ANY, - ntohl (mp->encap_vrf_id), - ntohl (mp->decap_next_index), ntohl (mp->vni), - ntohl (mp->mcast_sw_if_index)); -} - -static void vl_api_vxlan_tunnel_details_t_handler_json - (vl_api_vxlan_tunnel_details_t * mp) +static int +api_bond_detach_member (vat_main_t * vam) { - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; + unformat_input_t *i = vam->input; + vl_api_bond_detach_member_t *mp; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; + int ret; - if (VAT_JSON_ARRAY != vam->json_tree.type) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + if (sw_if_index_set == 0) + { + errmsg ("missing vpp interface name. "); + return -99; + } - vat_json_object_add_uint (node, "instance", ntohl (mp->instance)); + /* Construct the API message */ + M (BOND_DETACH_MEMBER, mp); - if (mp->is_ipv6) - { - struct in6_addr ip6; + mp->sw_if_index = ntohl (sw_if_index); - clib_memcpy (&ip6, mp->src_address, sizeof (ip6)); - vat_json_object_add_ip6 (node, "src_address", ip6); - clib_memcpy (&ip6, mp->dst_address, sizeof (ip6)); - vat_json_object_add_ip6 (node, "dst_address", ip6); - } - else - { - struct in_addr ip4; + /* send it... */ + S (mp); - clib_memcpy (&ip4, mp->src_address, sizeof (ip4)); - vat_json_object_add_ip4 (node, "src_address", ip4); - clib_memcpy (&ip4, mp->dst_address, sizeof (ip4)); - vat_json_object_add_ip4 (node, "dst_address", ip4); - } - vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id)); - vat_json_object_add_uint (node, "decap_next_index", - ntohl (mp->decap_next_index)); - vat_json_object_add_uint (node, "vni", ntohl (mp->vni)); - vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0); - vat_json_object_add_uint (node, "mcast_sw_if_index", - ntohl (mp->mcast_sw_if_index)); + /* Wait for a reply... */ + W (ret); + return ret; } static int -api_vxlan_tunnel_dump (vat_main_t * vam) +api_ip_table_add_del (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_vxlan_tunnel_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 sw_if_index; - u8 sw_if_index_set = 0; - int ret; + unformat_input_t *i = vam->input; + vl_api_ip_table_add_del_t *mp; + u32 table_id = ~0; + u8 is_ipv6 = 0; + u8 is_add = 1; + int ret = 0; /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; + if (unformat (i, "ipv6")) + is_ipv6 = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "table %d", &table_id)) + ; else - break; - } - - if (sw_if_index_set == 0) - { - sw_if_index = ~0; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (!vam->json_output) + if (~0 == table_id) { - print (vam->ofp, "%11s%11s%24s%24s%14s%18s%13s%19s", - "sw_if_index", "instance", "src_address", "dst_address", - "encap_vrf_id", "decap_next_index", "vni", "mcast_sw_if_index"); + errmsg ("missing table-ID"); + return -99; } - /* Get list of vxlan-tunnel interfaces */ - M (VXLAN_TUNNEL_DUMP, mp); + /* Construct the API message */ + M (IP_TABLE_ADD_DEL, mp); - mp->sw_if_index = htonl (sw_if_index); + mp->table.table_id = ntohl (table_id); + mp->table.is_ip6 = is_ipv6; + mp->is_add = is_add; + /* send it... */ S (mp); - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - + /* Wait for a reply... */ W (ret); - return ret; -} - -static uword unformat_geneve_decap_next - (unformat_input_t * input, va_list * args) -{ - u32 *result = va_arg (*args, u32 *); - u32 tmp; - if (unformat (input, "l2")) - *result = GENEVE_INPUT_NEXT_L2_INPUT; - else if (unformat (input, "%d", &tmp)) - *result = tmp; - else - return 0; - return 1; + return ret; } -static int -api_geneve_add_del_tunnel (vat_main_t * vam) +uword +unformat_fib_path (unformat_input_t * input, va_list * args) { - unformat_input_t *line_input = vam->input; - vl_api_geneve_add_del_tunnel_t *mp; - ip46_address_t src, dst; - u8 is_add = 1; - u8 ipv4_set = 0, ipv6_set = 0; - u8 src_set = 0; - u8 dst_set = 0; - u8 grp_set = 0; - u32 mcast_sw_if_index = ~0; - u32 encap_vrf_id = 0; - u32 decap_next_index = ~0; - u32 vni = 0; - int ret; + vat_main_t *vam = va_arg (*args, vat_main_t *); + vl_api_fib_path_t *path = va_arg (*args, vl_api_fib_path_t *); + u32 weight, preference; + mpls_label_t out_label; - /* Can't "universally zero init" (={0}) due to GCC bug 53119 */ - clib_memset (&src, 0, sizeof src); - clib_memset (&dst, 0, sizeof dst); + clib_memset (path, 0, sizeof (*path)); + path->weight = 1; + path->sw_if_index = ~0; + path->rpf_id = ~0; + path->n_labels = 0; - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "del")) - is_add = 0; - else - if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4)) + if (unformat (input, "%U %U", + unformat_vl_api_ip4_address, + &path->nh.address.ip4, + api_unformat_sw_if_index, vam, &path->sw_if_index)) { - ipv4_set = 1; - src_set = 1; + path->proto = FIB_API_PATH_NH_PROTO_IP4; } - else - if (unformat (line_input, "dst %U", unformat_ip4_address, &dst.ip4)) + else if (unformat (input, "%U %U", + unformat_vl_api_ip6_address, + &path->nh.address.ip6, + api_unformat_sw_if_index, vam, &path->sw_if_index)) { - ipv4_set = 1; - dst_set = 1; + path->proto = FIB_API_PATH_NH_PROTO_IP6; } - else - if (unformat (line_input, "src %U", unformat_ip6_address, &src.ip6)) + else if (unformat (input, "weight %u", &weight)) { - ipv6_set = 1; - src_set = 1; + path->weight = weight; } - else - if (unformat (line_input, "dst %U", unformat_ip6_address, &dst.ip6)) + else if (unformat (input, "preference %u", &preference)) { - ipv6_set = 1; - dst_set = 1; + path->preference = preference; } - else if (unformat (line_input, "group %U %U", - unformat_ip4_address, &dst.ip4, - api_unformat_sw_if_index, vam, &mcast_sw_if_index)) + else if (unformat (input, "%U next-hop-table %d", + unformat_vl_api_ip4_address, + &path->nh.address.ip4, &path->table_id)) { - grp_set = dst_set = 1; - ipv4_set = 1; + path->proto = FIB_API_PATH_NH_PROTO_IP4; } - else if (unformat (line_input, "group %U", - unformat_ip4_address, &dst.ip4)) + else if (unformat (input, "%U next-hop-table %d", + unformat_vl_api_ip6_address, + &path->nh.address.ip6, &path->table_id)) { - grp_set = dst_set = 1; - ipv4_set = 1; + path->proto = FIB_API_PATH_NH_PROTO_IP6; } - else if (unformat (line_input, "group %U %U", - unformat_ip6_address, &dst.ip6, - api_unformat_sw_if_index, vam, &mcast_sw_if_index)) + else if (unformat (input, "%U", + unformat_vl_api_ip4_address, &path->nh.address.ip4)) { - grp_set = dst_set = 1; - ipv6_set = 1; + /* + * the recursive next-hops are by default in the default table + */ + path->table_id = 0; + path->sw_if_index = ~0; + path->proto = FIB_API_PATH_NH_PROTO_IP4; } - else if (unformat (line_input, "group %U", - unformat_ip6_address, &dst.ip6)) + else if (unformat (input, "%U", + unformat_vl_api_ip6_address, &path->nh.address.ip6)) { - grp_set = dst_set = 1; - ipv6_set = 1; + /* + * the recursive next-hops are by default in the default table + */ + path->table_id = 0; + path->sw_if_index = ~0; + path->proto = FIB_API_PATH_NH_PROTO_IP6; } - else - if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index)) + else if (unformat (input, "resolve-via-host")) + { + path->flags |= FIB_API_PATH_FLAG_RESOLVE_VIA_HOST; + } + else if (unformat (input, "resolve-via-attached")) + { + path->flags |= FIB_API_PATH_FLAG_RESOLVE_VIA_ATTACHED; + } + else if (unformat (input, "ip4-lookup-in-table %d", &path->table_id)) + { + path->type = FIB_API_PATH_TYPE_LOCAL; + path->sw_if_index = ~0; + path->proto = FIB_API_PATH_NH_PROTO_IP4; + } + else if (unformat (input, "ip6-lookup-in-table %d", &path->table_id)) + { + path->type = FIB_API_PATH_TYPE_LOCAL; + path->sw_if_index = ~0; + path->proto = FIB_API_PATH_NH_PROTO_IP6; + } + else if (unformat (input, "sw_if_index %d", &path->sw_if_index)) ; - else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) + else if (unformat (input, "via-label %d", &path->nh.via_label)) + { + path->proto = FIB_API_PATH_NH_PROTO_MPLS; + path->sw_if_index = ~0; + } + else if (unformat (input, "l2-input-on %d", &path->sw_if_index)) + { + path->proto = FIB_API_PATH_NH_PROTO_ETHERNET; + path->type = FIB_API_PATH_TYPE_INTERFACE_RX; + } + else if (unformat (input, "local")) + { + path->type = FIB_API_PATH_TYPE_LOCAL; + } + else if (unformat (input, "out-labels")) + { + while (unformat (input, "%d", &out_label)) + { + path->label_stack[path->n_labels].label = out_label; + path->label_stack[path->n_labels].is_uniform = 0; + path->label_stack[path->n_labels].ttl = 64; + path->n_labels++; + } + } + else if (unformat (input, "via")) + { + /* new path, back up and return */ + unformat_put_input (input); + unformat_put_input (input); + unformat_put_input (input); + unformat_put_input (input); + break; + } + else + { + return (0); + } + } + + path->proto = ntohl (path->proto); + path->type = ntohl (path->type); + path->flags = ntohl (path->flags); + path->table_id = ntohl (path->table_id); + path->sw_if_index = ntohl (path->sw_if_index); + + return (1); +} + +static int +api_ip_route_add_del (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_ip_route_add_del_t *mp; + u32 vrf_id = 0; + u8 is_add = 1; + u8 is_multipath = 0; + u8 prefix_set = 0; + u8 path_count = 0; + vl_api_prefix_t pfx = { }; + vl_api_fib_path_t paths[8]; + int count = 1; + int j; + f64 before = 0; + u32 random_add_del = 0; + u32 *random_vector = 0; + u32 random_seed = 0xdeaddabe; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", unformat_vl_api_prefix, &pfx)) + prefix_set = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "vrf %d", &vrf_id)) ; - else if (unformat (line_input, "decap-next %U", - unformat_geneve_decap_next, &decap_next_index)) + else if (unformat (i, "count %d", &count)) ; - else if (unformat (line_input, "vni %d", &vni)) + else if (unformat (i, "random")) + random_add_del = 1; + else if (unformat (i, "multipath")) + is_multipath = 1; + else if (unformat (i, "seed %d", &random_seed)) ; else + if (unformat + (i, "via %U", unformat_fib_path, vam, &paths[path_count])) { - errmsg ("parse error '%U'", format_unformat_error, line_input); + path_count++; + if (8 == path_count) + { + errmsg ("max 8 paths"); + return -99; + } + } + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (src_set == 0) + if (!path_count) { - errmsg ("tunnel src address not specified"); + errmsg ("specify a path; via ..."); return -99; } - if (dst_set == 0) + if (prefix_set == 0) { - errmsg ("tunnel dst address not specified"); + errmsg ("missing prefix"); return -99; } - if (grp_set && !ip46_address_is_multicast (&dst)) + /* Generate a pile of unique, random routes */ + if (random_add_del) { - errmsg ("tunnel group address not multicast"); - return -99; + ip4_address_t *i = (ip4_address_t *) & paths[0].nh.address.ip4; + u32 this_random_address; + uword *random_hash; + + random_hash = hash_create (count, sizeof (uword)); + + hash_set (random_hash, i->as_u32, 1); + for (j = 0; j <= count; j++) + { + do + { + this_random_address = random_u32 (&random_seed); + this_random_address = + clib_host_to_net_u32 (this_random_address); + } + while (hash_get (random_hash, this_random_address)); + vec_add1 (random_vector, this_random_address); + hash_set (random_hash, this_random_address, 1); + } + hash_free (random_hash); + set_ip4_address (&pfx.address, random_vector[0]); } - if (grp_set && mcast_sw_if_index == ~0) + + if (count > 1) { - errmsg ("tunnel nonexistent multicast device"); - return -99; + /* Turn on async mode */ + vam->async_mode = 1; + vam->async_errors = 0; + before = vat_time_now (vam); } - if (grp_set == 0 && ip46_address_is_multicast (&dst)) + + for (j = 0; j < count; j++) { - errmsg ("tunnel dst address must be unicast"); - return -99; - } + /* Construct the API message */ + M2 (IP_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); + mp->is_add = is_add; + mp->is_multipath = is_multipath; - if (ipv4_set && ipv6_set) - { - errmsg ("both IPv4 and IPv6 addresses specified"); - return -99; + clib_memcpy (&mp->route.prefix, &pfx, sizeof (pfx)); + mp->route.table_id = ntohl (vrf_id); + mp->route.n_paths = path_count; + + clib_memcpy (&mp->route.paths, &paths, sizeof (paths[0]) * path_count); + + if (random_add_del) + set_ip4_address (&pfx.address, random_vector[j + 1]); + else + increment_address (&pfx.address); + /* send it... */ + S (mp); + /* If we receive SIGTERM, stop now... */ + if (vam->do_exit) + break; } - if ((vni == 0) || (vni >> 24)) + /* When testing multiple add/del ops, use a control-ping to sync */ + if (count > 1) { - errmsg ("vni not specified or out of range"); - return -99; - } + vl_api_control_ping_t *mp_ping; + f64 after; + f64 timeout; - M (GENEVE_ADD_DEL_TUNNEL, mp); + /* Shut off async mode */ + vam->async_mode = 0; - if (ipv6_set) - { - clib_memcpy (&mp->local_address.un.ip6, &src.ip6, sizeof (src.ip6)); - clib_memcpy (&mp->remote_address.un.ip6, &dst.ip6, sizeof (dst.ip6)); - } - else - { - clib_memcpy (&mp->local_address.un.ip4, &src.ip4, sizeof (src.ip4)); - clib_memcpy (&mp->remote_address.un.ip4, &dst.ip4, sizeof (dst.ip4)); - } - mp->encap_vrf_id = ntohl (encap_vrf_id); - mp->decap_next_index = ntohl (decap_next_index); - mp->mcast_sw_if_index = ntohl (mcast_sw_if_index); - mp->vni = ntohl (vni); - mp->is_add = is_add; + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - S (mp); - W (ret); - return ret; -} + timeout = vat_time_now (vam) + 1.0; + while (vat_time_now (vam) < timeout) + if (vam->result_ready == 1) + goto out; + vam->retval = -99; -static void vl_api_geneve_tunnel_details_t_handler - (vl_api_geneve_tunnel_details_t * mp) -{ - vat_main_t *vam = &vat_main; - ip46_address_t src = {.as_u64[0] = 0,.as_u64[1] = 0 }; - ip46_address_t dst = {.as_u64[0] = 0,.as_u64[1] = 0 }; + out: + if (vam->retval == -99) + errmsg ("timeout"); - if (mp->src_address.af == ADDRESS_IP6) - { - clib_memcpy (&src.ip6, &mp->src_address.un.ip6, sizeof (ip6_address_t)); - clib_memcpy (&dst.ip6, &mp->dst_address.un.ip6, sizeof (ip6_address_t)); + if (vam->async_errors > 0) + { + errmsg ("%d asynchronous errors", vam->async_errors); + vam->retval = -98; + } + vam->async_errors = 0; + after = vat_time_now (vam); + + /* slim chance, but we might have eaten SIGTERM on the first iteration */ + if (j > 0) + count = j; + + print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec", + count, after - before, count / (after - before)); } else { - clib_memcpy (&src.ip4, &mp->src_address.un.ip4, sizeof (ip4_address_t)); - clib_memcpy (&dst.ip4, &mp->dst_address.un.ip4, sizeof (ip4_address_t)); + int ret; + + /* Wait for a reply... */ + W (ret); + return ret; } - print (vam->ofp, "%11d%24U%24U%14d%18d%13d%19d", - ntohl (mp->sw_if_index), - format_ip46_address, &src, IP46_TYPE_ANY, - format_ip46_address, &dst, IP46_TYPE_ANY, - ntohl (mp->encap_vrf_id), - ntohl (mp->decap_next_index), ntohl (mp->vni), - ntohl (mp->mcast_sw_if_index)); + /* Return the good/bad news */ + return (vam->retval); } -static void vl_api_geneve_tunnel_details_t_handler_json - (vl_api_geneve_tunnel_details_t * mp) +static int +api_ip_mroute_add_del (vat_main_t * vam) { - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - bool is_ipv6; + unformat_input_t *i = vam->input; + u8 path_set = 0, prefix_set = 0, is_add = 1; + vl_api_ip_mroute_add_del_t *mp; + mfib_entry_flags_t eflags = 0; + vl_api_mfib_path_t path; + vl_api_mprefix_t pfx = { }; + u32 vrf_id = 0; + int ret; - if (VAT_JSON_ARRAY != vam->json_tree.type) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + if (unformat (i, "%U", unformat_vl_api_mprefix, &pfx)) + { + prefix_set = 1; + pfx.grp_address_length = htons (pfx.grp_address_length); + } + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "vrf %d", &vrf_id)) + ; + else if (unformat (i, "%U", unformat_mfib_itf_flags, &path.itf_flags)) + path.itf_flags = htonl (path.itf_flags); + else if (unformat (i, "%U", unformat_mfib_entry_flags, &eflags)) + ; + else if (unformat (i, "via %U", unformat_fib_path, vam, &path.path)) + path_set = 1; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - is_ipv6 = mp->src_address.af == ADDRESS_IP6; - if (is_ipv6) + if (prefix_set == 0) { - struct in6_addr ip6; - - clib_memcpy (&ip6, &mp->src_address.un.ip6, sizeof (ip6)); - vat_json_object_add_ip6 (node, "src_address", ip6); - clib_memcpy (&ip6, &mp->dst_address.un.ip6, sizeof (ip6)); - vat_json_object_add_ip6 (node, "dst_address", ip6); + errmsg ("missing addresses\n"); + return -99; } - else + if (path_set == 0) { - struct in_addr ip4; - - clib_memcpy (&ip4, &mp->src_address.un.ip4, sizeof (ip4)); - vat_json_object_add_ip4 (node, "src_address", ip4); - clib_memcpy (&ip4, &mp->dst_address.un.ip4, sizeof (ip4)); - vat_json_object_add_ip4 (node, "dst_address", ip4); + errmsg ("missing path\n"); + return -99; } - vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id)); - vat_json_object_add_uint (node, "decap_next_index", - ntohl (mp->decap_next_index)); - vat_json_object_add_uint (node, "vni", ntohl (mp->vni)); - vat_json_object_add_uint (node, "mcast_sw_if_index", - ntohl (mp->mcast_sw_if_index)); + + /* Construct the API message */ + M (IP_MROUTE_ADD_DEL, mp); + + mp->is_add = is_add; + mp->is_multipath = 1; + + clib_memcpy (&mp->route.prefix, &pfx, sizeof (pfx)); + mp->route.table_id = htonl (vrf_id); + mp->route.n_paths = 1; + mp->route.entry_flags = htonl (eflags); + + clib_memcpy (&mp->route.paths, &path, sizeof (path)); + + /* send it... */ + S (mp); + /* Wait for a reply... */ + W (ret); + return ret; } static int -api_geneve_tunnel_dump (vat_main_t * vam) +api_mpls_table_add_del (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_geneve_tunnel_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 sw_if_index; - u8 sw_if_index_set = 0; - int ret; + unformat_input_t *i = vam->input; + vl_api_mpls_table_add_del_t *mp; + u32 table_id = ~0; + u8 is_add = 1; + int ret = 0; /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; + if (unformat (i, "table %d", &table_id)) + ; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) + is_add = 1; else - break; - } - - if (sw_if_index_set == 0) - { - sw_if_index = ~0; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (!vam->json_output) + if (~0 == table_id) { - print (vam->ofp, "%11s%24s%24s%14s%18s%13s%19s", - "sw_if_index", "local_address", "remote_address", - "encap_vrf_id", "decap_next_index", "vni", "mcast_sw_if_index"); + errmsg ("missing table-ID"); + return -99; } - /* Get list of geneve-tunnel interfaces */ - M (GENEVE_TUNNEL_DUMP, mp); + /* Construct the API message */ + M (MPLS_TABLE_ADD_DEL, mp); - mp->sw_if_index = htonl (sw_if_index); + mp->mt_table.mt_table_id = ntohl (table_id); + mp->mt_is_add = is_add; + /* send it... */ S (mp); - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - + /* Wait for a reply... */ W (ret); + return ret; } static int -api_gre_tunnel_add_del (vat_main_t * vam) +api_mpls_route_add_del (vat_main_t * vam) { - unformat_input_t *line_input = vam->input; - vl_api_address_t src = { }, dst = - { - }; - vl_api_gre_tunnel_add_del_t *mp; - vl_api_gre_tunnel_type_t t_type; - u8 is_add = 1; - u8 src_set = 0; - u8 dst_set = 0; - u32 outer_table_id = 0; - u32 session_id = 0; - u32 instance = ~0; - int ret; - - t_type = GRE_API_TUNNEL_TYPE_L3; + u8 is_add = 1, path_count = 0, is_multipath = 0, is_eos = 0; + mpls_label_t local_label = MPLS_LABEL_INVALID; + unformat_input_t *i = vam->input; + vl_api_mpls_route_add_del_t *mp; + vl_api_fib_path_t paths[8]; + int count = 1, j; + f64 before = 0; - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "del")) + if (unformat (i, "%d", &local_label)) + ; + else if (unformat (i, "eos")) + is_eos = 1; + else if (unformat (i, "non-eos")) + is_eos = 0; + else if (unformat (i, "del")) is_add = 0; - else if (unformat (line_input, "instance %d", &instance)) + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "multipath")) + is_multipath = 1; + else if (unformat (i, "count %d", &count)) ; - else if (unformat (line_input, "src %U", unformat_vl_api_address, &src)) - { - src_set = 1; - } - else if (unformat (line_input, "dst %U", unformat_vl_api_address, &dst)) + else + if (unformat + (i, "via %U", unformat_fib_path, vam, &paths[path_count])) { - dst_set = 1; + path_count++; + if (8 == path_count) + { + errmsg ("max 8 paths"); + return -99; + } } - else if (unformat (line_input, "outer-table-id %d", &outer_table_id)) - ; - else if (unformat (line_input, "teb")) - t_type = GRE_API_TUNNEL_TYPE_TEB; - else if (unformat (line_input, "erspan %d", &session_id)) - t_type = GRE_API_TUNNEL_TYPE_ERSPAN; else { - errmsg ("parse error '%U'", format_unformat_error, line_input); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (src_set == 0) + if (!path_count) { - errmsg ("tunnel src address not specified"); + errmsg ("specify a path; via ..."); return -99; } - if (dst_set == 0) + + if (MPLS_LABEL_INVALID == local_label) { - errmsg ("tunnel dst address not specified"); + errmsg ("missing label"); return -99; } - M (GRE_TUNNEL_ADD_DEL, mp); - - clib_memcpy (&mp->tunnel.src, &src, sizeof (mp->tunnel.src)); - clib_memcpy (&mp->tunnel.dst, &dst, sizeof (mp->tunnel.dst)); - - mp->tunnel.instance = htonl (instance); - mp->tunnel.outer_table_id = htonl (outer_table_id); - mp->is_add = is_add; - mp->tunnel.session_id = htons ((u16) session_id); - mp->tunnel.type = htonl (t_type); - - S (mp); - W (ret); - return ret; -} - -static void vl_api_gre_tunnel_details_t_handler - (vl_api_gre_tunnel_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "%11d%11d%24U%24U%13d%14d%12d", - ntohl (mp->tunnel.sw_if_index), - ntohl (mp->tunnel.instance), - format_vl_api_address, &mp->tunnel.src, - format_vl_api_address, &mp->tunnel.dst, - mp->tunnel.type, ntohl (mp->tunnel.outer_table_id), - ntohl (mp->tunnel.session_id)); -} - -static void vl_api_gre_tunnel_details_t_handler_json - (vl_api_gre_tunnel_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - - if (VAT_JSON_ARRAY != vam->json_tree.type) + if (count > 1) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + /* Turn on async mode */ + vam->async_mode = 1; + vam->async_errors = 0; + before = vat_time_now (vam); } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - vat_json_object_add_uint (node, "sw_if_index", - ntohl (mp->tunnel.sw_if_index)); - vat_json_object_add_uint (node, "instance", ntohl (mp->tunnel.instance)); + for (j = 0; j < count; j++) + { + /* Construct the API message */ + M2 (MPLS_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); - vat_json_object_add_address (node, "src", &mp->tunnel.src); - vat_json_object_add_address (node, "dst", &mp->tunnel.dst); - vat_json_object_add_uint (node, "tunnel_type", mp->tunnel.type); - vat_json_object_add_uint (node, "outer_table_id", - ntohl (mp->tunnel.outer_table_id)); - vat_json_object_add_uint (node, "session_id", mp->tunnel.session_id); -} + mp->mr_is_add = is_add; + mp->mr_is_multipath = is_multipath; -static int -api_gre_tunnel_dump (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_gre_tunnel_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 sw_if_index; - u8 sw_if_index_set = 0; - int ret; + mp->mr_route.mr_label = local_label; + mp->mr_route.mr_eos = is_eos; + mp->mr_route.mr_table_id = 0; + mp->mr_route.mr_n_paths = path_count; - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else + clib_memcpy (&mp->mr_route.mr_paths, paths, + sizeof (paths[0]) * path_count); + + local_label++; + + /* send it... */ + S (mp); + /* If we receive SIGTERM, stop now... */ + if (vam->do_exit) break; } - if (sw_if_index_set == 0) + /* When testing multiple add/del ops, use a control-ping to sync */ + if (count > 1) { - sw_if_index = ~0; - } + vl_api_control_ping_t *mp_ping; + f64 after; + f64 timeout; - if (!vam->json_output) - { - print (vam->ofp, "%11s%11s%24s%24s%13s%14s%12s", - "sw_if_index", "instance", "src_address", "dst_address", - "tunnel_type", "outer_fib_id", "session_id"); - } + /* Shut off async mode */ + vam->async_mode = 0; - /* Get list of gre-tunnel interfaces */ - M (GRE_TUNNEL_DUMP, mp); + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - mp->sw_if_index = htonl (sw_if_index); + timeout = vat_time_now (vam) + 1.0; + while (vat_time_now (vam) < timeout) + if (vam->result_ready == 1) + goto out; + vam->retval = -99; - S (mp); + out: + if (vam->retval == -99) + errmsg ("timeout"); - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + if (vam->async_errors > 0) + { + errmsg ("%d asynchronous errors", vam->async_errors); + vam->retval = -98; + } + vam->async_errors = 0; + after = vat_time_now (vam); - W (ret); - return ret; -} + /* slim chance, but we might have eaten SIGTERM on the first iteration */ + if (j > 0) + count = j; -static int -api_l2_fib_clear_table (vat_main_t * vam) -{ -// unformat_input_t * i = vam->input; - vl_api_l2_fib_clear_table_t *mp; - int ret; + print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec", + count, after - before, count / (after - before)); + } + else + { + int ret; - M (L2_FIB_CLEAR_TABLE, mp); + /* Wait for a reply... */ + W (ret); + return ret; + } - S (mp); - W (ret); - return ret; + /* Return the good/bad news */ + return (vam->retval); + return (0); } static int -api_l2_interface_efp_filter (vat_main_t * vam) +api_mpls_ip_bind_unbind (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_l2_interface_efp_filter_t *mp; - u32 sw_if_index; - u8 enable = 1; - u8 sw_if_index_set = 0; + vl_api_mpls_ip_bind_unbind_t *mp; + u32 ip_table_id = 0; + u8 is_bind = 1; + vl_api_prefix_t pfx; + u8 prefix_set = 0; + mpls_label_t local_label = MPLS_LABEL_INVALID; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "enable")) - enable = 1; - else if (unformat (i, "disable")) - enable = 0; + if (unformat (i, "%U", unformat_vl_api_prefix, &pfx)) + prefix_set = 1; + else if (unformat (i, "%d", &local_label)) + ; + else if (unformat (i, "table-id %d", &ip_table_id)) + ; + else if (unformat (i, "unbind")) + is_bind = 0; + else if (unformat (i, "bind")) + is_bind = 1; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -12305,64 +6577,63 @@ api_l2_interface_efp_filter (vat_main_t * vam) } } - if (sw_if_index_set == 0) + if (!prefix_set) { - errmsg ("missing sw_if_index"); + errmsg ("IP prefix not set"); return -99; } - M (L2_INTERFACE_EFP_FILTER, mp); + if (MPLS_LABEL_INVALID == local_label) + { + errmsg ("missing label"); + return -99; + } - mp->sw_if_index = ntohl (sw_if_index); - mp->enable_disable = enable; + /* Construct the API message */ + M (MPLS_IP_BIND_UNBIND, mp); + + mp->mb_is_bind = is_bind; + mp->mb_ip_table_id = ntohl (ip_table_id); + mp->mb_mpls_table_id = 0; + mp->mb_label = ntohl (local_label); + clib_memcpy (&mp->mb_prefix, &pfx, sizeof (pfx)); + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; + return (0); } -#define foreach_vtr_op \ -_("disable", L2_VTR_DISABLED) \ -_("push-1", L2_VTR_PUSH_1) \ -_("push-2", L2_VTR_PUSH_2) \ -_("pop-1", L2_VTR_POP_1) \ -_("pop-2", L2_VTR_POP_2) \ -_("translate-1-1", L2_VTR_TRANSLATE_1_1) \ -_("translate-1-2", L2_VTR_TRANSLATE_1_2) \ -_("translate-2-1", L2_VTR_TRANSLATE_2_1) \ -_("translate-2-2", L2_VTR_TRANSLATE_2_2) - static int -api_l2_interface_vlan_tag_rewrite (vat_main_t * vam) +api_sr_mpls_policy_add (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_l2_interface_vlan_tag_rewrite_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u8 vtr_op_set = 0; - u32 vtr_op = 0; - u32 push_dot1q = 1; - u32 tag1 = ~0; - u32 tag2 = ~0; + vl_api_sr_mpls_policy_add_t *mp; + u32 bsid = 0; + u32 weight = 1; + u8 type = 0; + u8 n_segments = 0; + u32 sid; + u32 *segments = NULL; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "vtr_op %d", &vtr_op)) - vtr_op_set = 1; -#define _(n,v) else if (unformat(i, n)) {vtr_op = v; vtr_op_set = 1;} - foreach_vtr_op -#undef _ - else if (unformat (i, "push_dot1q %d", &push_dot1q)) - ; - else if (unformat (i, "tag1 %d", &tag1)) + if (unformat (i, "bsid %d", &bsid)) ; - else if (unformat (i, "tag2 %d", &tag2)) + else if (unformat (i, "weight %d", &weight)) ; + else if (unformat (i, "spray")) + type = 1; + else if (unformat (i, "next %d", &sid)) + { + n_segments += 1; + vec_add1 (segments, htonl (sid)); + } else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -12370,672 +6641,530 @@ api_l2_interface_vlan_tag_rewrite (vat_main_t * vam) } } - if ((sw_if_index_set == 0) || (vtr_op_set == 0)) + if (bsid == 0) { - errmsg ("missing vtr operation or sw_if_index"); + errmsg ("bsid not set"); return -99; } - M (L2_INTERFACE_VLAN_TAG_REWRITE, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->vtr_op = ntohl (vtr_op); - mp->push_dot1q = ntohl (push_dot1q); - mp->tag1 = ntohl (tag1); - mp->tag2 = ntohl (tag2); + if (n_segments == 0) + { + errmsg ("no sid in segment stack"); + return -99; + } + + /* Construct the API message */ + M2 (SR_MPLS_POLICY_ADD, mp, sizeof (u32) * n_segments); + + mp->bsid = htonl (bsid); + mp->weight = htonl (weight); + mp->is_spray = type; + mp->n_segments = n_segments; + memcpy (mp->segments, segments, sizeof (u32) * n_segments); + vec_free (segments); + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; } static int -api_create_vhost_user_if (vat_main_t * vam) +api_sr_mpls_policy_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_create_vhost_user_if_t *mp; - u8 *file_name; - u8 is_server = 0; - u8 file_name_set = 0; - u32 custom_dev_instance = ~0; - u8 hwaddr[6]; - u8 use_custom_mac = 0; - u8 disable_mrg_rxbuf = 0; - u8 disable_indirect_desc = 0; - u8 *tag = 0; - u8 enable_gso = 0; + vl_api_sr_mpls_policy_del_t *mp; + u32 bsid = 0; int ret; - /* Shut up coverity */ - clib_memset (hwaddr, 0, sizeof (hwaddr)); - + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "socket %s", &file_name)) - { - file_name_set = 1; - } - else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance)) - ; - else if (unformat (i, "mac %U", unformat_ethernet_address, hwaddr)) - use_custom_mac = 1; - else if (unformat (i, "server")) - is_server = 1; - else if (unformat (i, "disable_mrg_rxbuf")) - disable_mrg_rxbuf = 1; - else if (unformat (i, "disable_indirect_desc")) - disable_indirect_desc = 1; - else if (unformat (i, "gso")) - enable_gso = 1; - else if (unformat (i, "tag %s", &tag)) + if (unformat (i, "bsid %d", &bsid)) ; else - break; - } - - if (file_name_set == 0) - { - errmsg ("missing socket file name"); - return -99; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (vec_len (file_name) > 255) + if (bsid == 0) { - errmsg ("socket file name too long"); + errmsg ("bsid not set"); return -99; } - vec_add1 (file_name, 0); - M (CREATE_VHOST_USER_IF, mp); - - mp->is_server = is_server; - mp->disable_mrg_rxbuf = disable_mrg_rxbuf; - mp->disable_indirect_desc = disable_indirect_desc; - mp->enable_gso = enable_gso; - clib_memcpy (mp->sock_filename, file_name, vec_len (file_name)); - vec_free (file_name); - if (custom_dev_instance != ~0) - { - mp->renumber = 1; - mp->custom_dev_instance = ntohl (custom_dev_instance); - } + /* Construct the API message */ + M (SR_MPLS_POLICY_DEL, mp); - mp->use_custom_mac = use_custom_mac; - clib_memcpy (mp->mac_address, hwaddr, 6); - if (tag) - strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1); - vec_free (tag); + mp->bsid = htonl (bsid); + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; } static int -api_modify_vhost_user_if (vat_main_t * vam) +api_bier_table_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_modify_vhost_user_if_t *mp; - u8 *file_name; - u8 is_server = 0; - u8 file_name_set = 0; - u32 custom_dev_instance = ~0; - u8 sw_if_index_set = 0; - u32 sw_if_index = (u32) ~ 0; - u8 enable_gso = 0; + vl_api_bier_table_add_del_t *mp; + u8 is_add = 1; + u32 set = 0, sub_domain = 0, hdr_len = 3; + mpls_label_t local_label = MPLS_LABEL_INVALID; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "socket %s", &file_name)) - { - file_name_set = 1; - } - else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance)) + if (unformat (i, "sub-domain %d", &sub_domain)) ; - else if (unformat (i, "server")) - is_server = 1; - else if (unformat (i, "gso")) - enable_gso = 1; + else if (unformat (i, "set %d", &set)) + ; + else if (unformat (i, "label %d", &local_label)) + ; + else if (unformat (i, "hdr-len %d", &hdr_len)) + ; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "del")) + is_add = 0; else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing sw_if_index or interface name"); - return -99; - } - - if (file_name_set == 0) - { - errmsg ("missing socket file name"); - return -99; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (vec_len (file_name) > 255) + if (MPLS_LABEL_INVALID == local_label) { - errmsg ("socket file name too long"); + errmsg ("missing label\n"); return -99; } - vec_add1 (file_name, 0); - M (MODIFY_VHOST_USER_IF, mp); + /* Construct the API message */ + M (BIER_TABLE_ADD_DEL, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->is_server = is_server; - mp->enable_gso = enable_gso; - clib_memcpy (mp->sock_filename, file_name, vec_len (file_name)); - vec_free (file_name); - if (custom_dev_instance != ~0) - { - mp->renumber = 1; - mp->custom_dev_instance = ntohl (custom_dev_instance); - } + mp->bt_is_add = is_add; + mp->bt_label = ntohl (local_label); + mp->bt_tbl_id.bt_set = set; + mp->bt_tbl_id.bt_sub_domain = sub_domain; + mp->bt_tbl_id.bt_hdr_len_id = hdr_len; + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); - return ret; + + return (ret); } static int -api_delete_vhost_user_if (vat_main_t * vam) +api_bier_route_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_delete_vhost_user_if_t *mp; - u32 sw_if_index = ~0; - u8 sw_if_index_set = 0; + vl_api_bier_route_add_del_t *mp; + u8 is_add = 1; + u32 set = 0, sub_domain = 0, hdr_len = 3, bp = 0; + ip4_address_t v4_next_hop_address; + ip6_address_t v6_next_hop_address; + u8 next_hop_set = 0; + u8 next_hop_proto_is_ip4 = 1; + mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; + if (unformat (i, "%U", unformat_ip4_address, &v4_next_hop_address)) + { + next_hop_proto_is_ip4 = 1; + next_hop_set = 1; + } + else if (unformat (i, "%U", unformat_ip6_address, &v6_next_hop_address)) + { + next_hop_proto_is_ip4 = 0; + next_hop_set = 1; + } + if (unformat (i, "sub-domain %d", &sub_domain)) + ; + else if (unformat (i, "set %d", &set)) + ; + else if (unformat (i, "hdr-len %d", &hdr_len)) + ; + else if (unformat (i, "bp %d", &bp)) + ; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "out-label %d", &next_hop_out_label)) + ; else - break; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (sw_if_index_set == 0) + if (!next_hop_set || (MPLS_LABEL_INVALID == next_hop_out_label)) { - errmsg ("missing sw_if_index or interface name"); + errmsg ("next hop / label set\n"); + return -99; + } + if (0 == bp) + { + errmsg ("bit=position not set\n"); return -99; } + /* Construct the API message */ + M2 (BIER_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t)); - M (DELETE_VHOST_USER_IF, mp); - - mp->sw_if_index = ntohl (sw_if_index); - - S (mp); - W (ret); - return ret; -} - -static void vl_api_sw_interface_vhost_user_details_t_handler - (vl_api_sw_interface_vhost_user_details_t * mp) -{ - vat_main_t *vam = &vat_main; - u64 features; - - features = - clib_net_to_host_u32 (mp->features_first_32) | ((u64) - clib_net_to_host_u32 - (mp->features_last_32) << - 32); - - print (vam->ofp, "%-25s %3" PRIu32 " %6" PRIu32 " %8x %6d %7d %s", - (char *) mp->interface_name, - ntohl (mp->sw_if_index), ntohl (mp->virtio_net_hdr_sz), - features, mp->is_server, - ntohl (mp->num_regions), (char *) mp->sock_filename); - print (vam->ofp, " Status: '%s'", strerror (ntohl (mp->sock_errno))); -} - -static void vl_api_sw_interface_vhost_user_details_t_handler_json - (vl_api_sw_interface_vhost_user_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; + mp->br_is_add = is_add; + mp->br_route.br_tbl_id.bt_set = set; + mp->br_route.br_tbl_id.bt_sub_domain = sub_domain; + mp->br_route.br_tbl_id.bt_hdr_len_id = hdr_len; + mp->br_route.br_bp = ntohs (bp); + mp->br_route.br_n_paths = 1; + mp->br_route.br_paths[0].n_labels = 1; + mp->br_route.br_paths[0].label_stack[0].label = ntohl (next_hop_out_label); + mp->br_route.br_paths[0].proto = (next_hop_proto_is_ip4 ? + FIB_API_PATH_NH_PROTO_IP4 : + FIB_API_PATH_NH_PROTO_IP6); - if (VAT_JSON_ARRAY != vam->json_tree.type) + if (next_hop_proto_is_ip4) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + clib_memcpy (&mp->br_route.br_paths[0].nh.address.ip4, + &v4_next_hop_address, sizeof (v4_next_hop_address)); + } + else + { + clib_memcpy (&mp->br_route.br_paths[0].nh.address.ip6, + &v6_next_hop_address, sizeof (v6_next_hop_address)); } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_string_copy (node, "interface_name", - mp->interface_name); - vat_json_object_add_uint (node, "virtio_net_hdr_sz", - ntohl (mp->virtio_net_hdr_sz)); - vat_json_object_add_uint (node, "features_first_32", - clib_net_to_host_u32 (mp->features_first_32)); - vat_json_object_add_uint (node, "features_last_32", - clib_net_to_host_u32 (mp->features_last_32)); - vat_json_object_add_uint (node, "is_server", mp->is_server); - vat_json_object_add_string_copy (node, "sock_filename", mp->sock_filename); - vat_json_object_add_uint (node, "num_regions", ntohl (mp->num_regions)); - vat_json_object_add_uint (node, "sock_errno", ntohl (mp->sock_errno)); -} - -static int -api_sw_interface_vhost_user_dump (vat_main_t * vam) -{ - vl_api_sw_interface_vhost_user_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; - print (vam->ofp, - "Interface name idx hdr_sz features server regions filename"); - /* Get list of vhost-user interfaces */ - M (SW_INTERFACE_VHOST_USER_DUMP, mp); + /* send it... */ S (mp); - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - + /* Wait for a reply... */ W (ret); - return ret; -} - -static int -api_show_version (vat_main_t * vam) -{ - vl_api_show_version_t *mp; - int ret; - - M (SHOW_VERSION, mp); - S (mp); - W (ret); - return ret; + return (ret); } - static int -api_vxlan_gpe_add_del_tunnel (vat_main_t * vam) +api_mpls_tunnel_add_del (vat_main_t * vam) { - unformat_input_t *line_input = vam->input; - vl_api_vxlan_gpe_add_del_tunnel_t *mp; - ip4_address_t local4, remote4; - ip6_address_t local6, remote6; + unformat_input_t *i = vam->input; + vl_api_mpls_tunnel_add_del_t *mp; + + vl_api_fib_path_t paths[8]; + u32 sw_if_index = ~0; + u8 path_count = 0; + u8 l2_only = 0; u8 is_add = 1; - u8 ipv4_set = 0, ipv6_set = 0; - u8 local_set = 0; - u8 remote_set = 0; - u8 grp_set = 0; - u32 mcast_sw_if_index = ~0; - u32 encap_vrf_id = 0; - u32 decap_vrf_id = 0; - u8 protocol = ~0; - u32 vni; - u8 vni_set = 0; int ret; - /* Can't "universally zero init" (={0}) due to GCC bug 53119 */ - clib_memset (&local4, 0, sizeof local4); - clib_memset (&remote4, 0, sizeof remote4); - clib_memset (&local6, 0, sizeof local6); - clib_memset (&remote6, 0, sizeof remote6); - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "del")) + if (unformat (i, "add")) + is_add = 1; + else + if (unformat + (i, "del %U", api_unformat_sw_if_index, vam, &sw_if_index)) is_add = 0; - else if (unformat (line_input, "local %U", - unformat_ip4_address, &local4)) - { - local_set = 1; - ipv4_set = 1; - } - else if (unformat (line_input, "remote %U", - unformat_ip4_address, &remote4)) - { - remote_set = 1; - ipv4_set = 1; - } - else if (unformat (line_input, "local %U", - unformat_ip6_address, &local6)) - { - local_set = 1; - ipv6_set = 1; - } - else if (unformat (line_input, "remote %U", - unformat_ip6_address, &remote6)) - { - remote_set = 1; - ipv6_set = 1; - } - else if (unformat (line_input, "group %U %U", - unformat_ip4_address, &remote4, - api_unformat_sw_if_index, vam, &mcast_sw_if_index)) - { - grp_set = remote_set = 1; - ipv4_set = 1; - } - else if (unformat (line_input, "group %U", - unformat_ip4_address, &remote4)) - { - grp_set = remote_set = 1; - ipv4_set = 1; - } - else if (unformat (line_input, "group %U %U", - unformat_ip6_address, &remote6, - api_unformat_sw_if_index, vam, &mcast_sw_if_index)) - { - grp_set = remote_set = 1; - ipv6_set = 1; - } - else if (unformat (line_input, "group %U", - unformat_ip6_address, &remote6)) + else if (unformat (i, "del sw_if_index %d", &sw_if_index)) + is_add = 0; + else if (unformat (i, "l2-only")) + l2_only = 1; + else + if (unformat + (i, "via %U", unformat_fib_path, vam, &paths[path_count])) { - grp_set = remote_set = 1; - ipv6_set = 1; + path_count++; + if (8 == path_count) + { + errmsg ("max 8 paths"); + return -99; + } } - else - if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index)) - ; - else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) - ; - else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id)) - ; - else if (unformat (line_input, "vni %d", &vni)) - vni_set = 1; - else if (unformat (line_input, "next-ip4")) - protocol = 1; - else if (unformat (line_input, "next-ip6")) - protocol = 2; - else if (unformat (line_input, "next-ethernet")) - protocol = 3; - else if (unformat (line_input, "next-nsh")) - protocol = 4; else { - errmsg ("parse error '%U'", format_unformat_error, line_input); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (local_set == 0) - { - errmsg ("tunnel local address not specified"); - return -99; - } - if (remote_set == 0) - { - errmsg ("tunnel remote address not specified"); - return -99; - } - if (grp_set && mcast_sw_if_index == ~0) - { - errmsg ("tunnel nonexistent multicast device"); - return -99; - } - if (ipv4_set && ipv6_set) - { - errmsg ("both IPv4 and IPv6 addresses specified"); - return -99; - } - - if (vni_set == 0) - { - errmsg ("vni not specified"); - return -99; - } - - M (VXLAN_GPE_ADD_DEL_TUNNEL, mp); - + M2 (MPLS_TUNNEL_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); - if (ipv6_set) - { - clib_memcpy (&mp->local, &local6, sizeof (local6)); - clib_memcpy (&mp->remote, &remote6, sizeof (remote6)); - } - else - { - clib_memcpy (&mp->local, &local4, sizeof (local4)); - clib_memcpy (&mp->remote, &remote4, sizeof (remote4)); - } + mp->mt_is_add = is_add; + mp->mt_tunnel.mt_sw_if_index = ntohl (sw_if_index); + mp->mt_tunnel.mt_l2_only = l2_only; + mp->mt_tunnel.mt_is_multicast = 0; + mp->mt_tunnel.mt_n_paths = path_count; - mp->mcast_sw_if_index = ntohl (mcast_sw_if_index); - mp->encap_vrf_id = ntohl (encap_vrf_id); - mp->decap_vrf_id = ntohl (decap_vrf_id); - mp->protocol = protocol; - mp->vni = ntohl (vni); - mp->is_add = is_add; - mp->is_ipv6 = ipv6_set; + clib_memcpy (&mp->mt_tunnel.mt_paths, &paths, + sizeof (paths[0]) * path_count); S (mp); W (ret); return ret; } -static void vl_api_vxlan_gpe_tunnel_details_t_handler - (vl_api_vxlan_gpe_tunnel_details_t * mp) -{ - vat_main_t *vam = &vat_main; - ip46_address_t local = to_ip46 (mp->is_ipv6, mp->local); - ip46_address_t remote = to_ip46 (mp->is_ipv6, mp->remote); - - print (vam->ofp, "%11d%24U%24U%13d%12d%19d%14d%14d", - ntohl (mp->sw_if_index), - format_ip46_address, &local, IP46_TYPE_ANY, - format_ip46_address, &remote, IP46_TYPE_ANY, - ntohl (mp->vni), mp->protocol, - ntohl (mp->mcast_sw_if_index), - ntohl (mp->encap_vrf_id), ntohl (mp->decap_vrf_id)); -} - - -static void vl_api_vxlan_gpe_tunnel_details_t_handler_json - (vl_api_vxlan_gpe_tunnel_details_t * mp) +static int +api_sw_interface_set_unnumbered (vat_main_t * vam) { - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - struct in_addr ip4; - struct in6_addr ip6; + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_unnumbered_t *mp; + u32 sw_if_index; + u32 unnum_sw_index = ~0; + u8 is_add = 1; + u8 sw_if_index_set = 0; + int ret; - if (VAT_JSON_ARRAY != vam->json_tree.type) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "unnum_if_index %d", &unnum_sw_index)) + ; + else if (unformat (i, "del")) + is_add = 0; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - if (mp->is_ipv6) - { - clib_memcpy (&ip6, &(mp->local[0]), sizeof (ip6)); - vat_json_object_add_ip6 (node, "local", ip6); - clib_memcpy (&ip6, &(mp->remote[0]), sizeof (ip6)); - vat_json_object_add_ip6 (node, "remote", ip6); - } - else + if (sw_if_index_set == 0) { - clib_memcpy (&ip4, &(mp->local[0]), sizeof (ip4)); - vat_json_object_add_ip4 (node, "local", ip4); - clib_memcpy (&ip4, &(mp->remote[0]), sizeof (ip4)); - vat_json_object_add_ip4 (node, "remote", ip4); + errmsg ("missing interface name or sw_if_index"); + return -99; } - vat_json_object_add_uint (node, "vni", ntohl (mp->vni)); - vat_json_object_add_uint (node, "protocol", ntohl (mp->protocol)); - vat_json_object_add_uint (node, "mcast_sw_if_index", - ntohl (mp->mcast_sw_if_index)); - vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id)); - vat_json_object_add_uint (node, "decap_vrf_id", ntohl (mp->decap_vrf_id)); - vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0); + + M (SW_INTERFACE_SET_UNNUMBERED, mp); + + mp->sw_if_index = ntohl (sw_if_index); + mp->unnumbered_sw_if_index = ntohl (unnum_sw_index); + mp->is_add = is_add; + + S (mp); + W (ret); + return ret; } + static int -api_vxlan_gpe_tunnel_dump (vat_main_t * vam) +api_create_vlan_subif (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_vxlan_gpe_tunnel_dump_t *mp; - vl_api_control_ping_t *mp_ping; + vl_api_create_vlan_subif_t *mp; u32 sw_if_index; u8 sw_if_index_set = 0; + u32 vlan_id; + u8 vlan_id_set = 0; int ret; - /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { if (unformat (i, "sw_if_index %d", &sw_if_index)) sw_if_index_set = 1; else - break; + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "vlan %d", &vlan_id)) + vlan_id_set = 1; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } if (sw_if_index_set == 0) { - sw_if_index = ~0; + errmsg ("missing interface name or sw_if_index"); + return -99; } - if (!vam->json_output) + if (vlan_id_set == 0) { - print (vam->ofp, "%11s%24s%24s%13s%15s%19s%14s%14s", - "sw_if_index", "local", "remote", "vni", - "protocol", "mcast_sw_if_index", "encap_vrf_id", "decap_vrf_id"); + errmsg ("missing vlan_id"); + return -99; } + M (CREATE_VLAN_SUBIF, mp); - /* Get list of vxlan-tunnel interfaces */ - M (VXLAN_GPE_TUNNEL_DUMP, mp); - - mp->sw_if_index = htonl (sw_if_index); + mp->sw_if_index = ntohl (sw_if_index); + mp->vlan_id = ntohl (vlan_id); S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - W (ret); return ret; } -static void vl_api_l2_fib_table_details_t_handler - (vl_api_l2_fib_table_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "%3" PRIu32 " %U %3" PRIu32 - " %d %d %d", - ntohl (mp->bd_id), format_ethernet_address, mp->mac, - ntohl (mp->sw_if_index), mp->static_mac, mp->filter_mac, - mp->bvi_mac); -} - -static void vl_api_l2_fib_table_details_t_handler_json - (vl_api_l2_fib_table_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); +#define foreach_create_subif_bit \ +_(no_tags) \ +_(one_tag) \ +_(two_tags) \ +_(dot1ad) \ +_(exact_match) \ +_(default_sub) \ +_(outer_vlan_id_any) \ +_(inner_vlan_id_any) - vat_json_init_object (node); - vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id)); - vat_json_object_add_bytes (node, "mac", mp->mac, 6); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_uint (node, "static_mac", mp->static_mac); - vat_json_object_add_uint (node, "filter_mac", mp->filter_mac); - vat_json_object_add_uint (node, "bvi_mac", mp->bvi_mac); -} +#define foreach_create_subif_flag \ +_(0, "no_tags") \ +_(1, "one_tag") \ +_(2, "two_tags") \ +_(3, "dot1ad") \ +_(4, "exact_match") \ +_(5, "default_sub") \ +_(6, "outer_vlan_id_any") \ +_(7, "inner_vlan_id_any") static int -api_l2_fib_table_dump (vat_main_t * vam) +api_create_subif (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_l2_fib_table_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 bd_id; - u8 bd_id_set = 0; + vl_api_create_subif_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u32 sub_id; + u8 sub_id_set = 0; + u32 __attribute__ ((unused)) no_tags = 0; + u32 __attribute__ ((unused)) one_tag = 0; + u32 __attribute__ ((unused)) two_tags = 0; + u32 __attribute__ ((unused)) dot1ad = 0; + u32 __attribute__ ((unused)) exact_match = 0; + u32 __attribute__ ((unused)) default_sub = 0; + u32 __attribute__ ((unused)) outer_vlan_id_any = 0; + u32 __attribute__ ((unused)) inner_vlan_id_any = 0; + u32 tmp; + u16 outer_vlan_id = 0; + u16 inner_vlan_id = 0; int ret; - /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "bd_id %d", &bd_id)) - bd_id_set = 1; + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else - break; + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sub_id %d", &sub_id)) + sub_id_set = 1; + else if (unformat (i, "outer_vlan_id %d", &tmp)) + outer_vlan_id = tmp; + else if (unformat (i, "inner_vlan_id %d", &tmp)) + inner_vlan_id = tmp; + +#define _(a) else if (unformat (i, #a)) a = 1 ; + foreach_create_subif_bit +#undef _ + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (bd_id_set == 0) + if (sw_if_index_set == 0) { - errmsg ("missing bridge domain"); + errmsg ("missing interface name or sw_if_index"); return -99; } - print (vam->ofp, "BD-ID Mac Address sw-ndx Static Filter BVI"); + if (sub_id_set == 0) + { + errmsg ("missing sub_id"); + return -99; + } + M (CREATE_SUBIF, mp); - /* Get list of l2 fib entries */ - M (L2_FIB_TABLE_DUMP, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->sub_id = ntohl (sub_id); - mp->bd_id = ntohl (bd_id); - S (mp); +#define _(a,b) mp->sub_if_flags |= (1 << a); + foreach_create_subif_flag; +#undef _ - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + mp->outer_vlan_id = ntohs (outer_vlan_id); + mp->inner_vlan_id = ntohs (inner_vlan_id); + S (mp); W (ret); return ret; } - static int -api_interface_name_renumber (vat_main_t * vam) +api_ip_table_replace_begin (vat_main_t * vam) { - unformat_input_t *line_input = vam->input; - vl_api_interface_name_renumber_t *mp; - u32 sw_if_index = ~0; - u32 new_show_dev_instance = ~0; - int ret; + unformat_input_t *i = vam->input; + vl_api_ip_table_replace_begin_t *mp; + u32 table_id = 0; + u8 is_ipv6 = 0; - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + int ret; + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "%U", api_unformat_sw_if_index, vam, - &sw_if_index)) - ; - else if (unformat (line_input, "sw_if_index %d", &sw_if_index)) - ; - else if (unformat (line_input, "new_show_dev_instance %d", - &new_show_dev_instance)) + if (unformat (i, "table %d", &table_id)) ; + else if (unformat (i, "ipv6")) + is_ipv6 = 1; else - break; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (sw_if_index == ~0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } + M (IP_TABLE_REPLACE_BEGIN, mp); - if (new_show_dev_instance == ~0) + mp->table.table_id = ntohl (table_id); + mp->table.is_ip6 = is_ipv6; + + S (mp); + W (ret); + return ret; +} + +static int +api_ip_table_flush (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_ip_table_flush_t *mp; + u32 table_id = 0; + u8 is_ipv6 = 0; + + int ret; + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - errmsg ("missing new_show_dev_instance"); - return -99; + if (unformat (i, "table %d", &table_id)) + ; + else if (unformat (i, "ipv6")) + is_ipv6 = 1; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - M (INTERFACE_NAME_RENUMBER, mp); + M (IP_TABLE_FLUSH, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->new_show_dev_instance = ntohl (new_show_dev_instance); + mp->table.table_id = ntohl (table_id); + mp->table.is_ip6 = is_ipv6; S (mp); W (ret); @@ -13043,68 +7172,72 @@ api_interface_name_renumber (vat_main_t * vam) } static int -api_want_l2_macs_events (vat_main_t * vam) +api_ip_table_replace_end (vat_main_t * vam) { - unformat_input_t *line_input = vam->input; - vl_api_want_l2_macs_events_t *mp; - u8 enable_disable = 1; - u32 scan_delay = 0; - u32 max_macs_in_event = 0; - u32 learn_limit = 0; - int ret; + unformat_input_t *i = vam->input; + vl_api_ip_table_replace_end_t *mp; + u32 table_id = 0; + u8 is_ipv6 = 0; - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + int ret; + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "learn-limit %d", &learn_limit)) - ; - else if (unformat (line_input, "scan-delay %d", &scan_delay)) - ; - else if (unformat (line_input, "max-entries %d", &max_macs_in_event)) + if (unformat (i, "table %d", &table_id)) ; - else if (unformat (line_input, "disable")) - enable_disable = 0; + else if (unformat (i, "ipv6")) + is_ipv6 = 1; else - break; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - M (WANT_L2_MACS_EVENTS, mp); - mp->enable_disable = enable_disable; - mp->pid = htonl (getpid ()); - mp->learn_limit = htonl (learn_limit); - mp->scan_delay = (u8) scan_delay; - mp->max_macs_in_event = (u8) (max_macs_in_event / 10); + M (IP_TABLE_REPLACE_END, mp); + + mp->table.table_id = ntohl (table_id); + mp->table.is_ip6 = is_ipv6; + S (mp); W (ret); return ret; } static int -api_input_acl_set_interface (vat_main_t * vam) +api_set_ip_flow_hash (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_input_acl_set_interface_t *mp; - u32 sw_if_index; - int sw_if_index_set; - u32 ip4_table_index = ~0; - u32 ip6_table_index = ~0; - u32 l2_table_index = ~0; - u8 is_add = 1; + vl_api_set_ip_flow_hash_t *mp; + u32 vrf_id = 0; + u8 is_ipv6 = 0; + u8 vrf_id_set = 0; + u8 src = 0; + u8 dst = 0; + u8 sport = 0; + u8 dport = 0; + u8 proto = 0; + u8 reverse = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "ip4-table %d", &ip4_table_index)) - ; - else if (unformat (i, "ip6-table %d", &ip6_table_index)) - ; - else if (unformat (i, "l2-table %d", &l2_table_index)) - ; + if (unformat (i, "vrf %d", &vrf_id)) + vrf_id_set = 1; + else if (unformat (i, "ipv6")) + is_ipv6 = 1; + else if (unformat (i, "src")) + src = 1; + else if (unformat (i, "dst")) + dst = 1; + else if (unformat (i, "sport")) + sport = 1; + else if (unformat (i, "dport")) + dport = 1; + else if (unformat (i, "proto")) + proto = 1; + else if (unformat (i, "reverse")) + reverse = 1; + else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -13112,19 +7245,21 @@ api_input_acl_set_interface (vat_main_t * vam) } } - if (sw_if_index_set == 0) + if (vrf_id_set == 0) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("missing vrf id"); return -99; } - M (INPUT_ACL_SET_INTERFACE, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->ip4_table_index = ntohl (ip4_table_index); - mp->ip6_table_index = ntohl (ip6_table_index); - mp->l2_table_index = ntohl (l2_table_index); - mp->is_add = is_add; + M (SET_IP_FLOW_HASH, mp); + mp->src = src; + mp->dst = dst; + mp->sport = sport; + mp->dport = dport; + mp->proto = proto; + mp->reverse = reverse; + mp->vrf_id = ntohl (vrf_id); + mp->is_ipv6 = is_ipv6; S (mp); W (ret); @@ -13132,32 +7267,25 @@ api_input_acl_set_interface (vat_main_t * vam) } static int -api_output_acl_set_interface (vat_main_t * vam) +api_sw_interface_ip6_enable_disable (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_output_acl_set_interface_t *mp; + vl_api_sw_interface_ip6_enable_disable_t *mp; u32 sw_if_index; - int sw_if_index_set; - u32 ip4_table_index = ~0; - u32 ip6_table_index = ~0; - u32 l2_table_index = ~0; - u8 is_add = 1; + u8 sw_if_index_set = 0; + u8 enable = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "ip4-table %d", &ip4_table_index)) - ; - else if (unformat (i, "ip6-table %d", &ip6_table_index)) - ; - else if (unformat (i, "l2-table %d", &l2_table_index)) - ; + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "enable")) + enable = 1; + else if (unformat (i, "disable")) + enable = 0; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -13171,3984 +7299,3938 @@ api_output_acl_set_interface (vat_main_t * vam) return -99; } - M (OUTPUT_ACL_SET_INTERFACE, mp); + M (SW_INTERFACE_IP6_ENABLE_DISABLE, mp); mp->sw_if_index = ntohl (sw_if_index); - mp->ip4_table_index = ntohl (ip4_table_index); - mp->ip6_table_index = ntohl (ip6_table_index); - mp->l2_table_index = ntohl (l2_table_index); - mp->is_add = is_add; + mp->enable = enable; S (mp); W (ret); return ret; } + static int -api_ip_address_dump (vat_main_t * vam) +api_l2_patch_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ip_address_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 sw_if_index = ~0; - u8 sw_if_index_set = 0; - u8 ipv4_set = 0; - u8 ipv6_set = 0; + vl_api_l2_patch_add_del_t *mp; + u32 rx_sw_if_index; + u8 rx_sw_if_index_set = 0; + u32 tx_sw_if_index; + u8 tx_sw_if_index_set = 0; + u8 is_add = 1; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "ipv4")) - ipv4_set = 1; - else if (unformat (i, "ipv6")) - ipv6_set = 1; + if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index)) + rx_sw_if_index_set = 1; + else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index)) + tx_sw_if_index_set = 1; + else if (unformat (i, "rx")) + { + if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, + &rx_sw_if_index)) + rx_sw_if_index_set = 1; + } + else + break; + } + else if (unformat (i, "tx")) + { + if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, + &tx_sw_if_index)) + tx_sw_if_index_set = 1; + } + else + break; + } + else if (unformat (i, "del")) + is_add = 0; else break; } - if (ipv4_set && ipv6_set) + if (rx_sw_if_index_set == 0) { - errmsg ("ipv4 and ipv6 flags cannot be both set"); + errmsg ("missing rx interface name or rx_sw_if_index"); return -99; } - if ((!ipv4_set) && (!ipv6_set)) + if (tx_sw_if_index_set == 0) { - errmsg ("no ipv4 nor ipv6 flag set"); + errmsg ("missing tx interface name or tx_sw_if_index"); return -99; } - if (sw_if_index_set == 0) + M (L2_PATCH_ADD_DEL, mp); + + mp->rx_sw_if_index = ntohl (rx_sw_if_index); + mp->tx_sw_if_index = ntohl (tx_sw_if_index); + mp->is_add = is_add; + + S (mp); + W (ret); + return ret; +} + +u8 is_del; +u8 localsid_addr[16]; +u8 end_psp; +u8 behavior; +u32 sw_if_index; +u32 vlan_index; +u32 fib_table; +u8 nh_addr[16]; + +static int +api_sr_localsid_add_del (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_sr_localsid_add_del_t *mp; + + u8 is_del; + ip6_address_t localsid; + u8 end_psp = 0; + u8 behavior = ~0; + u32 sw_if_index; + u32 fib_table = ~(u32) 0; + ip46_address_t nh_addr; + clib_memset (&nh_addr, 0, sizeof (ip46_address_t)); + + bool nexthop_set = 0; + + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - errmsg ("missing interface name or sw_if_index"); - return -99; + if (unformat (i, "del")) + is_del = 1; + else if (unformat (i, "address %U", unformat_ip6_address, &localsid)); + else if (unformat (i, "next-hop %U", unformat_ip46_address, &nh_addr)) + nexthop_set = 1; + else if (unformat (i, "behavior %u", &behavior)); + else if (unformat (i, "sw_if_index %u", &sw_if_index)); + else if (unformat (i, "fib-table %u", &fib_table)); + else if (unformat (i, "end.psp %u", &behavior)); + else + break; } - vam->current_sw_if_index = sw_if_index; - vam->is_ipv6 = ipv6_set; + M (SR_LOCALSID_ADD_DEL, mp); - M (IP_ADDRESS_DUMP, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->is_ipv6 = ipv6_set; - S (mp); + clib_memcpy (mp->localsid, &localsid, sizeof (mp->localsid)); - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + if (nexthop_set) + { + clib_memcpy (&mp->nh_addr.un, &nh_addr, sizeof (mp->nh_addr.un)); + } + mp->behavior = behavior; + mp->sw_if_index = ntohl (sw_if_index); + mp->fib_table = ntohl (fib_table); + mp->end_psp = end_psp; + mp->is_del = is_del; + S (mp); W (ret); return ret; } static int -api_ip_dump (vat_main_t * vam) +api_ioam_enable (vat_main_t * vam) { - vl_api_ip_dump_t *mp; - vl_api_control_ping_t *mp_ping; - unformat_input_t *in = vam->input; - int ipv4_set = 0; - int ipv6_set = 0; - int is_ipv6; - int i; + unformat_input_t *input = vam->input; + vl_api_ioam_enable_t *mp; + u32 id = 0; + int has_trace_option = 0; + int has_pot_option = 0; + int has_seqno_option = 0; + int has_analyse_option = 0; int ret; - while (unformat_check_input (in) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (in, "ipv4")) - ipv4_set = 1; - else if (unformat (in, "ipv6")) - ipv6_set = 1; + if (unformat (input, "trace")) + has_trace_option = 1; + else if (unformat (input, "pot")) + has_pot_option = 1; + else if (unformat (input, "seqno")) + has_seqno_option = 1; + else if (unformat (input, "analyse")) + has_analyse_option = 1; else break; } + M (IOAM_ENABLE, mp); + mp->id = htons (id); + mp->seqno = has_seqno_option; + mp->analyse = has_analyse_option; + mp->pot_enable = has_pot_option; + mp->trace_enable = has_trace_option; - if (ipv4_set && ipv6_set) - { - errmsg ("ipv4 and ipv6 flags cannot be both set"); - return -99; - } + S (mp); + W (ret); + return ret; +} - if ((!ipv4_set) && (!ipv6_set)) + +static int +api_ioam_disable (vat_main_t * vam) +{ + vl_api_ioam_disable_t *mp; + int ret; + + M (IOAM_DISABLE, mp); + S (mp); + W (ret); + return ret; +} + +#define foreach_tcp_proto_field \ +_(src_port) \ +_(dst_port) + +#define foreach_udp_proto_field \ +_(src_port) \ +_(dst_port) + +#define foreach_ip4_proto_field \ +_(src_address) \ +_(dst_address) \ +_(tos) \ +_(length) \ +_(fragment_id) \ +_(ttl) \ +_(protocol) \ +_(checksum) + +typedef struct +{ + u16 src_port, dst_port; +} tcpudp_header_t; + +#if VPP_API_TEST_BUILTIN == 0 +uword +unformat_tcp_mask (unformat_input_t * input, va_list * args) +{ + u8 **maskp = va_arg (*args, u8 **); + u8 *mask = 0; + u8 found_something = 0; + tcp_header_t *tcp; + +#define _(a) u8 a=0; + foreach_tcp_proto_field; +#undef _ + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - errmsg ("no ipv4 nor ipv6 flag set"); - return -99; + if (0); +#define _(a) else if (unformat (input, #a)) a=1; + foreach_tcp_proto_field +#undef _ + else + break; } - is_ipv6 = ipv6_set; - vam->is_ipv6 = is_ipv6; +#define _(a) found_something += a; + foreach_tcp_proto_field; +#undef _ + + if (found_something == 0) + return 0; - /* free old data */ - for (i = 0; i < vec_len (vam->ip_details_by_sw_if_index[is_ipv6]); i++) - { - vec_free (vam->ip_details_by_sw_if_index[is_ipv6][i].addr); - } - vec_free (vam->ip_details_by_sw_if_index[is_ipv6]); + vec_validate (mask, sizeof (*tcp) - 1); - M (IP_DUMP, mp); - mp->is_ipv6 = ipv6_set; - S (mp); + tcp = (tcp_header_t *) mask; - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); +#define _(a) if (a) clib_memset (&tcp->a, 0xff, sizeof (tcp->a)); + foreach_tcp_proto_field; +#undef _ - W (ret); - return ret; + *maskp = mask; + return 1; } -static int -api_ipsec_spd_add_del (vat_main_t * vam) +uword +unformat_udp_mask (unformat_input_t * input, va_list * args) { - unformat_input_t *i = vam->input; - vl_api_ipsec_spd_add_del_t *mp; - u32 spd_id = ~0; - u8 is_add = 1; - int ret; + u8 **maskp = va_arg (*args, u8 **); + u8 *mask = 0; + u8 found_something = 0; + udp_header_t *udp; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "spd_id %d", &spd_id)) - ; - else if (unformat (i, "del")) - is_add = 0; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - if (spd_id == ~0) +#define _(a) u8 a=0; + foreach_udp_proto_field; +#undef _ + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - errmsg ("spd_id must be set"); - return -99; + if (0); +#define _(a) else if (unformat (input, #a)) a=1; + foreach_udp_proto_field +#undef _ + else + break; } - M (IPSEC_SPD_ADD_DEL, mp); +#define _(a) found_something += a; + foreach_udp_proto_field; +#undef _ - mp->spd_id = ntohl (spd_id); - mp->is_add = is_add; + if (found_something == 0) + return 0; - S (mp); - W (ret); - return ret; + vec_validate (mask, sizeof (*udp) - 1); + + udp = (udp_header_t *) mask; + +#define _(a) if (a) clib_memset (&udp->a, 0xff, sizeof (udp->a)); + foreach_udp_proto_field; +#undef _ + + *maskp = mask; + return 1; } -static int -api_ipsec_interface_add_del_spd (vat_main_t * vam) +uword +unformat_l4_mask (unformat_input_t * input, va_list * args) { - unformat_input_t *i = vam->input; - vl_api_ipsec_interface_add_del_spd_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u32 spd_id = (u32) ~ 0; - u8 is_add = 1; - int ret; + u8 **maskp = va_arg (*args, u8 **); + u16 src_port = 0, dst_port = 0; + tcpudp_header_t *tcpudp; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "spd_id %d", &spd_id)) - ; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; + if (unformat (input, "tcp %U", unformat_tcp_mask, maskp)) + return 1; + else if (unformat (input, "udp %U", unformat_udp_mask, maskp)) + return 1; + else if (unformat (input, "src_port")) + src_port = 0xFFFF; + else if (unformat (input, "dst_port")) + dst_port = 0xFFFF; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - + return 0; } - if (spd_id == (u32) ~ 0) - { - errmsg ("spd_id must be set"); - return -99; - } + if (!src_port && !dst_port) + return 0; - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } + u8 *mask = 0; + vec_validate (mask, sizeof (tcpudp_header_t) - 1); - M (IPSEC_INTERFACE_ADD_DEL_SPD, mp); + tcpudp = (tcpudp_header_t *) mask; + tcpudp->src_port = src_port; + tcpudp->dst_port = dst_port; - mp->spd_id = ntohl (spd_id); - mp->sw_if_index = ntohl (sw_if_index); - mp->is_add = is_add; + *maskp = mask; - S (mp); - W (ret); - return ret; + return 1; } -static int -api_ipsec_spd_entry_add_del (vat_main_t * vam) +uword +unformat_ip4_mask (unformat_input_t * input, va_list * args) { - unformat_input_t *i = vam->input; - vl_api_ipsec_spd_entry_add_del_t *mp; - u8 is_add = 1, is_outbound = 0; - u32 spd_id = 0, sa_id = 0, protocol = 0, policy = 0; - i32 priority = 0; - u32 rport_start = 0, rport_stop = (u32) ~ 0; - u32 lport_start = 0, lport_stop = (u32) ~ 0; - vl_api_address_t laddr_start = { }, laddr_stop = - { - }, raddr_start = - { - }, raddr_stop = - { - }; - int ret; + u8 **maskp = va_arg (*args, u8 **); + u8 *mask = 0; + u8 found_something = 0; + ip4_header_t *ip; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) +#define _(a) u8 a=0; + foreach_ip4_proto_field; +#undef _ + u8 version = 0; + u8 hdr_length = 0; + + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) - is_add = 0; - if (unformat (i, "outbound")) - is_outbound = 1; - if (unformat (i, "inbound")) - is_outbound = 0; - else if (unformat (i, "spd_id %d", &spd_id)) - ; - else if (unformat (i, "sa_id %d", &sa_id)) - ; - else if (unformat (i, "priority %d", &priority)) - ; - else if (unformat (i, "protocol %d", &protocol)) - ; - else if (unformat (i, "lport_start %d", &lport_start)) - ; - else if (unformat (i, "lport_stop %d", &lport_stop)) - ; - else if (unformat (i, "rport_start %d", &rport_start)) - ; - else if (unformat (i, "rport_stop %d", &rport_stop)) - ; - else if (unformat (i, "laddr_start %U", - unformat_vl_api_address, &laddr_start)) - ; - else if (unformat (i, "laddr_stop %U", unformat_vl_api_address, - &laddr_stop)) - ; - else if (unformat (i, "raddr_start %U", unformat_vl_api_address, - &raddr_start)) - ; - else if (unformat (i, "raddr_stop %U", unformat_vl_api_address, - &raddr_stop)) - ; - else - if (unformat (i, "action %U", unformat_ipsec_policy_action, &policy)) - { - if (policy == IPSEC_POLICY_ACTION_RESOLVE) - { - clib_warning ("unsupported action: 'resolve'"); - return -99; - } - } - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + if (unformat (input, "version")) + version = 1; + else if (unformat (input, "hdr_length")) + hdr_length = 1; + else if (unformat (input, "src")) + src_address = 1; + else if (unformat (input, "dst")) + dst_address = 1; + else if (unformat (input, "proto")) + protocol = 1; +#define _(a) else if (unformat (input, #a)) a=1; + foreach_ip4_proto_field +#undef _ + else + break; } - M (IPSEC_SPD_ENTRY_ADD_DEL, mp); +#define _(a) found_something += a; + foreach_ip4_proto_field; +#undef _ - mp->is_add = is_add; + if (found_something == 0) + return 0; + + vec_validate (mask, sizeof (*ip) - 1); + + ip = (ip4_header_t *) mask; + +#define _(a) if (a) clib_memset (&ip->a, 0xff, sizeof (ip->a)); + foreach_ip4_proto_field; +#undef _ - mp->entry.spd_id = ntohl (spd_id); - mp->entry.priority = ntohl (priority); - mp->entry.is_outbound = is_outbound; + ip->ip_version_and_header_length = 0; - clib_memcpy (&mp->entry.remote_address_start, &raddr_start, - sizeof (vl_api_address_t)); - clib_memcpy (&mp->entry.remote_address_stop, &raddr_stop, - sizeof (vl_api_address_t)); - clib_memcpy (&mp->entry.local_address_start, &laddr_start, - sizeof (vl_api_address_t)); - clib_memcpy (&mp->entry.local_address_stop, &laddr_stop, - sizeof (vl_api_address_t)); + if (version) + ip->ip_version_and_header_length |= 0xF0; - mp->entry.protocol = (u8) protocol; - mp->entry.local_port_start = ntohs ((u16) lport_start); - mp->entry.local_port_stop = ntohs ((u16) lport_stop); - mp->entry.remote_port_start = ntohs ((u16) rport_start); - mp->entry.remote_port_stop = ntohs ((u16) rport_stop); - mp->entry.policy = (u8) policy; - mp->entry.sa_id = ntohl (sa_id); + if (hdr_length) + ip->ip_version_and_header_length |= 0x0F; - S (mp); - W (ret); - return ret; + *maskp = mask; + return 1; } -static int -api_ipsec_sad_entry_add_del (vat_main_t * vam) +#define foreach_ip6_proto_field \ +_(src_address) \ +_(dst_address) \ +_(payload_length) \ +_(hop_limit) \ +_(protocol) + +uword +unformat_ip6_mask (unformat_input_t * input, va_list * args) { - unformat_input_t *i = vam->input; - vl_api_ipsec_sad_entry_add_del_t *mp; - u32 sad_id = 0, spi = 0; - u8 *ck = 0, *ik = 0; - u8 is_add = 1; + u8 **maskp = va_arg (*args, u8 **); + u8 *mask = 0; + u8 found_something = 0; + ip6_header_t *ip; + u32 ip_version_traffic_class_and_flow_label; - vl_api_ipsec_crypto_alg_t crypto_alg = IPSEC_API_CRYPTO_ALG_NONE; - vl_api_ipsec_integ_alg_t integ_alg = IPSEC_API_INTEG_ALG_NONE; - vl_api_ipsec_sad_flags_t flags = IPSEC_API_SAD_FLAG_NONE; - vl_api_ipsec_proto_t protocol = IPSEC_API_PROTO_AH; - vl_api_address_t tun_src, tun_dst; - int ret; +#define _(a) u8 a=0; + foreach_ip6_proto_field; +#undef _ + u8 version = 0; + u8 traffic_class = 0; + u8 flow_label = 0; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "sad_id %d", &sad_id)) - ; - else if (unformat (i, "spi %d", &spi)) - ; - else if (unformat (i, "esp")) - protocol = IPSEC_API_PROTO_ESP; - else - if (unformat (i, "tunnel_src %U", unformat_vl_api_address, &tun_src)) - { - flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL; - if (ADDRESS_IP6 == tun_src.af) - flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL_V6; - } - else - if (unformat (i, "tunnel_dst %U", unformat_vl_api_address, &tun_dst)) - { - flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL; - if (ADDRESS_IP6 == tun_src.af) - flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL_V6; - } - else - if (unformat (i, "crypto_alg %U", - unformat_ipsec_api_crypto_alg, &crypto_alg)) - ; - else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck)) - ; - else if (unformat (i, "integ_alg %U", - unformat_ipsec_api_integ_alg, &integ_alg)) - ; - else if (unformat (i, "integ_key %U", unformat_hex_string, &ik)) - ; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + if (unformat (input, "version")) + version = 1; + else if (unformat (input, "traffic-class")) + traffic_class = 1; + else if (unformat (input, "flow-label")) + flow_label = 1; + else if (unformat (input, "src")) + src_address = 1; + else if (unformat (input, "dst")) + dst_address = 1; + else if (unformat (input, "proto")) + protocol = 1; +#define _(a) else if (unformat (input, #a)) a=1; + foreach_ip6_proto_field +#undef _ + else + break; } - M (IPSEC_SAD_ENTRY_ADD_DEL, mp); +#define _(a) found_something += a; + foreach_ip6_proto_field; +#undef _ - mp->is_add = is_add; - mp->entry.sad_id = ntohl (sad_id); - mp->entry.protocol = protocol; - mp->entry.spi = ntohl (spi); - mp->entry.flags = flags; + if (found_something == 0) + return 0; - mp->entry.crypto_algorithm = crypto_alg; - mp->entry.integrity_algorithm = integ_alg; - mp->entry.crypto_key.length = vec_len (ck); - mp->entry.integrity_key.length = vec_len (ik); + vec_validate (mask, sizeof (*ip) - 1); - if (mp->entry.crypto_key.length > sizeof (mp->entry.crypto_key.data)) - mp->entry.crypto_key.length = sizeof (mp->entry.crypto_key.data); + ip = (ip6_header_t *) mask; - if (mp->entry.integrity_key.length > sizeof (mp->entry.integrity_key.data)) - mp->entry.integrity_key.length = sizeof (mp->entry.integrity_key.data); +#define _(a) if (a) clib_memset (&ip->a, 0xff, sizeof (ip->a)); + foreach_ip6_proto_field; +#undef _ - if (ck) - clib_memcpy (mp->entry.crypto_key.data, ck, mp->entry.crypto_key.length); - if (ik) - clib_memcpy (mp->entry.integrity_key.data, ik, - mp->entry.integrity_key.length); + ip_version_traffic_class_and_flow_label = 0; - if (flags & IPSEC_API_SAD_FLAG_IS_TUNNEL) - { - clib_memcpy (&mp->entry.tunnel_src, &tun_src, - sizeof (mp->entry.tunnel_src)); - clib_memcpy (&mp->entry.tunnel_dst, &tun_dst, - sizeof (mp->entry.tunnel_dst)); - } + if (version) + ip_version_traffic_class_and_flow_label |= 0xF0000000; - S (mp); - W (ret); - return ret; + if (traffic_class) + ip_version_traffic_class_and_flow_label |= 0x0FF00000; + + if (flow_label) + ip_version_traffic_class_and_flow_label |= 0x000FFFFF; + + ip->ip_version_traffic_class_and_flow_label = + clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label); + + *maskp = mask; + return 1; } -static int -api_ipsec_tunnel_if_add_del (vat_main_t * vam) +uword +unformat_l3_mask (unformat_input_t * input, va_list * args) { - unformat_input_t *i = vam->input; - vl_api_ipsec_tunnel_if_add_del_t *mp; - u32 local_spi = 0, remote_spi = 0; - u32 crypto_alg = 0, integ_alg = 0; - u8 *lck = NULL, *rck = NULL; - u8 *lik = NULL, *rik = NULL; - vl_api_address_t local_ip = { 0 }; - vl_api_address_t remote_ip = { 0 }; - f64 before = 0; - u8 is_add = 1; - u8 esn = 0; - u8 anti_replay = 0; - u8 renumber = 0; - u32 instance = ~0; - u32 count = 1, jj; - int ret = -1; + u8 **maskp = va_arg (*args, u8 **); - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "esn")) - esn = 1; - else if (unformat (i, "anti-replay")) - anti_replay = 1; - else if (unformat (i, "count %d", &count)) - ; - else if (unformat (i, "local_spi %d", &local_spi)) - ; - else if (unformat (i, "remote_spi %d", &remote_spi)) - ; - else - if (unformat (i, "local_ip %U", unformat_vl_api_address, &local_ip)) - ; - else - if (unformat (i, "remote_ip %U", unformat_vl_api_address, &remote_ip)) - ; - else if (unformat (i, "local_crypto_key %U", unformat_hex_string, &lck)) - ; - else - if (unformat (i, "remote_crypto_key %U", unformat_hex_string, &rck)) - ; - else if (unformat (i, "local_integ_key %U", unformat_hex_string, &lik)) - ; - else if (unformat (i, "remote_integ_key %U", unformat_hex_string, &rik)) - ; - else - if (unformat - (i, "crypto_alg %U", unformat_ipsec_api_crypto_alg, &crypto_alg)) - { - if (crypto_alg >= IPSEC_CRYPTO_N_ALG) - { - errmsg ("unsupported crypto-alg: '%U'\n", - format_ipsec_crypto_alg, crypto_alg); - return -99; - } - } + if (unformat (input, "ip4 %U", unformat_ip4_mask, maskp)) + return 1; + else if (unformat (input, "ip6 %U", unformat_ip6_mask, maskp)) + return 1; else - if (unformat - (i, "integ_alg %U", unformat_ipsec_api_integ_alg, &integ_alg)) - { - if (integ_alg >= IPSEC_INTEG_N_ALG) - { - errmsg ("unsupported integ-alg: '%U'\n", - format_ipsec_integ_alg, integ_alg); - return -99; - } - } - else if (unformat (i, "instance %u", &instance)) - renumber = 1; + break; + } + return 0; +} + +uword +unformat_l2_mask (unformat_input_t * input, va_list * args) +{ + u8 **maskp = va_arg (*args, u8 **); + u8 *mask = 0; + u8 src = 0; + u8 dst = 0; + u8 proto = 0; + u8 tag1 = 0; + u8 tag2 = 0; + u8 ignore_tag1 = 0; + u8 ignore_tag2 = 0; + u8 cos1 = 0; + u8 cos2 = 0; + u8 dot1q = 0; + u8 dot1ad = 0; + int len = 14; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "src")) + src = 1; + else if (unformat (input, "dst")) + dst = 1; + else if (unformat (input, "proto")) + proto = 1; + else if (unformat (input, "tag1")) + tag1 = 1; + else if (unformat (input, "tag2")) + tag2 = 1; + else if (unformat (input, "ignore-tag1")) + ignore_tag1 = 1; + else if (unformat (input, "ignore-tag2")) + ignore_tag2 = 1; + else if (unformat (input, "cos1")) + cos1 = 1; + else if (unformat (input, "cos2")) + cos2 = 1; + else if (unformat (input, "dot1q")) + dot1q = 1; + else if (unformat (input, "dot1ad")) + dot1ad = 1; else - { - errmsg ("parse error '%U'\n", format_unformat_error, i); - return -99; - } - } - - if (count > 1) - { - /* Turn on async mode */ - vam->async_mode = 1; - vam->async_errors = 0; - before = vat_time_now (vam); + break; } + if ((src + dst + proto + tag1 + tag2 + dot1q + dot1ad + + ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0) + return 0; - for (jj = 0; jj < count; jj++) - { - M (IPSEC_TUNNEL_IF_ADD_DEL, mp); - - mp->is_add = is_add; - mp->esn = esn; - mp->anti_replay = anti_replay; - - if (jj > 0) - increment_address (&remote_ip); - - clib_memcpy (&mp->local_ip, &local_ip, sizeof (local_ip)); - clib_memcpy (&mp->remote_ip, &remote_ip, sizeof (remote_ip)); - - mp->local_spi = htonl (local_spi + jj); - mp->remote_spi = htonl (remote_spi + jj); - mp->crypto_alg = (u8) crypto_alg; - - mp->local_crypto_key_len = 0; - if (lck) - { - mp->local_crypto_key_len = vec_len (lck); - if (mp->local_crypto_key_len > sizeof (mp->local_crypto_key)) - mp->local_crypto_key_len = sizeof (mp->local_crypto_key); - clib_memcpy (mp->local_crypto_key, lck, mp->local_crypto_key_len); - } + if (tag1 || ignore_tag1 || cos1 || dot1q) + len = 18; + if (tag2 || ignore_tag2 || cos2 || dot1ad) + len = 22; - mp->remote_crypto_key_len = 0; - if (rck) - { - mp->remote_crypto_key_len = vec_len (rck); - if (mp->remote_crypto_key_len > sizeof (mp->remote_crypto_key)) - mp->remote_crypto_key_len = sizeof (mp->remote_crypto_key); - clib_memcpy (mp->remote_crypto_key, rck, mp->remote_crypto_key_len); - } + vec_validate (mask, len - 1); - mp->integ_alg = (u8) integ_alg; + if (dst) + clib_memset (mask, 0xff, 6); - mp->local_integ_key_len = 0; - if (lik) - { - mp->local_integ_key_len = vec_len (lik); - if (mp->local_integ_key_len > sizeof (mp->local_integ_key)) - mp->local_integ_key_len = sizeof (mp->local_integ_key); - clib_memcpy (mp->local_integ_key, lik, mp->local_integ_key_len); - } + if (src) + clib_memset (mask + 6, 0xff, 6); - mp->remote_integ_key_len = 0; - if (rik) + if (tag2 || dot1ad) + { + /* inner vlan tag */ + if (tag2) { - mp->remote_integ_key_len = vec_len (rik); - if (mp->remote_integ_key_len > sizeof (mp->remote_integ_key)) - mp->remote_integ_key_len = sizeof (mp->remote_integ_key); - clib_memcpy (mp->remote_integ_key, rik, mp->remote_integ_key_len); + mask[19] = 0xff; + mask[18] = 0x0f; } - - if (renumber) + if (cos2) + mask[18] |= 0xe0; + if (proto) + mask[21] = mask[20] = 0xff; + if (tag1) { - mp->renumber = renumber; - mp->show_instance = ntohl (instance); + mask[15] = 0xff; + mask[14] = 0x0f; } - S (mp); + if (cos1) + mask[14] |= 0xe0; + *maskp = mask; + return 1; } - - /* When testing multiple add/del ops, use a control-ping to sync */ - if (count > 1) + if (tag1 | dot1q) { - vl_api_control_ping_t *mp_ping; - f64 after; - f64 timeout; - - /* Shut off async mode */ - vam->async_mode = 0; - - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - timeout = vat_time_now (vam) + 1.0; - while (vat_time_now (vam) < timeout) - if (vam->result_ready == 1) - goto out; - vam->retval = -99; - - out: - if (vam->retval == -99) - errmsg ("timeout"); - - if (vam->async_errors > 0) + if (tag1) { - errmsg ("%d asynchronous errors", vam->async_errors); - vam->retval = -98; + mask[15] = 0xff; + mask[14] = 0x0f; } - vam->async_errors = 0; - after = vat_time_now (vam); - - /* slim chance, but we might have eaten SIGTERM on the first iteration */ - if (jj > 0) - count = jj; + if (cos1) + mask[14] |= 0xe0; + if (proto) + mask[16] = mask[17] = 0xff; - print (vam->ofp, "%d tunnels in %.6f secs, %.2f tunnels/sec", - count, after - before, count / (after - before)); - } - else - { - /* Wait for a reply... */ - W (ret); - return ret; + *maskp = mask; + return 1; } + if (cos2) + mask[18] |= 0xe0; + if (cos1) + mask[14] |= 0xe0; + if (proto) + mask[12] = mask[13] = 0xff; - return ret; + *maskp = mask; + return 1; } -static void -vl_api_ipsec_sa_details_t_handler (vl_api_ipsec_sa_details_t * mp) +uword +unformat_classify_mask (unformat_input_t * input, va_list * args) { - vat_main_t *vam = &vat_main; - - print (vam->ofp, "sa_id %u sw_if_index %u spi %u proto %u crypto_alg %u " - "crypto_key %U integ_alg %u integ_key %U flags %x " - "tunnel_src_addr %U tunnel_dst_addr %U " - "salt %u seq_outbound %lu last_seq_inbound %lu " - "replay_window %lu\n", - ntohl (mp->entry.sad_id), - ntohl (mp->sw_if_index), - ntohl (mp->entry.spi), - ntohl (mp->entry.protocol), - ntohl (mp->entry.crypto_algorithm), - format_hex_bytes, mp->entry.crypto_key.data, - mp->entry.crypto_key.length, ntohl (mp->entry.integrity_algorithm), - format_hex_bytes, mp->entry.integrity_key.data, - mp->entry.integrity_key.length, ntohl (mp->entry.flags), - format_vl_api_address, &mp->entry.tunnel_src, format_vl_api_address, - &mp->entry.tunnel_dst, ntohl (mp->salt), - clib_net_to_host_u64 (mp->seq_outbound), - clib_net_to_host_u64 (mp->last_seq_inbound), - clib_net_to_host_u64 (mp->replay_window)); -} - -#define vl_api_ipsec_sa_details_t_endian vl_noop_handler -#define vl_api_ipsec_sa_details_t_print vl_noop_handler + u8 **maskp = va_arg (*args, u8 **); + u32 *skipp = va_arg (*args, u32 *); + u32 *matchp = va_arg (*args, u32 *); + u32 match; + u8 *mask = 0; + u8 *l2 = 0; + u8 *l3 = 0; + u8 *l4 = 0; + int i; -static void vl_api_ipsec_sa_details_t_handler_json - (vl_api_ipsec_sa_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - vl_api_ipsec_sad_flags_t flags; + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "hex %U", unformat_hex_string, &mask)) + ; + else if (unformat (input, "l2 %U", unformat_l2_mask, &l2)) + ; + else if (unformat (input, "l3 %U", unformat_l3_mask, &l3)) + ; + else if (unformat (input, "l4 %U", unformat_l4_mask, &l4)) + ; + else + break; + } - if (VAT_JSON_ARRAY != vam->json_tree.type) + if (l4 && !l3) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + vec_free (mask); + vec_free (l2); + vec_free (l4); + return 0; } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - vat_json_object_add_uint (node, "sa_id", ntohl (mp->entry.sad_id)); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_uint (node, "spi", ntohl (mp->entry.spi)); - vat_json_object_add_uint (node, "proto", ntohl (mp->entry.protocol)); - vat_json_object_add_uint (node, "crypto_alg", - ntohl (mp->entry.crypto_algorithm)); - vat_json_object_add_uint (node, "integ_alg", - ntohl (mp->entry.integrity_algorithm)); - flags = ntohl (mp->entry.flags); - vat_json_object_add_uint (node, "use_esn", - ! !(flags & IPSEC_API_SAD_FLAG_USE_ESN)); - vat_json_object_add_uint (node, "use_anti_replay", - ! !(flags & IPSEC_API_SAD_FLAG_USE_ANTI_REPLAY)); - vat_json_object_add_uint (node, "is_tunnel", - ! !(flags & IPSEC_API_SAD_FLAG_IS_TUNNEL)); - vat_json_object_add_uint (node, "is_tunnel_ip6", - ! !(flags & IPSEC_API_SAD_FLAG_IS_TUNNEL_V6)); - vat_json_object_add_uint (node, "udp_encap", - ! !(flags & IPSEC_API_SAD_FLAG_UDP_ENCAP)); - vat_json_object_add_bytes (node, "crypto_key", mp->entry.crypto_key.data, - mp->entry.crypto_key.length); - vat_json_object_add_bytes (node, "integ_key", mp->entry.integrity_key.data, - mp->entry.integrity_key.length); - vat_json_object_add_address (node, "src", &mp->entry.tunnel_src); - vat_json_object_add_address (node, "dst", &mp->entry.tunnel_dst); - vat_json_object_add_uint (node, "replay_window", - clib_net_to_host_u64 (mp->replay_window)); -} + if (mask || l2 || l3 || l4) + { + if (l2 || l3 || l4) + { + /* "With a free Ethernet header in every package" */ + if (l2 == 0) + vec_validate (l2, 13); + mask = l2; + if (vec_len (l3)) + { + vec_append (mask, l3); + vec_free (l3); + } + if (vec_len (l4)) + { + vec_append (mask, l4); + vec_free (l4); + } + } -static int -api_ipsec_sa_dump (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ipsec_sa_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 sa_id = ~0; - int ret; + /* Scan forward looking for the first significant mask octet */ + for (i = 0; i < vec_len (mask); i++) + if (mask[i]) + break; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "sa_id %d", &sa_id)) - ; - else + /* compute (skip, match) params */ + *skipp = i / sizeof (u32x4); + vec_delete (mask, *skipp * sizeof (u32x4), 0); + + /* Pad mask to an even multiple of the vector size */ + while (vec_len (mask) % sizeof (u32x4)) + vec_add1 (mask, 0); + + match = vec_len (mask) / sizeof (u32x4); + + for (i = match * sizeof (u32x4); i > 0; i -= sizeof (u32x4)) { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; + u64 *tmp = (u64 *) (mask + (i - sizeof (u32x4))); + if (*tmp || *(tmp + 1)) + break; + match--; } - } - - M (IPSEC_SA_DUMP, mp); + if (match == 0) + clib_warning ("BUG: match 0"); - mp->sa_id = ntohl (sa_id); + _vec_len (mask) = match * sizeof (u32x4); - S (mp); + *matchp = match; + *maskp = mask; - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); + return 1; + } - W (ret); - return ret; + return 0; } +#endif /* VPP_API_TEST_BUILTIN */ -static int -api_ipsec_tunnel_if_set_sa (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ipsec_tunnel_if_set_sa_t *mp; - u32 sw_if_index = ~0; - u32 sa_id = ~0; - u8 is_outbound = (u8) ~ 0; - int ret; +#define foreach_l2_next \ +_(drop, DROP) \ +_(ethernet, ETHERNET_INPUT) \ +_(ip4, IP4_INPUT) \ +_(ip6, IP6_INPUT) - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - ; - else if (unformat (i, "sa_id %d", &sa_id)) - ; - else if (unformat (i, "outbound")) - is_outbound = 1; - else if (unformat (i, "inbound")) - is_outbound = 0; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } +uword +unformat_l2_next_index (unformat_input_t * input, va_list * args) +{ + u32 *miss_next_indexp = va_arg (*args, u32 *); + u32 next_index = 0; + u32 tmp; - if (sw_if_index == ~0) - { - errmsg ("interface must be specified"); - return -99; - } +#define _(n,N) \ + if (unformat (input, #n)) { next_index = L2_INPUT_CLASSIFY_NEXT_##N; goto out;} + foreach_l2_next; +#undef _ - if (sa_id == ~0) + if (unformat (input, "%d", &tmp)) { - errmsg ("SA ID must be specified"); - return -99; + next_index = tmp; + goto out; } - M (IPSEC_TUNNEL_IF_SET_SA, mp); - - mp->sw_if_index = htonl (sw_if_index); - mp->sa_id = htonl (sa_id); - mp->is_outbound = is_outbound; - - S (mp); - W (ret); + return 0; - return ret; +out: + *miss_next_indexp = next_index; + return 1; } -static int -api_get_first_msg_id (vat_main_t * vam) +#define foreach_ip_next \ +_(drop, DROP) \ +_(local, LOCAL) \ +_(rewrite, REWRITE) + +uword +api_unformat_ip_next_index (unformat_input_t * input, va_list * args) { - vl_api_get_first_msg_id_t *mp; - unformat_input_t *i = vam->input; - u8 *name; - u8 name_set = 0; - int ret; + u32 *miss_next_indexp = va_arg (*args, u32 *); + u32 next_index = 0; + u32 tmp; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "client %s", &name)) - name_set = 1; - else - break; - } +#define _(n,N) \ + if (unformat (input, #n)) { next_index = IP_LOOKUP_NEXT_##N; goto out;} + foreach_ip_next; +#undef _ - if (name_set == 0) + if (unformat (input, "%d", &tmp)) { - errmsg ("missing client name"); - return -99; + next_index = tmp; + goto out; } - vec_add1 (name, 0); - if (vec_len (name) > 63) - { - errmsg ("client name too long"); - return -99; - } + return 0; - M (GET_FIRST_MSG_ID, mp); - clib_memcpy (mp->name, name, vec_len (name)); - S (mp); - W (ret); - return ret; +out: + *miss_next_indexp = next_index; + return 1; } -static int -api_cop_interface_enable_disable (vat_main_t * vam) +#define foreach_acl_next \ +_(deny, DENY) + +uword +api_unformat_acl_next_index (unformat_input_t * input, va_list * args) { - unformat_input_t *line_input = vam->input; - vl_api_cop_interface_enable_disable_t *mp; - u32 sw_if_index = ~0; - u8 enable_disable = 1; - int ret; + u32 *miss_next_indexp = va_arg (*args, u32 *); + u32 next_index = 0; + u32 tmp; - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) +#define _(n,N) \ + if (unformat (input, #n)) { next_index = ACL_NEXT_INDEX_##N; goto out;} + foreach_acl_next; +#undef _ + + if (unformat (input, "permit")) { - if (unformat (line_input, "disable")) - enable_disable = 0; - if (unformat (line_input, "enable")) - enable_disable = 1; - else if (unformat (line_input, "%U", api_unformat_sw_if_index, - vam, &sw_if_index)) - ; - else if (unformat (line_input, "sw_if_index %d", &sw_if_index)) - ; - else - break; + next_index = ~0; + goto out; } - - if (sw_if_index == ~0) + else if (unformat (input, "%d", &tmp)) { - errmsg ("missing interface name or sw_if_index"); - return -99; + next_index = tmp; + goto out; } - /* Construct the API message */ - M (COP_INTERFACE_ENABLE_DISABLE, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->enable_disable = enable_disable; + return 0; - /* send it... */ - S (mp); - /* Wait for the reply */ - W (ret); - return ret; +out: + *miss_next_indexp = next_index; + return 1; +} + +uword +unformat_policer_precolor (unformat_input_t * input, va_list * args) +{ + u32 *r = va_arg (*args, u32 *); + + if (unformat (input, "conform-color")) + *r = POLICE_CONFORM; + else if (unformat (input, "exceed-color")) + *r = POLICE_EXCEED; + else + return 0; + + return 1; } static int -api_cop_whitelist_enable_disable (vat_main_t * vam) +api_classify_add_del_table (vat_main_t * vam) { - unformat_input_t *line_input = vam->input; - vl_api_cop_whitelist_enable_disable_t *mp; - u32 sw_if_index = ~0; - u8 ip4 = 0, ip6 = 0, default_cop = 0; - u32 fib_id = 0; + unformat_input_t *i = vam->input; + vl_api_classify_add_del_table_t *mp; + + u32 nbuckets = 2; + u32 skip = ~0; + u32 match = ~0; + int is_add = 1; + int del_chain = 0; + u32 table_index = ~0; + u32 next_table_index = ~0; + u32 miss_next_index = ~0; + u32 memory_size = 32 << 20; + u8 *mask = 0; + u32 current_data_flag = 0; + int current_data_offset = 0; int ret; - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "ip4")) - ip4 = 1; - else if (unformat (line_input, "ip6")) - ip6 = 1; - else if (unformat (line_input, "default")) - default_cop = 1; - else if (unformat (line_input, "%U", api_unformat_sw_if_index, - vam, &sw_if_index)) + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "del-chain")) + { + is_add = 0; + del_chain = 1; + } + else if (unformat (i, "buckets %d", &nbuckets)) + ; + else if (unformat (i, "memory_size %d", &memory_size)) + ; + else if (unformat (i, "skip %d", &skip)) + ; + else if (unformat (i, "match %d", &match)) + ; + else if (unformat (i, "table %d", &table_index)) + ; + else if (unformat (i, "mask %U", unformat_classify_mask, + &mask, &skip, &match)) + ; + else if (unformat (i, "next-table %d", &next_table_index)) + ; + else if (unformat (i, "miss-next %U", api_unformat_ip_next_index, + &miss_next_index)) + ; + else if (unformat (i, "l2-miss-next %U", unformat_l2_next_index, + &miss_next_index)) ; - else if (unformat (line_input, "sw_if_index %d", &sw_if_index)) + else if (unformat (i, "acl-miss-next %U", api_unformat_acl_next_index, + &miss_next_index)) ; - else if (unformat (line_input, "fib-id %d", &fib_id)) + else if (unformat (i, "current-data-flag %d", ¤t_data_flag)) + ; + else if (unformat (i, "current-data-offset %d", ¤t_data_offset)) ; else break; } - if (sw_if_index == ~0) + if (is_add && mask == 0) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("Mask required"); return -99; } - /* Construct the API message */ - M (COP_WHITELIST_ENABLE_DISABLE, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->fib_id = ntohl (fib_id); - mp->ip4 = ip4; - mp->ip6 = ip6; - mp->default_cop = default_cop; + if (is_add && skip == ~0) + { + errmsg ("skip count required"); + return -99; + } - /* send it... */ - S (mp); - /* Wait for the reply */ - W (ret); - return ret; -} + if (is_add && match == ~0) + { + errmsg ("match count required"); + return -99; + } -static int -api_get_node_graph (vat_main_t * vam) -{ - vl_api_get_node_graph_t *mp; - int ret; + if (!is_add && table_index == ~0) + { + errmsg ("table index required for delete"); + return -99; + } - M (GET_NODE_GRAPH, mp); + M2 (CLASSIFY_ADD_DEL_TABLE, mp, vec_len (mask)); + + mp->is_add = is_add; + mp->del_chain = del_chain; + mp->table_index = ntohl (table_index); + mp->nbuckets = ntohl (nbuckets); + mp->memory_size = ntohl (memory_size); + mp->skip_n_vectors = ntohl (skip); + mp->match_n_vectors = ntohl (match); + mp->next_table_index = ntohl (next_table_index); + mp->miss_next_index = ntohl (miss_next_index); + mp->current_data_flag = ntohl (current_data_flag); + mp->current_data_offset = ntohl (current_data_offset); + mp->mask_len = ntohl (vec_len (mask)); + clib_memcpy (mp->mask, mask, vec_len (mask)); + + vec_free (mask); - /* send it... */ S (mp); - /* Wait for the reply */ W (ret); return ret; } -/* *INDENT-OFF* */ -/** Used for parsing LISP eids */ -typedef CLIB_PACKED(struct{ - u8 addr[16]; /**< eid address */ - u32 len; /**< prefix length if IP */ - u8 type; /**< type of eid */ -}) lisp_eid_vat_t; -/* *INDENT-ON* */ - -static uword -unformat_lisp_eid_vat (unformat_input_t * input, va_list * args) +#if VPP_API_TEST_BUILTIN == 0 +uword +unformat_l4_match (unformat_input_t * input, va_list * args) { - lisp_eid_vat_t *a = va_arg (*args, lisp_eid_vat_t *); + u8 **matchp = va_arg (*args, u8 **); - clib_memset (a, 0, sizeof (a[0])); + u8 *proto_header = 0; + int src_port = 0; + int dst_port = 0; - if (unformat (input, "%U/%d", unformat_ip4_address, a->addr, &a->len)) - { - a->type = 0; /* ipv4 type */ - } - else if (unformat (input, "%U/%d", unformat_ip6_address, a->addr, &a->len)) - { - a->type = 1; /* ipv6 type */ - } - else if (unformat (input, "%U", unformat_ethernet_address, a->addr)) - { - a->type = 2; /* mac type */ - } - else if (unformat (input, "%U", unformat_nsh_address, a->addr)) - { - a->type = 3; /* NSH type */ - lisp_nsh_api_t *nsh = (lisp_nsh_api_t *) a->addr; - nsh->spi = clib_host_to_net_u32 (nsh->spi); - } - else - { - return 0; - } + tcpudp_header_t h; - if ((a->type == 0 && a->len > 32) || (a->type == 1 && a->len > 128)) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - return 0; + if (unformat (input, "src_port %d", &src_port)) + ; + else if (unformat (input, "dst_port %d", &dst_port)) + ; + else + return 0; } - return 1; -} + h.src_port = clib_host_to_net_u16 (src_port); + h.dst_port = clib_host_to_net_u16 (dst_port); + vec_validate (proto_header, sizeof (h) - 1); + memcpy (proto_header, &h, sizeof (h)); -static int -lisp_eid_size_vat (u8 type) -{ - switch (type) - { - case 0: - return 4; - case 1: - return 16; - case 2: - return 6; - case 3: - return 5; - } - return 0; -} + *matchp = proto_header; -static void -lisp_eid_put_vat (u8 * dst, u8 eid[16], u8 type) -{ - clib_memcpy (dst, eid, lisp_eid_size_vat (type)); + return 1; } -static int -api_one_add_del_locator_set (vat_main_t * vam) +uword +unformat_ip4_match (unformat_input_t * input, va_list * args) { - unformat_input_t *input = vam->input; - vl_api_one_add_del_locator_set_t *mp; - u8 is_add = 1; - u8 *locator_set_name = NULL; - u8 locator_set_name_set = 0; - vl_api_local_locator_t locator, *locators = 0; - u32 sw_if_index, priority, weight; - u32 data_len = 0; + u8 **matchp = va_arg (*args, u8 **); + u8 *match = 0; + ip4_header_t *ip; + int version = 0; + u32 version_val; + int hdr_length = 0; + u32 hdr_length_val; + int src = 0, dst = 0; + ip4_address_t src_val, dst_val; + int proto = 0; + u32 proto_val; + int tos = 0; + u32 tos_val; + int length = 0; + u32 length_val; + int fragment_id = 0; + u32 fragment_id_val; + int ttl = 0; + int ttl_val; + int checksum = 0; + u32 checksum_val; - int ret; - /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) - { - is_add = 0; - } - else if (unformat (input, "locator-set %s", &locator_set_name)) - { - locator_set_name_set = 1; - } - else if (unformat (input, "sw_if_index %u p %u w %u", - &sw_if_index, &priority, &weight)) - { - locator.sw_if_index = htonl (sw_if_index); - locator.priority = priority; - locator.weight = weight; - vec_add1 (locators, locator); - } - else - if (unformat - (input, "iface %U p %u w %u", api_unformat_sw_if_index, vam, - &sw_if_index, &priority, &weight)) - { - locator.sw_if_index = htonl (sw_if_index); - locator.priority = priority; - locator.weight = weight; - vec_add1 (locators, locator); - } + if (unformat (input, "version %d", &version_val)) + version = 1; + else if (unformat (input, "hdr_length %d", &hdr_length_val)) + hdr_length = 1; + else if (unformat (input, "src %U", unformat_ip4_address, &src_val)) + src = 1; + else if (unformat (input, "dst %U", unformat_ip4_address, &dst_val)) + dst = 1; + else if (unformat (input, "proto %d", &proto_val)) + proto = 1; + else if (unformat (input, "tos %d", &tos_val)) + tos = 1; + else if (unformat (input, "length %d", &length_val)) + length = 1; + else if (unformat (input, "fragment_id %d", &fragment_id_val)) + fragment_id = 1; + else if (unformat (input, "ttl %d", &ttl_val)) + ttl = 1; + else if (unformat (input, "checksum %d", &checksum_val)) + checksum = 1; else break; } - if (locator_set_name_set == 0) - { - errmsg ("missing locator-set name"); - vec_free (locators); - return -99; - } + if (version + hdr_length + src + dst + proto + tos + length + fragment_id + + ttl + checksum == 0) + return 0; - if (vec_len (locator_set_name) > 64) - { - errmsg ("locator-set name too long"); - vec_free (locator_set_name); - vec_free (locators); - return -99; - } - vec_add1 (locator_set_name, 0); + /* + * Aligned because we use the real comparison functions + */ + vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4)); - data_len = sizeof (vl_api_local_locator_t) * vec_len (locators); + ip = (ip4_header_t *) match; - /* Construct the API message */ - M2 (ONE_ADD_DEL_LOCATOR_SET, mp, data_len); + /* These are realistically matched in practice */ + if (src) + ip->src_address.as_u32 = src_val.as_u32; - mp->is_add = is_add; - clib_memcpy (mp->locator_set_name, locator_set_name, - vec_len (locator_set_name)); - vec_free (locator_set_name); + if (dst) + ip->dst_address.as_u32 = dst_val.as_u32; - mp->locator_num = clib_host_to_net_u32 (vec_len (locators)); - if (locators) - clib_memcpy (mp->locators, locators, data_len); - vec_free (locators); + if (proto) + ip->protocol = proto_val; - /* send it... */ - S (mp); - /* Wait for a reply... */ - W (ret); - return ret; -} + /* These are not, but they're included for completeness */ + if (version) + ip->ip_version_and_header_length |= (version_val & 0xF) << 4; -#define api_lisp_add_del_locator_set api_one_add_del_locator_set + if (hdr_length) + ip->ip_version_and_header_length |= (hdr_length_val & 0xF); -static int -api_one_add_del_locator (vat_main_t * vam) -{ - unformat_input_t *input = vam->input; - vl_api_one_add_del_locator_t *mp; - u32 tmp_if_index = ~0; - u32 sw_if_index = ~0; - u8 sw_if_index_set = 0; - u8 sw_if_index_if_name_set = 0; - u32 priority = ~0; - u8 priority_set = 0; - u32 weight = ~0; - u8 weight_set = 0; - u8 is_add = 1; - u8 *locator_set_name = NULL; - u8 locator_set_name_set = 0; - int ret; + if (tos) + ip->tos = tos_val; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "del")) - { - is_add = 0; - } - else if (unformat (input, "locator-set %s", &locator_set_name)) - { - locator_set_name_set = 1; - } - else if (unformat (input, "iface %U", api_unformat_sw_if_index, vam, - &tmp_if_index)) - { - sw_if_index_if_name_set = 1; - sw_if_index = tmp_if_index; - } - else if (unformat (input, "sw_if_index %d", &tmp_if_index)) - { - sw_if_index_set = 1; - sw_if_index = tmp_if_index; - } - else if (unformat (input, "p %d", &priority)) - { - priority_set = 1; - } - else if (unformat (input, "w %d", &weight)) - { - weight_set = 1; - } + if (length) + ip->length = clib_host_to_net_u16 (length_val); + + if (ttl) + ip->ttl = ttl_val; + + if (checksum) + ip->checksum = clib_host_to_net_u16 (checksum_val); + + *matchp = match; + return 1; +} + +uword +unformat_ip6_match (unformat_input_t * input, va_list * args) +{ + u8 **matchp = va_arg (*args, u8 **); + u8 *match = 0; + ip6_header_t *ip; + int version = 0; + u32 version_val; + u8 traffic_class = 0; + u32 traffic_class_val = 0; + u8 flow_label = 0; + u8 flow_label_val; + int src = 0, dst = 0; + ip6_address_t src_val, dst_val; + int proto = 0; + u32 proto_val; + int payload_length = 0; + u32 payload_length_val; + int hop_limit = 0; + int hop_limit_val; + u32 ip_version_traffic_class_and_flow_label; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "version %d", &version_val)) + version = 1; + else if (unformat (input, "traffic_class %d", &traffic_class_val)) + traffic_class = 1; + else if (unformat (input, "flow_label %d", &flow_label_val)) + flow_label = 1; + else if (unformat (input, "src %U", unformat_ip6_address, &src_val)) + src = 1; + else if (unformat (input, "dst %U", unformat_ip6_address, &dst_val)) + dst = 1; + else if (unformat (input, "proto %d", &proto_val)) + proto = 1; + else if (unformat (input, "payload_length %d", &payload_length_val)) + payload_length = 1; + else if (unformat (input, "hop_limit %d", &hop_limit_val)) + hop_limit = 1; else break; } - if (locator_set_name_set == 0) - { - errmsg ("missing locator-set name"); - return -99; - } + if (version + traffic_class + flow_label + src + dst + proto + + payload_length + hop_limit == 0) + return 0; - if (sw_if_index_set == 0 && sw_if_index_if_name_set == 0) - { - errmsg ("missing sw_if_index"); - vec_free (locator_set_name); - return -99; - } + /* + * Aligned because we use the real comparison functions + */ + vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4)); - if (sw_if_index_set != 0 && sw_if_index_if_name_set != 0) - { - errmsg ("cannot use both params interface name and sw_if_index"); - vec_free (locator_set_name); - return -99; - } + ip = (ip6_header_t *) match; - if (priority_set == 0) - { - errmsg ("missing locator-set priority"); - vec_free (locator_set_name); - return -99; - } + if (src) + clib_memcpy (&ip->src_address, &src_val, sizeof (ip->src_address)); - if (weight_set == 0) - { - errmsg ("missing locator-set weight"); - vec_free (locator_set_name); - return -99; - } + if (dst) + clib_memcpy (&ip->dst_address, &dst_val, sizeof (ip->dst_address)); - if (vec_len (locator_set_name) > 64) - { - errmsg ("locator-set name too long"); - vec_free (locator_set_name); - return -99; - } - vec_add1 (locator_set_name, 0); + if (proto) + ip->protocol = proto_val; - /* Construct the API message */ - M (ONE_ADD_DEL_LOCATOR, mp); + ip_version_traffic_class_and_flow_label = 0; - mp->is_add = is_add; - mp->sw_if_index = ntohl (sw_if_index); - mp->priority = priority; - mp->weight = weight; - clib_memcpy (mp->locator_set_name, locator_set_name, - vec_len (locator_set_name)); - vec_free (locator_set_name); + if (version) + ip_version_traffic_class_and_flow_label |= (version_val & 0xF) << 28; - /* send it... */ - S (mp); + if (traffic_class) + ip_version_traffic_class_and_flow_label |= + (traffic_class_val & 0xFF) << 20; - /* Wait for a reply... */ - W (ret); - return ret; -} + if (flow_label) + ip_version_traffic_class_and_flow_label |= (flow_label_val & 0xFFFFF); -#define api_lisp_add_del_locator api_one_add_del_locator + ip->ip_version_traffic_class_and_flow_label = + clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label); -uword -unformat_hmac_key_id (unformat_input_t * input, va_list * args) -{ - u32 *key_id = va_arg (*args, u32 *); - u8 *s = 0; + if (payload_length) + ip->payload_length = clib_host_to_net_u16 (payload_length_val); - if (unformat (input, "%s", &s)) - { - if (!strcmp ((char *) s, "sha1")) - key_id[0] = HMAC_SHA_1_96; - else if (!strcmp ((char *) s, "sha256")) - key_id[0] = HMAC_SHA_256_128; - else - { - clib_warning ("invalid key_id: '%s'", s); - key_id[0] = HMAC_NO_KEY; - } - } - else - return 0; + if (hop_limit) + ip->hop_limit = hop_limit_val; - vec_free (s); + *matchp = match; return 1; } -static int -api_one_add_del_local_eid (vat_main_t * vam) +uword +unformat_l3_match (unformat_input_t * input, va_list * args) { - unformat_input_t *input = vam->input; - vl_api_one_add_del_local_eid_t *mp; - u8 is_add = 1; - u8 eid_set = 0; - lisp_eid_vat_t _eid, *eid = &_eid; - u8 *locator_set_name = 0; - u8 locator_set_name_set = 0; - u32 vni = 0; - u16 key_id = 0; - u8 *key = 0; - int ret; + u8 **matchp = va_arg (*args, u8 **); - /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) - { - is_add = 0; - } - else if (unformat (input, "vni %d", &vni)) - { - ; - } - else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid)) - { - eid_set = 1; - } - else if (unformat (input, "locator-set %s", &locator_set_name)) - { - locator_set_name_set = 1; - } - else if (unformat (input, "key-id %U", unformat_hmac_key_id, &key_id)) - ; - else if (unformat (input, "secret-key %_%v%_", &key)) - ; + if (unformat (input, "ip4 %U", unformat_ip4_match, matchp)) + return 1; + else if (unformat (input, "ip6 %U", unformat_ip6_match, matchp)) + return 1; else break; } + return 0; +} - if (locator_set_name_set == 0) - { - errmsg ("missing locator-set name"); - return -99; - } +uword +unformat_vlan_tag (unformat_input_t * input, va_list * args) +{ + u8 *tagp = va_arg (*args, u8 *); + u32 tag; - if (0 == eid_set) + if (unformat (input, "%d", &tag)) { - errmsg ("EID address not set!"); - vec_free (locator_set_name); - return -99; + tagp[0] = (tag >> 8) & 0x0F; + tagp[1] = tag & 0xFF; + return 1; } - if (key && (0 == key_id)) - { - errmsg ("invalid key_id!"); - return -99; - } + return 0; +} - if (vec_len (key) > 64) - { - errmsg ("key too long"); - vec_free (key); - return -99; - } +uword +unformat_l2_match (unformat_input_t * input, va_list * args) +{ + u8 **matchp = va_arg (*args, u8 **); + u8 *match = 0; + u8 src = 0; + u8 src_val[6]; + u8 dst = 0; + u8 dst_val[6]; + u8 proto = 0; + u16 proto_val; + u8 tag1 = 0; + u8 tag1_val[2]; + u8 tag2 = 0; + u8 tag2_val[2]; + int len = 14; + u8 ignore_tag1 = 0; + u8 ignore_tag2 = 0; + u8 cos1 = 0; + u8 cos2 = 0; + u32 cos1_val = 0; + u32 cos2_val = 0; - if (vec_len (locator_set_name) > 64) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - errmsg ("locator-set name too long"); - vec_free (locator_set_name); - return -99; + if (unformat (input, "src %U", unformat_ethernet_address, &src_val)) + src = 1; + else + if (unformat (input, "dst %U", unformat_ethernet_address, &dst_val)) + dst = 1; + else if (unformat (input, "proto %U", + unformat_ethernet_type_host_byte_order, &proto_val)) + proto = 1; + else if (unformat (input, "tag1 %U", unformat_vlan_tag, tag1_val)) + tag1 = 1; + else if (unformat (input, "tag2 %U", unformat_vlan_tag, tag2_val)) + tag2 = 1; + else if (unformat (input, "ignore-tag1")) + ignore_tag1 = 1; + else if (unformat (input, "ignore-tag2")) + ignore_tag2 = 1; + else if (unformat (input, "cos1 %d", &cos1_val)) + cos1 = 1; + else if (unformat (input, "cos2 %d", &cos2_val)) + cos2 = 1; + else + break; } - vec_add1 (locator_set_name, 0); - - /* Construct the API message */ - M (ONE_ADD_DEL_LOCAL_EID, mp); - - mp->is_add = is_add; - lisp_eid_put_vat (mp->eid, eid->addr, eid->type); - mp->eid_type = eid->type; - mp->prefix_len = eid->len; - mp->vni = clib_host_to_net_u32 (vni); - mp->key_id = clib_host_to_net_u16 (key_id); - clib_memcpy (mp->locator_set_name, locator_set_name, - vec_len (locator_set_name)); - clib_memcpy (mp->key, key, vec_len (key)); - - vec_free (locator_set_name); - vec_free (key); - - /* send it... */ - S (mp); + if ((src + dst + proto + tag1 + tag2 + + ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0) + return 0; - /* Wait for a reply... */ - W (ret); - return ret; -} + if (tag1 || ignore_tag1 || cos1) + len = 18; + if (tag2 || ignore_tag2 || cos2) + len = 22; -#define api_lisp_add_del_local_eid api_one_add_del_local_eid + vec_validate_aligned (match, len - 1, sizeof (u32x4)); -static int -api_lisp_gpe_add_del_fwd_entry (vat_main_t * vam) -{ - u32 dp_table = 0, vni = 0;; - unformat_input_t *input = vam->input; - vl_api_gpe_add_del_fwd_entry_t *mp; - u8 is_add = 1; - lisp_eid_vat_t _rmt_eid, *rmt_eid = &_rmt_eid; - lisp_eid_vat_t _lcl_eid, *lcl_eid = &_lcl_eid; - u8 rmt_eid_set = 0, lcl_eid_set = 0; - u32 action = ~0, w; - ip4_address_t rmt_rloc4, lcl_rloc4; - ip6_address_t rmt_rloc6, lcl_rloc6; - vl_api_gpe_locator_t *rmt_locs = 0, *lcl_locs = 0, rloc, *curr_rloc = 0; - int ret; + if (dst) + clib_memcpy (match, dst_val, 6); - clib_memset (&rloc, 0, sizeof (rloc)); + if (src) + clib_memcpy (match + 6, src_val, 6); - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (tag2) { - if (unformat (input, "del")) - is_add = 0; - else if (unformat (input, "add")) - is_add = 1; - else if (unformat (input, "reid %U", unformat_lisp_eid_vat, rmt_eid)) - { - rmt_eid_set = 1; - } - else if (unformat (input, "leid %U", unformat_lisp_eid_vat, lcl_eid)) - { - lcl_eid_set = 1; - } - else if (unformat (input, "vrf %d", &dp_table)) - ; - else if (unformat (input, "bd %d", &dp_table)) - ; - else if (unformat (input, "vni %d", &vni)) - ; - else if (unformat (input, "w %d", &w)) - { - if (!curr_rloc) - { - errmsg ("No RLOC configured for setting priority/weight!"); - return -99; - } - curr_rloc->weight = w; - } - else if (unformat (input, "loc-pair %U %U", unformat_ip4_address, - &lcl_rloc4, unformat_ip4_address, &rmt_rloc4)) - { - rloc.is_ip4 = 1; - - clib_memcpy (&rloc.addr, &lcl_rloc4, sizeof (lcl_rloc4)); - rloc.weight = 0; - vec_add1 (lcl_locs, rloc); - - clib_memcpy (&rloc.addr, &rmt_rloc4, sizeof (rmt_rloc4)); - vec_add1 (rmt_locs, rloc); - /* weight saved in rmt loc */ - curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1]; - } - else if (unformat (input, "loc-pair %U %U", unformat_ip6_address, - &lcl_rloc6, unformat_ip6_address, &rmt_rloc6)) - { - rloc.is_ip4 = 0; - clib_memcpy (&rloc.addr, &lcl_rloc6, sizeof (lcl_rloc6)); - rloc.weight = 0; - vec_add1 (lcl_locs, rloc); - - clib_memcpy (&rloc.addr, &rmt_rloc6, sizeof (rmt_rloc6)); - vec_add1 (rmt_locs, rloc); - /* weight saved in rmt loc */ - curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1]; - } - else if (unformat (input, "action %d", &action)) + /* inner vlan tag */ + match[19] = tag2_val[1]; + match[18] = tag2_val[0]; + if (cos2) + match[18] |= (cos2_val & 0x7) << 5; + if (proto) { - ; + match[21] = proto_val & 0xff; + match[20] = proto_val >> 8; } - else + if (tag1) { - clib_warning ("parse error '%U'", format_unformat_error, input); - return -99; + match[15] = tag1_val[1]; + match[14] = tag1_val[0]; } + if (cos1) + match[14] |= (cos1_val & 0x7) << 5; + *matchp = match; + return 1; } - - if (!rmt_eid_set) + if (tag1) { - errmsg ("remote eid addresses not set"); - return -99; - } + match[15] = tag1_val[1]; + match[14] = tag1_val[0]; + if (proto) + { + match[17] = proto_val & 0xff; + match[16] = proto_val >> 8; + } + if (cos1) + match[14] |= (cos1_val & 0x7) << 5; - if (lcl_eid_set && rmt_eid->type != lcl_eid->type) - { - errmsg ("eid types don't match"); - return -99; + *matchp = match; + return 1; } - - if (0 == rmt_locs && (u32) ~ 0 == action) + if (cos2) + match[18] |= (cos2_val & 0x7) << 5; + if (cos1) + match[14] |= (cos1_val & 0x7) << 5; + if (proto) { - errmsg ("action not set for negative mapping"); - return -99; + match[13] = proto_val & 0xff; + match[12] = proto_val >> 8; } - /* Construct the API message */ - M2 (GPE_ADD_DEL_FWD_ENTRY, mp, - sizeof (vl_api_gpe_locator_t) * vec_len (rmt_locs) * 2); - - mp->is_add = is_add; - lisp_eid_put_vat (mp->rmt_eid, rmt_eid->addr, rmt_eid->type); - lisp_eid_put_vat (mp->lcl_eid, lcl_eid->addr, lcl_eid->type); - mp->eid_type = rmt_eid->type; - mp->dp_table = clib_host_to_net_u32 (dp_table); - mp->vni = clib_host_to_net_u32 (vni); - mp->rmt_len = rmt_eid->len; - mp->lcl_len = lcl_eid->len; - mp->action = action; - - if (0 != rmt_locs && 0 != lcl_locs) - { - mp->loc_num = clib_host_to_net_u32 (vec_len (rmt_locs) * 2); - clib_memcpy (mp->locs, lcl_locs, - (sizeof (vl_api_gpe_locator_t) * vec_len (lcl_locs))); + *matchp = match; + return 1; +} - u32 offset = sizeof (vl_api_gpe_locator_t) * vec_len (lcl_locs); - clib_memcpy (((u8 *) mp->locs) + offset, rmt_locs, - (sizeof (vl_api_gpe_locator_t) * vec_len (rmt_locs))); - } - vec_free (lcl_locs); - vec_free (rmt_locs); +uword +unformat_qos_source (unformat_input_t * input, va_list * args) +{ + int *qs = va_arg (*args, int *); - /* send it... */ - S (mp); + if (unformat (input, "ip")) + *qs = QOS_SOURCE_IP; + else if (unformat (input, "mpls")) + *qs = QOS_SOURCE_MPLS; + else if (unformat (input, "ext")) + *qs = QOS_SOURCE_EXT; + else if (unformat (input, "vlan")) + *qs = QOS_SOURCE_VLAN; + else + return 0; - /* Wait for a reply... */ - W (ret); - return ret; + return 1; } +#endif -static int -api_one_add_del_map_server (vat_main_t * vam) +uword +api_unformat_classify_match (unformat_input_t * input, va_list * args) { - unformat_input_t *input = vam->input; - vl_api_one_add_del_map_server_t *mp; - u8 is_add = 1; - u8 ipv4_set = 0; - u8 ipv6_set = 0; - ip4_address_t ipv4; - ip6_address_t ipv6; - int ret; + u8 **matchp = va_arg (*args, u8 **); + u32 skip_n_vectors = va_arg (*args, u32); + u32 match_n_vectors = va_arg (*args, u32); + + u8 *match = 0; + u8 *l2 = 0; + u8 *l3 = 0; + u8 *l4 = 0; - /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) - { - is_add = 0; - } - else if (unformat (input, "%U", unformat_ip4_address, &ipv4)) - { - ipv4_set = 1; - } - else if (unformat (input, "%U", unformat_ip6_address, &ipv6)) - { - ipv6_set = 1; - } + if (unformat (input, "hex %U", unformat_hex_string, &match)) + ; + else if (unformat (input, "l2 %U", unformat_l2_match, &l2)) + ; + else if (unformat (input, "l3 %U", unformat_l3_match, &l3)) + ; + else if (unformat (input, "l4 %U", unformat_l4_match, &l4)) + ; else break; } - if (ipv4_set && ipv6_set) + if (l4 && !l3) { - errmsg ("both eid v4 and v6 addresses set"); - return -99; + vec_free (match); + vec_free (l2); + vec_free (l4); + return 0; } - if (!ipv4_set && !ipv6_set) + if (match || l2 || l3 || l4) { - errmsg ("eid addresses not set"); - return -99; - } + if (l2 || l3 || l4) + { + /* "Win a free Ethernet header in every packet" */ + if (l2 == 0) + vec_validate_aligned (l2, 13, sizeof (u32x4)); + match = l2; + if (vec_len (l3)) + { + vec_append_aligned (match, l3, sizeof (u32x4)); + vec_free (l3); + } + if (vec_len (l4)) + { + vec_append_aligned (match, l4, sizeof (u32x4)); + vec_free (l4); + } + } - /* Construct the API message */ - M (ONE_ADD_DEL_MAP_SERVER, mp); + /* Make sure the vector is big enough even if key is all 0's */ + vec_validate_aligned + (match, ((match_n_vectors + skip_n_vectors) * sizeof (u32x4)) - 1, + sizeof (u32x4)); - mp->is_add = is_add; - if (ipv6_set) - { - mp->is_ipv6 = 1; - clib_memcpy (mp->ip_address, &ipv6, sizeof (ipv6)); - } - else - { - mp->is_ipv6 = 0; - clib_memcpy (mp->ip_address, &ipv4, sizeof (ipv4)); - } + /* Set size, include skipped vectors */ + _vec_len (match) = (match_n_vectors + skip_n_vectors) * sizeof (u32x4); - /* send it... */ - S (mp); + *matchp = match; - /* Wait for a reply... */ - W (ret); - return ret; -} + return 1; + } -#define api_lisp_add_del_map_server api_one_add_del_map_server + return 0; +} static int -api_one_add_del_map_resolver (vat_main_t * vam) +api_classify_add_del_session (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_add_del_map_resolver_t *mp; - u8 is_add = 1; - u8 ipv4_set = 0; - u8 ipv6_set = 0; - ip4_address_t ipv4; - ip6_address_t ipv6; + unformat_input_t *i = vam->input; + vl_api_classify_add_del_session_t *mp; + int is_add = 1; + u32 table_index = ~0; + u32 hit_next_index = ~0; + u32 opaque_index = ~0; + u8 *match = 0; + i32 advance = 0; + u32 skip_n_vectors = 0; + u32 match_n_vectors = 0; + u32 action = 0; + u32 metadata = 0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* + * Warning: you have to supply skip_n and match_n + * because the API client cant simply look at the classify + * table object. + */ + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) - { - is_add = 0; - } - else if (unformat (input, "%U", unformat_ip4_address, &ipv4)) - { - ipv4_set = 1; - } - else if (unformat (input, "%U", unformat_ip6_address, &ipv6)) - { - ipv6_set = 1; - } + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "hit-next %U", api_unformat_ip_next_index, + &hit_next_index)) + ; + else if (unformat (i, "l2-hit-next %U", unformat_l2_next_index, + &hit_next_index)) + ; + else if (unformat (i, "acl-hit-next %U", api_unformat_acl_next_index, + &hit_next_index)) + ; + else if (unformat (i, "policer-hit-next %d", &hit_next_index)) + ; + else if (unformat (i, "%U", unformat_policer_precolor, &opaque_index)) + ; + else if (unformat (i, "opaque-index %d", &opaque_index)) + ; + else if (unformat (i, "skip_n %d", &skip_n_vectors)) + ; + else if (unformat (i, "match_n %d", &match_n_vectors)) + ; + else if (unformat (i, "match %U", api_unformat_classify_match, + &match, skip_n_vectors, match_n_vectors)) + ; + else if (unformat (i, "advance %d", &advance)) + ; + else if (unformat (i, "table-index %d", &table_index)) + ; + else if (unformat (i, "action set-ip4-fib-id %d", &metadata)) + action = 1; + else if (unformat (i, "action set-ip6-fib-id %d", &metadata)) + action = 2; + else if (unformat (i, "action %d", &action)) + ; + else if (unformat (i, "metadata %d", &metadata)) + ; else break; } - if (ipv4_set && ipv6_set) + if (table_index == ~0) { - errmsg ("both eid v4 and v6 addresses set"); + errmsg ("Table index required"); return -99; } - if (!ipv4_set && !ipv6_set) + if (is_add && match == 0) { - errmsg ("eid addresses not set"); + errmsg ("Match value required"); return -99; } - /* Construct the API message */ - M (ONE_ADD_DEL_MAP_RESOLVER, mp); + M2 (CLASSIFY_ADD_DEL_SESSION, mp, vec_len (match)); mp->is_add = is_add; - if (ipv6_set) - { - mp->is_ipv6 = 1; - clib_memcpy (mp->ip_address, &ipv6, sizeof (ipv6)); - } - else - { - mp->is_ipv6 = 0; - clib_memcpy (mp->ip_address, &ipv4, sizeof (ipv4)); - } + mp->table_index = ntohl (table_index); + mp->hit_next_index = ntohl (hit_next_index); + mp->opaque_index = ntohl (opaque_index); + mp->advance = ntohl (advance); + mp->action = action; + mp->metadata = ntohl (metadata); + mp->match_len = ntohl (vec_len (match)); + clib_memcpy (mp->match, match, vec_len (match)); + vec_free (match); - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_add_del_map_resolver api_one_add_del_map_resolver - static int -api_lisp_gpe_enable_disable (vat_main_t * vam) +api_classify_set_interface_ip_table (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_gpe_enable_disable_t *mp; - u8 is_set = 0; - u8 is_en = 1; + unformat_input_t *i = vam->input; + vl_api_classify_set_interface_ip_table_t *mp; + u32 sw_if_index; + int sw_if_index_set; + u32 table_index = ~0; + u8 is_ipv6 = 0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "enable")) - { - is_set = 1; - is_en = 1; - } - else if (unformat (input, "disable")) + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "table %d", &table_index)) + ; + else { - is_set = 1; - is_en = 0; + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; } - else - break; } - if (is_set == 0) + if (sw_if_index_set == 0) { - errmsg ("Value not set"); + errmsg ("missing interface name or sw_if_index"); return -99; } - /* Construct the API message */ - M (GPE_ENABLE_DISABLE, mp); - mp->is_en = is_en; + M (CLASSIFY_SET_INTERFACE_IP_TABLE, mp); - /* send it... */ - S (mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->table_index = ntohl (table_index); + mp->is_ipv6 = is_ipv6; - /* Wait for a reply... */ + S (mp); W (ret); return ret; } static int -api_one_rloc_probe_enable_disable (vat_main_t * vam) +api_classify_set_interface_l2_tables (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_rloc_probe_enable_disable_t *mp; - u8 is_set = 0; - u8 is_en = 0; + unformat_input_t *i = vam->input; + vl_api_classify_set_interface_l2_tables_t *mp; + u32 sw_if_index; + int sw_if_index_set; + u32 ip4_table_index = ~0; + u32 ip6_table_index = ~0; + u32 other_table_index = ~0; + u32 is_input = 1; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "enable")) + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "ip4-table %d", &ip4_table_index)) + ; + else if (unformat (i, "ip6-table %d", &ip6_table_index)) + ; + else if (unformat (i, "other-table %d", &other_table_index)) + ; + else if (unformat (i, "is-input %d", &is_input)) + ; + else { - is_set = 1; - is_en = 1; + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; } - else if (unformat (input, "disable")) - is_set = 1; - else - break; } - if (!is_set) + if (sw_if_index_set == 0) { - errmsg ("Value not set"); + errmsg ("missing interface name or sw_if_index"); return -99; } - /* Construct the API message */ - M (ONE_RLOC_PROBE_ENABLE_DISABLE, mp); - mp->is_enabled = is_en; + M (CLASSIFY_SET_INTERFACE_L2_TABLES, mp); - /* send it... */ - S (mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->ip4_table_index = ntohl (ip4_table_index); + mp->ip6_table_index = ntohl (ip6_table_index); + mp->other_table_index = ntohl (other_table_index); + mp->is_input = (u8) is_input; - /* Wait for a reply... */ + S (mp); W (ret); return ret; } -#define api_lisp_rloc_probe_enable_disable api_one_rloc_probe_enable_disable - static int -api_one_map_register_enable_disable (vat_main_t * vam) +api_set_ipfix_exporter (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_map_register_enable_disable_t *mp; - u8 is_set = 0; - u8 is_en = 0; + unformat_input_t *i = vam->input; + vl_api_set_ipfix_exporter_t *mp; + ip4_address_t collector_address; + u8 collector_address_set = 0; + u32 collector_port = ~0; + ip4_address_t src_address; + u8 src_address_set = 0; + u32 vrf_id = ~0; + u32 path_mtu = ~0; + u32 template_interval = ~0; + u8 udp_checksum = 0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "enable")) - { - is_set = 1; - is_en = 1; - } - else if (unformat (input, "disable")) - is_set = 1; + if (unformat (i, "collector_address %U", unformat_ip4_address, + &collector_address)) + collector_address_set = 1; + else if (unformat (i, "collector_port %d", &collector_port)) + ; + else if (unformat (i, "src_address %U", unformat_ip4_address, + &src_address)) + src_address_set = 1; + else if (unformat (i, "vrf_id %d", &vrf_id)) + ; + else if (unformat (i, "path_mtu %d", &path_mtu)) + ; + else if (unformat (i, "template_interval %d", &template_interval)) + ; + else if (unformat (i, "udp_checksum")) + udp_checksum = 1; else break; } - if (!is_set) + if (collector_address_set == 0) + { + errmsg ("collector_address required"); + return -99; + } + + if (src_address_set == 0) { - errmsg ("Value not set"); + errmsg ("src_address required"); return -99; } - /* Construct the API message */ - M (ONE_MAP_REGISTER_ENABLE_DISABLE, mp); + M (SET_IPFIX_EXPORTER, mp); - mp->is_enabled = is_en; + memcpy (mp->collector_address.un.ip4, collector_address.data, + sizeof (collector_address.data)); + mp->collector_port = htons ((u16) collector_port); + memcpy (mp->src_address.un.ip4, src_address.data, + sizeof (src_address.data)); + mp->vrf_id = htonl (vrf_id); + mp->path_mtu = htonl (path_mtu); + mp->template_interval = htonl (template_interval); + mp->udp_checksum = udp_checksum; - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_map_register_enable_disable api_one_map_register_enable_disable - static int -api_one_enable_disable (vat_main_t * vam) +api_set_ipfix_classify_stream (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_enable_disable_t *mp; - u8 is_set = 0; - u8 is_en = 0; + unformat_input_t *i = vam->input; + vl_api_set_ipfix_classify_stream_t *mp; + u32 domain_id = 0; + u32 src_port = UDP_DST_PORT_ipfix; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "enable")) - { - is_set = 1; - is_en = 1; - } - else if (unformat (input, "disable")) + if (unformat (i, "domain %d", &domain_id)) + ; + else if (unformat (i, "src_port %d", &src_port)) + ; + else { - is_set = 1; + errmsg ("unknown input `%U'", format_unformat_error, i); + return -99; } - else - break; - } - - if (!is_set) - { - errmsg ("Value not set"); - return -99; } - /* Construct the API message */ - M (ONE_ENABLE_DISABLE, mp); + M (SET_IPFIX_CLASSIFY_STREAM, mp); - mp->is_en = is_en; + mp->domain_id = htonl (domain_id); + mp->src_port = htons ((u16) src_port); - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_enable_disable api_one_enable_disable - static int -api_one_enable_disable_xtr_mode (vat_main_t * vam) +api_ipfix_classify_table_add_del (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_enable_disable_xtr_mode_t *mp; - u8 is_set = 0; - u8 is_en = 0; + unformat_input_t *i = vam->input; + vl_api_ipfix_classify_table_add_del_t *mp; + int is_add = -1; + u32 classify_table_index = ~0; + u8 ip_version = 0; + u8 transport_protocol = 255; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "enable")) - { - is_set = 1; - is_en = 1; - } - else if (unformat (input, "disable")) + if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "table %d", &classify_table_index)) + ; + else if (unformat (i, "ip4")) + ip_version = 4; + else if (unformat (i, "ip6")) + ip_version = 6; + else if (unformat (i, "tcp")) + transport_protocol = 6; + else if (unformat (i, "udp")) + transport_protocol = 17; + else { - is_set = 1; + errmsg ("unknown input `%U'", format_unformat_error, i); + return -99; } - else - break; } - if (!is_set) + if (is_add == -1) { - errmsg ("Value not set"); + errmsg ("expecting: add|del"); + return -99; + } + if (classify_table_index == ~0) + { + errmsg ("classifier table not specified"); + return -99; + } + if (ip_version == 0) + { + errmsg ("IP version not specified"); return -99; } - /* Construct the API message */ - M (ONE_ENABLE_DISABLE_XTR_MODE, mp); - - mp->is_en = is_en; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_one_show_xtr_mode (vat_main_t * vam) -{ - vl_api_one_show_xtr_mode_t *mp; - int ret; + M (IPFIX_CLASSIFY_TABLE_ADD_DEL, mp); - /* Construct the API message */ - M (ONE_SHOW_XTR_MODE, mp); + mp->is_add = is_add; + mp->table_id = htonl (classify_table_index); + mp->ip_version = ip_version; + mp->transport_protocol = transport_protocol; - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } static int -api_one_enable_disable_pitr_mode (vat_main_t * vam) +api_get_node_index (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_enable_disable_pitr_mode_t *mp; - u8 is_set = 0; - u8 is_en = 0; + unformat_input_t *i = vam->input; + vl_api_get_node_index_t *mp; + u8 *name = 0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "enable")) - { - is_set = 1; - is_en = 1; - } - else if (unformat (input, "disable")) - { - is_set = 1; - } + if (unformat (i, "node %s", &name)) + ; else break; } - - if (!is_set) + if (name == 0) + { + errmsg ("node name required"); + return -99; + } + if (vec_len (name) >= ARRAY_LEN (mp->node_name)) { - errmsg ("Value not set"); + errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); return -99; } - /* Construct the API message */ - M (ONE_ENABLE_DISABLE_PITR_MODE, mp); - - mp->is_en = is_en; + M (GET_NODE_INDEX, mp); + clib_memcpy (mp->node_name, name, vec_len (name)); + vec_free (name); - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } static int -api_one_show_pitr_mode (vat_main_t * vam) +api_get_next_index (vat_main_t * vam) { - vl_api_one_show_pitr_mode_t *mp; + unformat_input_t *i = vam->input; + vl_api_get_next_index_t *mp; + u8 *node_name = 0, *next_node_name = 0; int ret; - /* Construct the API message */ - M (ONE_SHOW_PITR_MODE, mp); + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "node-name %s", &node_name)) + ; + else if (unformat (i, "next-node-name %s", &next_node_name)) + break; + } - /* send it... */ - S (mp); + if (node_name == 0) + { + errmsg ("node name required"); + return -99; + } + if (vec_len (node_name) >= ARRAY_LEN (mp->node_name)) + { + errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); + return -99; + } - /* Wait for a reply... */ + if (next_node_name == 0) + { + errmsg ("next node name required"); + return -99; + } + if (vec_len (next_node_name) >= ARRAY_LEN (mp->next_name)) + { + errmsg ("next node name too long, max %d", ARRAY_LEN (mp->next_name)); + return -99; + } + + M (GET_NEXT_INDEX, mp); + clib_memcpy (mp->node_name, node_name, vec_len (node_name)); + clib_memcpy (mp->next_name, next_node_name, vec_len (next_node_name)); + vec_free (node_name); + vec_free (next_node_name); + + S (mp); W (ret); return ret; } static int -api_one_enable_disable_petr_mode (vat_main_t * vam) +api_add_node_next (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_enable_disable_petr_mode_t *mp; - u8 is_set = 0; - u8 is_en = 0; + unformat_input_t *i = vam->input; + vl_api_add_node_next_t *mp; + u8 *name = 0; + u8 *next = 0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "enable")) - { - is_set = 1; - is_en = 1; - } - else if (unformat (input, "disable")) - { - is_set = 1; - } + if (unformat (i, "node %s", &name)) + ; + else if (unformat (i, "next %s", &next)) + ; else break; } - - if (!is_set) + if (name == 0) { - errmsg ("Value not set"); + errmsg ("node name required"); + return -99; + } + if (vec_len (name) >= ARRAY_LEN (mp->node_name)) + { + errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); + return -99; + } + if (next == 0) + { + errmsg ("next node required"); + return -99; + } + if (vec_len (next) >= ARRAY_LEN (mp->next_name)) + { + errmsg ("next name too long, max %d", ARRAY_LEN (mp->next_name)); return -99; } - /* Construct the API message */ - M (ONE_ENABLE_DISABLE_PETR_MODE, mp); - - mp->is_en = is_en; + M (ADD_NODE_NEXT, mp); + clib_memcpy (mp->node_name, name, vec_len (name)); + clib_memcpy (mp->next_name, next, vec_len (next)); + vec_free (name); + vec_free (next); - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } -static int -api_one_show_petr_mode (vat_main_t * vam) +static void vl_api_sw_interface_tap_v2_details_t_handler + (vl_api_sw_interface_tap_v2_details_t * mp) { - vl_api_one_show_petr_mode_t *mp; - int ret; + vat_main_t *vam = &vat_main; - /* Construct the API message */ - M (ONE_SHOW_PETR_MODE, mp); + u8 *ip4 = + format (0, "%U/%d", format_ip4_address, mp->host_ip4_prefix.address, + mp->host_ip4_prefix.len); + u8 *ip6 = + format (0, "%U/%d", format_ip6_address, mp->host_ip6_prefix.address, + mp->host_ip6_prefix.len); - /* send it... */ - S (mp); + print (vam->ofp, + "\n%-16s %-12d %-5d %-12d %-12d %-14U %-30s %-20s %-20s %-30s 0x%-08x", + mp->dev_name, ntohl (mp->sw_if_index), ntohl (mp->id), + ntohs (mp->rx_ring_sz), ntohs (mp->tx_ring_sz), + format_ethernet_address, mp->host_mac_addr, mp->host_namespace, + mp->host_bridge, ip4, ip6, ntohl (mp->tap_flags)); - /* Wait for a reply... */ - W (ret); - return ret; + vec_free (ip4); + vec_free (ip6); } -static int -api_show_one_map_register_state (vat_main_t * vam) +static void vl_api_sw_interface_tap_v2_details_t_handler_json + (vl_api_sw_interface_tap_v2_details_t * mp) { - vl_api_show_one_map_register_state_t *mp; - int ret; + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; - M (SHOW_ONE_MAP_REGISTER_STATE, mp); + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); - /* send */ - S (mp); + vat_json_init_object (node); + vat_json_object_add_uint (node, "id", ntohl (mp->id)); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "tap_flags", ntohl (mp->tap_flags)); + vat_json_object_add_string_copy (node, "dev_name", mp->dev_name); + vat_json_object_add_uint (node, "rx_ring_sz", ntohs (mp->rx_ring_sz)); + vat_json_object_add_uint (node, "tx_ring_sz", ntohs (mp->tx_ring_sz)); + vat_json_object_add_string_copy (node, "host_mac_addr", + format (0, "%U", format_ethernet_address, + &mp->host_mac_addr)); + vat_json_object_add_string_copy (node, "host_namespace", + mp->host_namespace); + vat_json_object_add_string_copy (node, "host_bridge", mp->host_bridge); + vat_json_object_add_string_copy (node, "host_ip4_addr", + format (0, "%U/%d", format_ip4_address, + mp->host_ip4_prefix.address, + mp->host_ip4_prefix.len)); + vat_json_object_add_string_copy (node, "host_ip6_prefix", + format (0, "%U/%d", format_ip6_address, + mp->host_ip6_prefix.address, + mp->host_ip6_prefix.len)); - /* wait for reply */ - W (ret); - return ret; } -#define api_show_lisp_map_register_state api_show_one_map_register_state - static int -api_show_one_rloc_probe_state (vat_main_t * vam) +api_sw_interface_tap_v2_dump (vat_main_t * vam) { - vl_api_show_one_rloc_probe_state_t *mp; + vl_api_sw_interface_tap_v2_dump_t *mp; + vl_api_control_ping_t *mp_ping; int ret; - M (SHOW_ONE_RLOC_PROBE_STATE, mp); + print (vam->ofp, + "\n%-16s %-12s %-5s %-12s %-12s %-14s %-30s %-20s %-20s %-30s", + "dev_name", "sw_if_index", "id", "rx_ring_sz", "tx_ring_sz", + "host_mac_addr", "host_namespace", "host_bridge", "host_ip4_addr", + "host_ip6_addr"); - /* send */ + /* Get list of tap interfaces */ + M (SW_INTERFACE_TAP_V2_DUMP, mp); S (mp); - /* wait for reply */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } -#define api_show_lisp_rloc_probe_state api_show_one_rloc_probe_state - -static int -api_one_add_del_ndp_entry (vat_main_t * vam) +static void vl_api_sw_interface_virtio_pci_details_t_handler + (vl_api_sw_interface_virtio_pci_details_t * mp) { - vl_api_one_add_del_ndp_entry_t *mp; - unformat_input_t *input = vam->input; - u8 is_add = 1; - u8 mac_set = 0; - u8 bd_set = 0; - u8 ip_set = 0; - u8 mac[6] = { 0, }; - u8 ip6[16] = { 0, }; - u32 bd = ~0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "del")) - is_add = 0; - else if (unformat (input, "mac %U", unformat_ethernet_address, mac)) - mac_set = 1; - else if (unformat (input, "ip %U", unformat_ip6_address, ip6)) - ip_set = 1; - else if (unformat (input, "bd %d", &bd)) - bd_set = 1; - else - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; - } - } + vat_main_t *vam = &vat_main; - if (!bd_set || !ip_set || (!mac_set && is_add)) + typedef union + { + struct { - errmsg ("Missing BD, IP or MAC!"); - return -99; - } + u16 domain; + u8 bus; + u8 slot:5; + u8 function:3; + }; + u32 as_u32; + } pci_addr_t; + pci_addr_t addr; - M (ONE_ADD_DEL_NDP_ENTRY, mp); - mp->is_add = is_add; - clib_memcpy (mp->mac, mac, 6); - mp->bd = clib_host_to_net_u32 (bd); - clib_memcpy (mp->ip6, ip6, sizeof (mp->ip6)); + addr.domain = ntohs (mp->pci_addr.domain); + addr.bus = mp->pci_addr.bus; + addr.slot = mp->pci_addr.slot; + addr.function = mp->pci_addr.function; - /* send */ - S (mp); + u8 *pci_addr = format (0, "%04x:%02x:%02x.%x", addr.domain, addr.bus, + addr.slot, addr.function); - /* wait for reply */ - W (ret); - return ret; + print (vam->ofp, + "\n%-12s %-12d %-12d %-12d %-17U 0x%-08llx", + pci_addr, ntohl (mp->sw_if_index), + ntohs (mp->rx_ring_sz), ntohs (mp->tx_ring_sz), + format_ethernet_address, mp->mac_addr, + clib_net_to_host_u64 (mp->features)); + vec_free (pci_addr); } -static int -api_one_add_del_l2_arp_entry (vat_main_t * vam) +static void vl_api_sw_interface_virtio_pci_details_t_handler_json + (vl_api_sw_interface_virtio_pci_details_t * mp) { - vl_api_one_add_del_l2_arp_entry_t *mp; - unformat_input_t *input = vam->input; - u8 is_add = 1; - u8 mac_set = 0; - u8 bd_set = 0; - u8 ip_set = 0; - u8 mac[6] = { 0, }; - u32 ip4 = 0, bd = ~0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "del")) - is_add = 0; - else if (unformat (input, "mac %U", unformat_ethernet_address, mac)) - mac_set = 1; - else if (unformat (input, "ip %U", unformat_ip4_address, &ip4)) - ip_set = 1; - else if (unformat (input, "bd %d", &bd)) - bd_set = 1; - else - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; - } - } + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + vlib_pci_addr_t pci_addr; - if (!bd_set || !ip_set || (!mac_set && is_add)) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - errmsg ("Missing BD, IP or MAC!"); - return -99; + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } + node = vat_json_array_add (&vam->json_tree); - M (ONE_ADD_DEL_L2_ARP_ENTRY, mp); - mp->is_add = is_add; - clib_memcpy (mp->mac, mac, 6); - mp->bd = clib_host_to_net_u32 (bd); - mp->ip4 = ip4; - - /* send */ - S (mp); + pci_addr.domain = ntohs (mp->pci_addr.domain); + pci_addr.bus = mp->pci_addr.bus; + pci_addr.slot = mp->pci_addr.slot; + pci_addr.function = mp->pci_addr.function; - /* wait for reply */ - W (ret); - return ret; + vat_json_init_object (node); + vat_json_object_add_uint (node, "pci-addr", pci_addr.as_u32); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "rx_ring_sz", ntohs (mp->rx_ring_sz)); + vat_json_object_add_uint (node, "tx_ring_sz", ntohs (mp->tx_ring_sz)); + vat_json_object_add_uint (node, "features", + clib_net_to_host_u64 (mp->features)); + vat_json_object_add_string_copy (node, "mac_addr", + format (0, "%U", format_ethernet_address, + &mp->mac_addr)); } static int -api_one_ndp_bd_get (vat_main_t * vam) +api_sw_interface_virtio_pci_dump (vat_main_t * vam) { - vl_api_one_ndp_bd_get_t *mp; + vl_api_sw_interface_virtio_pci_dump_t *mp; + vl_api_control_ping_t *mp_ping; int ret; - M (ONE_NDP_BD_GET, mp); + print (vam->ofp, + "\n%-12s %-12s %-12s %-12s %-17s %-08s", + "pci_addr", "sw_if_index", "rx_ring_sz", "tx_ring_sz", + "mac_addr", "features"); - /* send */ + /* Get list of tap interfaces */ + M (SW_INTERFACE_VIRTIO_PCI_DUMP, mp); S (mp); - /* wait for reply */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } static int -api_one_ndp_entries_get (vat_main_t * vam) +api_vxlan_offload_rx (vat_main_t * vam) { - vl_api_one_ndp_entries_get_t *mp; - unformat_input_t *input = vam->input; - u8 bd_set = 0; - u32 bd = ~0; + unformat_input_t *line_input = vam->input; + vl_api_vxlan_offload_rx_t *mp; + u32 hw_if_index = ~0, rx_if_index = ~0; + u8 is_add = 1; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "bd %d", &bd)) - bd_set = 1; + if (unformat (line_input, "del")) + is_add = 0; + else if (unformat (line_input, "hw %U", api_unformat_hw_if_index, vam, + &hw_if_index)) + ; + else if (unformat (line_input, "hw hw_if_index %u", &hw_if_index)) + ; + else if (unformat (line_input, "rx %U", api_unformat_sw_if_index, vam, + &rx_if_index)) + ; + else if (unformat (line_input, "rx sw_if_index %u", &rx_if_index)) + ; else { - errmsg ("parse error '%U'", format_unformat_error, input); + errmsg ("parse error '%U'", format_unformat_error, line_input); return -99; } } - if (!bd_set) + if (hw_if_index == ~0) { - errmsg ("Expected bridge domain!"); + errmsg ("no hw interface"); return -99; } - M (ONE_NDP_ENTRIES_GET, mp); - mp->bd = clib_host_to_net_u32 (bd); + if (rx_if_index == ~0) + { + errmsg ("no rx tunnel"); + return -99; + } - /* send */ - S (mp); + M (VXLAN_OFFLOAD_RX, mp); + + mp->hw_if_index = ntohl (hw_if_index); + mp->sw_if_index = ntohl (rx_if_index); + mp->enable = is_add; - /* wait for reply */ + S (mp); W (ret); return ret; } -static int -api_one_l2_arp_bd_get (vat_main_t * vam) +static uword unformat_vxlan_decap_next + (unformat_input_t * input, va_list * args) { - vl_api_one_l2_arp_bd_get_t *mp; - int ret; - - M (ONE_L2_ARP_BD_GET, mp); - - /* send */ - S (mp); + u32 *result = va_arg (*args, u32 *); + u32 tmp; - /* wait for reply */ - W (ret); - return ret; + if (unformat (input, "l2")) + *result = VXLAN_INPUT_NEXT_L2_INPUT; + else if (unformat (input, "%d", &tmp)) + *result = tmp; + else + return 0; + return 1; } static int -api_one_l2_arp_entries_get (vat_main_t * vam) +api_vxlan_add_del_tunnel (vat_main_t * vam) { - vl_api_one_l2_arp_entries_get_t *mp; - unformat_input_t *input = vam->input; - u8 bd_set = 0; - u32 bd = ~0; + unformat_input_t *line_input = vam->input; + vl_api_vxlan_add_del_tunnel_t *mp; + ip46_address_t src, dst; + u8 is_add = 1; + u8 ipv4_set = 0, ipv6_set = 0; + u8 src_set = 0; + u8 dst_set = 0; + u8 grp_set = 0; + u32 instance = ~0; + u32 mcast_sw_if_index = ~0; + u32 encap_vrf_id = 0; + u32 decap_next_index = ~0; + u32 vni = 0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Can't "universally zero init" (={0}) due to GCC bug 53119 */ + clib_memset (&src, 0, sizeof src); + clib_memset (&dst, 0, sizeof dst); + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "bd %d", &bd)) - bd_set = 1; + if (unformat (line_input, "del")) + is_add = 0; + else if (unformat (line_input, "instance %d", &instance)) + ; + else + if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4)) + { + ipv4_set = 1; + src_set = 1; + } + else + if (unformat (line_input, "dst %U", unformat_ip4_address, &dst.ip4)) + { + ipv4_set = 1; + dst_set = 1; + } + else + if (unformat (line_input, "src %U", unformat_ip6_address, &src.ip6)) + { + ipv6_set = 1; + src_set = 1; + } + else + if (unformat (line_input, "dst %U", unformat_ip6_address, &dst.ip6)) + { + ipv6_set = 1; + dst_set = 1; + } + else if (unformat (line_input, "group %U %U", + unformat_ip4_address, &dst.ip4, + api_unformat_sw_if_index, vam, &mcast_sw_if_index)) + { + grp_set = dst_set = 1; + ipv4_set = 1; + } + else if (unformat (line_input, "group %U", + unformat_ip4_address, &dst.ip4)) + { + grp_set = dst_set = 1; + ipv4_set = 1; + } + else if (unformat (line_input, "group %U %U", + unformat_ip6_address, &dst.ip6, + api_unformat_sw_if_index, vam, &mcast_sw_if_index)) + { + grp_set = dst_set = 1; + ipv6_set = 1; + } + else if (unformat (line_input, "group %U", + unformat_ip6_address, &dst.ip6)) + { + grp_set = dst_set = 1; + ipv6_set = 1; + } + else + if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index)) + ; + else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) + ; + else if (unformat (line_input, "decap-next %U", + unformat_vxlan_decap_next, &decap_next_index)) + ; + else if (unformat (line_input, "vni %d", &vni)) + ; else { - errmsg ("parse error '%U'", format_unformat_error, input); + errmsg ("parse error '%U'", format_unformat_error, line_input); return -99; } } - if (!bd_set) + if (src_set == 0) { - errmsg ("Expected bridge domain!"); + errmsg ("tunnel src address not specified"); return -99; } - - M (ONE_L2_ARP_ENTRIES_GET, mp); - mp->bd = clib_host_to_net_u32 (bd); - - /* send */ - S (mp); - - /* wait for reply */ - W (ret); - return ret; -} - -static int -api_one_stats_enable_disable (vat_main_t * vam) -{ - vl_api_one_stats_enable_disable_t *mp; - unformat_input_t *input = vam->input; - u8 is_set = 0; - u8 is_en = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (dst_set == 0) { - if (unformat (input, "enable")) - { - is_set = 1; - is_en = 1; - } - else if (unformat (input, "disable")) - { - is_set = 1; - } - else - break; + errmsg ("tunnel dst address not specified"); + return -99; } - if (!is_set) + if (grp_set && !ip46_address_is_multicast (&dst)) { - errmsg ("Value not set"); + errmsg ("tunnel group address not multicast"); + return -99; + } + if (grp_set && mcast_sw_if_index == ~0) + { + errmsg ("tunnel nonexistent multicast device"); + return -99; + } + if (grp_set == 0 && ip46_address_is_multicast (&dst)) + { + errmsg ("tunnel dst address must be unicast"); return -99; } - M (ONE_STATS_ENABLE_DISABLE, mp); - mp->is_en = is_en; - - /* send */ - S (mp); - - /* wait for reply */ - W (ret); - return ret; -} - -static int -api_show_one_stats_enable_disable (vat_main_t * vam) -{ - vl_api_show_one_stats_enable_disable_t *mp; - int ret; - - M (SHOW_ONE_STATS_ENABLE_DISABLE, mp); - - /* send */ - S (mp); - - /* wait for reply */ - W (ret); - return ret; -} - -static int -api_show_one_map_request_mode (vat_main_t * vam) -{ - vl_api_show_one_map_request_mode_t *mp; - int ret; - - M (SHOW_ONE_MAP_REQUEST_MODE, mp); - - /* send */ - S (mp); - /* wait for reply */ - W (ret); - return ret; -} + if (ipv4_set && ipv6_set) + { + errmsg ("both IPv4 and IPv6 addresses specified"); + return -99; + } -#define api_show_lisp_map_request_mode api_show_one_map_request_mode + if ((vni == 0) || (vni >> 24)) + { + errmsg ("vni not specified or out of range"); + return -99; + } -static int -api_one_map_request_mode (vat_main_t * vam) -{ - unformat_input_t *input = vam->input; - vl_api_one_map_request_mode_t *mp; - u8 mode = 0; - int ret; + M (VXLAN_ADD_DEL_TUNNEL, mp); - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (ipv6_set) { - if (unformat (input, "dst-only")) - mode = 0; - else if (unformat (input, "src-dst")) - mode = 1; - else - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; - } + clib_memcpy (mp->src_address.un.ip6, &src.ip6, sizeof (src.ip6)); + clib_memcpy (mp->dst_address.un.ip6, &dst.ip6, sizeof (dst.ip6)); } + else + { + clib_memcpy (mp->src_address.un.ip4, &src.ip4, sizeof (src.ip4)); + clib_memcpy (mp->dst_address.un.ip4, &dst.ip4, sizeof (dst.ip4)); + } + mp->src_address.af = ipv6_set; + mp->dst_address.af = ipv6_set; - M (ONE_MAP_REQUEST_MODE, mp); - - mp->mode = mode; + mp->instance = htonl (instance); + mp->encap_vrf_id = ntohl (encap_vrf_id); + mp->decap_next_index = ntohl (decap_next_index); + mp->mcast_sw_if_index = ntohl (mcast_sw_if_index); + mp->vni = ntohl (vni); + mp->is_add = is_add; - /* send */ S (mp); - - /* wait for reply */ W (ret); return ret; } -#define api_lisp_map_request_mode api_one_map_request_mode +static void vl_api_vxlan_tunnel_details_t_handler + (vl_api_vxlan_tunnel_details_t * mp) +{ + vat_main_t *vam = &vat_main; + ip46_address_t src = + to_ip46 (mp->dst_address.af, (u8 *) & mp->dst_address.un); + ip46_address_t dst = + to_ip46 (mp->dst_address.af, (u8 *) & mp->src_address.un); -/** - * Enable/disable ONE proxy ITR. - * - * @param vam vpp API test context - * @return return code - */ -static int -api_one_pitr_set_locator_set (vat_main_t * vam) + print (vam->ofp, "%11d%11d%24U%24U%14d%18d%13d%19d", + ntohl (mp->sw_if_index), + ntohl (mp->instance), + format_ip46_address, &src, IP46_TYPE_ANY, + format_ip46_address, &dst, IP46_TYPE_ANY, + ntohl (mp->encap_vrf_id), + ntohl (mp->decap_next_index), ntohl (mp->vni), + ntohl (mp->mcast_sw_if_index)); +} + +static void vl_api_vxlan_tunnel_details_t_handler_json + (vl_api_vxlan_tunnel_details_t * mp) { - u8 ls_name_set = 0; - unformat_input_t *input = vam->input; - vl_api_one_pitr_set_locator_set_t *mp; - u8 is_add = 1; - u8 *ls_name = 0; - int ret; + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - if (unformat (input, "del")) - is_add = 0; - else if (unformat (input, "locator-set %s", &ls_name)) - ls_name_set = 1; - else - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; - } + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } + node = vat_json_array_add (&vam->json_tree); - if (!ls_name_set) - { - errmsg ("locator-set name not set!"); - return -99; - } + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - M (ONE_PITR_SET_LOCATOR_SET, mp); + vat_json_object_add_uint (node, "instance", ntohl (mp->instance)); - mp->is_add = is_add; - clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name)); - vec_free (ls_name); + if (mp->src_address.af) + { + struct in6_addr ip6; - /* send */ - S (mp); + clib_memcpy (&ip6, mp->src_address.un.ip6, sizeof (ip6)); + vat_json_object_add_ip6 (node, "src_address", ip6); + clib_memcpy (&ip6, mp->dst_address.un.ip6, sizeof (ip6)); + vat_json_object_add_ip6 (node, "dst_address", ip6); + } + else + { + struct in_addr ip4; - /* wait for reply */ - W (ret); - return ret; + clib_memcpy (&ip4, mp->src_address.un.ip4, sizeof (ip4)); + vat_json_object_add_ip4 (node, "src_address", ip4); + clib_memcpy (&ip4, mp->dst_address.un.ip4, sizeof (ip4)); + vat_json_object_add_ip4 (node, "dst_address", ip4); + } + vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id)); + vat_json_object_add_uint (node, "decap_next_index", + ntohl (mp->decap_next_index)); + vat_json_object_add_uint (node, "vni", ntohl (mp->vni)); + vat_json_object_add_uint (node, "mcast_sw_if_index", + ntohl (mp->mcast_sw_if_index)); } -#define api_lisp_pitr_set_locator_set api_one_pitr_set_locator_set - static int -api_one_nsh_set_locator_set (vat_main_t * vam) +api_vxlan_tunnel_dump (vat_main_t * vam) { - u8 ls_name_set = 0; - unformat_input_t *input = vam->input; - vl_api_one_nsh_set_locator_set_t *mp; - u8 is_add = 1; - u8 *ls_name = 0; + unformat_input_t *i = vam->input; + vl_api_vxlan_tunnel_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u32 sw_if_index; + u8 sw_if_index_set = 0; int ret; /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) - is_add = 0; - else if (unformat (input, "ls %s", &ls_name)) - ls_name_set = 1; + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; - } + break; } - if (!ls_name_set && is_add) + if (sw_if_index_set == 0) { - errmsg ("locator-set name not set!"); - return -99; + sw_if_index = ~0; + } + + if (!vam->json_output) + { + print (vam->ofp, "%11s%11s%24s%24s%14s%18s%13s%19s", + "sw_if_index", "instance", "src_address", "dst_address", + "encap_vrf_id", "decap_next_index", "vni", "mcast_sw_if_index"); } - M (ONE_NSH_SET_LOCATOR_SET, mp); + /* Get list of vxlan-tunnel interfaces */ + M (VXLAN_TUNNEL_DUMP, mp); - mp->is_add = is_add; - clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name)); - vec_free (ls_name); + mp->sw_if_index = htonl (sw_if_index); - /* send */ S (mp); - /* wait for reply */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } static int -api_show_one_pitr (vat_main_t * vam) +api_l2_fib_clear_table (vat_main_t * vam) { - vl_api_show_one_pitr_t *mp; +// unformat_input_t * i = vam->input; + vl_api_l2_fib_clear_table_t *mp; int ret; - if (!vam->json_output) - { - print (vam->ofp, "%=20s", "lisp status:"); - } + M (L2_FIB_CLEAR_TABLE, mp); - M (SHOW_ONE_PITR, mp); - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } -#define api_show_lisp_pitr api_show_one_pitr - static int -api_one_use_petr (vat_main_t * vam) +api_l2_interface_efp_filter (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_use_petr_t *mp; - u8 is_add = 0; - ip_address_t ip; + unformat_input_t *i = vam->input; + vl_api_l2_interface_efp_filter_t *mp; + u32 sw_if_index; + u8 enable = 1; + u8 sw_if_index_set = 0; int ret; - clib_memset (&ip, 0, sizeof (ip)); - - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "disable")) - is_add = 0; - else - if (unformat (input, "%U", unformat_ip4_address, &ip_addr_v4 (&ip))) - { - is_add = 1; - ip_addr_version (&ip) = AF_IP4; - } - else - if (unformat (input, "%U", unformat_ip6_address, &ip_addr_v6 (&ip))) - { - is_add = 1; - ip_addr_version (&ip) = AF_IP6; - } + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "enable")) + enable = 1; + else if (unformat (i, "disable")) + enable = 0; else { - errmsg ("parse error '%U'", format_unformat_error, input); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - M (ONE_USE_PETR, mp); - - mp->is_add = is_add; - if (is_add) + if (sw_if_index_set == 0) { - mp->is_ip4 = ip_addr_version (&ip) == AF_IP4 ? 1 : 0; - if (mp->is_ip4) - clib_memcpy (mp->address, &ip, 4); - else - clib_memcpy (mp->address, &ip, 16); + errmsg ("missing sw_if_index"); + return -99; } - /* send */ - S (mp); + M (L2_INTERFACE_EFP_FILTER, mp); + + mp->sw_if_index = ntohl (sw_if_index); + mp->enable_disable = enable; - /* wait for reply */ + S (mp); W (ret); return ret; } -#define api_lisp_use_petr api_one_use_petr +#define foreach_vtr_op \ +_("disable", L2_VTR_DISABLED) \ +_("push-1", L2_VTR_PUSH_1) \ +_("push-2", L2_VTR_PUSH_2) \ +_("pop-1", L2_VTR_POP_1) \ +_("pop-2", L2_VTR_POP_2) \ +_("translate-1-1", L2_VTR_TRANSLATE_1_1) \ +_("translate-1-2", L2_VTR_TRANSLATE_1_2) \ +_("translate-2-1", L2_VTR_TRANSLATE_2_1) \ +_("translate-2-2", L2_VTR_TRANSLATE_2_2) static int -api_show_one_nsh_mapping (vat_main_t * vam) +api_l2_interface_vlan_tag_rewrite (vat_main_t * vam) { - vl_api_show_one_use_petr_t *mp; + unformat_input_t *i = vam->input; + vl_api_l2_interface_vlan_tag_rewrite_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u8 vtr_op_set = 0; + u32 vtr_op = 0; + u32 push_dot1q = 1; + u32 tag1 = ~0; + u32 tag2 = ~0; int ret; - if (!vam->json_output) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - print (vam->ofp, "%=20s", "local ONE NSH mapping:"); + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "vtr_op %d", &vtr_op)) + vtr_op_set = 1; +#define _(n,v) else if (unformat(i, n)) {vtr_op = v; vtr_op_set = 1;} + foreach_vtr_op +#undef _ + else if (unformat (i, "push_dot1q %d", &push_dot1q)) + ; + else if (unformat (i, "tag1 %d", &tag1)) + ; + else if (unformat (i, "tag2 %d", &tag2)) + ; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - M (SHOW_ONE_NSH_MAPPING, mp); - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_show_one_use_petr (vat_main_t * vam) -{ - vl_api_show_one_use_petr_t *mp; - int ret; - - if (!vam->json_output) + if ((sw_if_index_set == 0) || (vtr_op_set == 0)) { - print (vam->ofp, "%=20s", "Proxy-ETR status:"); + errmsg ("missing vtr operation or sw_if_index"); + return -99; } - M (SHOW_ONE_USE_PETR, mp); - /* send it... */ - S (mp); + M (L2_INTERFACE_VLAN_TAG_REWRITE, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->vtr_op = ntohl (vtr_op); + mp->push_dot1q = ntohl (push_dot1q); + mp->tag1 = ntohl (tag1); + mp->tag2 = ntohl (tag2); - /* Wait for a reply... */ + S (mp); W (ret); return ret; } -#define api_show_lisp_use_petr api_show_one_use_petr - -/** - * Add/delete mapping between vni and vrf - */ static int -api_one_eid_table_add_del_map (vat_main_t * vam) +api_create_vhost_user_if (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_eid_table_add_del_map_t *mp; - u8 is_add = 1, vni_set = 0, vrf_set = 0, bd_index_set = 0; - u32 vni, vrf, bd_index; + unformat_input_t *i = vam->input; + vl_api_create_vhost_user_if_t *mp; + u8 *file_name; + u8 is_server = 0; + u8 file_name_set = 0; + u32 custom_dev_instance = ~0; + u8 hwaddr[6]; + u8 use_custom_mac = 0; + u8 disable_mrg_rxbuf = 0; + u8 disable_indirect_desc = 0; + u8 *tag = 0; + u8 enable_gso = 0; + u8 enable_packed = 0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Shut up coverity */ + clib_memset (hwaddr, 0, sizeof (hwaddr)); + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) - is_add = 0; - else if (unformat (input, "vrf %d", &vrf)) - vrf_set = 1; - else if (unformat (input, "bd_index %d", &bd_index)) - bd_index_set = 1; - else if (unformat (input, "vni %d", &vni)) - vni_set = 1; + if (unformat (i, "socket %s", &file_name)) + { + file_name_set = 1; + } + else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance)) + ; + else if (unformat (i, "mac %U", unformat_ethernet_address, hwaddr)) + use_custom_mac = 1; + else if (unformat (i, "server")) + is_server = 1; + else if (unformat (i, "disable_mrg_rxbuf")) + disable_mrg_rxbuf = 1; + else if (unformat (i, "disable_indirect_desc")) + disable_indirect_desc = 1; + else if (unformat (i, "gso")) + enable_gso = 1; + else if (unformat (i, "packed")) + enable_packed = 1; + else if (unformat (i, "tag %s", &tag)) + ; else break; } - if (!vni_set || (!vrf_set && !bd_index_set)) + if (file_name_set == 0) { - errmsg ("missing arguments!"); + errmsg ("missing socket file name"); return -99; } - if (vrf_set && bd_index_set) + if (vec_len (file_name) > 255) { - errmsg ("error: both vrf and bd entered!"); + errmsg ("socket file name too long"); return -99; } + vec_add1 (file_name, 0); - M (ONE_EID_TABLE_ADD_DEL_MAP, mp); + M (CREATE_VHOST_USER_IF, mp); - mp->is_add = is_add; - mp->vni = htonl (vni); - mp->dp_table = vrf_set ? htonl (vrf) : htonl (bd_index); - mp->is_l2 = bd_index_set; + mp->is_server = is_server; + mp->disable_mrg_rxbuf = disable_mrg_rxbuf; + mp->disable_indirect_desc = disable_indirect_desc; + mp->enable_gso = enable_gso; + mp->enable_packed = enable_packed; + clib_memcpy (mp->sock_filename, file_name, vec_len (file_name)); + vec_free (file_name); + if (custom_dev_instance != ~0) + { + mp->renumber = 1; + mp->custom_dev_instance = ntohl (custom_dev_instance); + } - /* send */ - S (mp); + mp->use_custom_mac = use_custom_mac; + clib_memcpy (mp->mac_address, hwaddr, 6); + if (tag) + strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1); + vec_free (tag); - /* wait for reply */ + S (mp); W (ret); return ret; } -#define api_lisp_eid_table_add_del_map api_one_eid_table_add_del_map - -uword -unformat_negative_mapping_action (unformat_input_t * input, va_list * args) -{ - u32 *action = va_arg (*args, u32 *); - u8 *s = 0; - - if (unformat (input, "%s", &s)) - { - if (!strcmp ((char *) s, "no-action")) - action[0] = 0; - else if (!strcmp ((char *) s, "natively-forward")) - action[0] = 1; - else if (!strcmp ((char *) s, "send-map-request")) - action[0] = 2; - else if (!strcmp ((char *) s, "drop")) - action[0] = 3; - else - { - clib_warning ("invalid action: '%s'", s); - action[0] = 3; - } - } - else - return 0; - - vec_free (s); - return 1; -} - -/** - * Add/del remote mapping to/from ONE control plane - * - * @param vam vpp API test context - * @return return code - */ static int -api_one_add_del_remote_mapping (vat_main_t * vam) +api_modify_vhost_user_if (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_add_del_remote_mapping_t *mp; - u32 vni = 0; - lisp_eid_vat_t _eid, *eid = &_eid; - lisp_eid_vat_t _seid, *seid = &_seid; - u8 is_add = 1, del_all = 0, eid_set = 0, seid_set = 0; - u32 action = ~0, p, w, data_len; - ip4_address_t rloc4; - ip6_address_t rloc6; - vl_api_remote_locator_t *rlocs = 0, rloc, *curr_rloc = 0; + unformat_input_t *i = vam->input; + vl_api_modify_vhost_user_if_t *mp; + u8 *file_name; + u8 is_server = 0; + u8 file_name_set = 0; + u32 custom_dev_instance = ~0; + u8 sw_if_index_set = 0; + u32 sw_if_index = (u32) ~ 0; + u8 enable_gso = 0; + u8 enable_packed = 0; int ret; - clib_memset (&rloc, 0, sizeof (rloc)); - - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del-all")) - { - del_all = 1; - } - else if (unformat (input, "del")) - { - is_add = 0; - } - else if (unformat (input, "add")) - { - is_add = 1; - } - else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid)) - { - eid_set = 1; - } - else if (unformat (input, "seid %U", unformat_lisp_eid_vat, seid)) - { - seid_set = 1; - } - else if (unformat (input, "vni %d", &vni)) - { - ; - } - else if (unformat (input, "p %d w %d", &p, &w)) - { - if (!curr_rloc) - { - errmsg ("No RLOC configured for setting priority/weight!"); - return -99; - } - curr_rloc->priority = p; - curr_rloc->weight = w; - } - else if (unformat (input, "rloc %U", unformat_ip4_address, &rloc4)) - { - rloc.is_ip4 = 1; - clib_memcpy (&rloc.addr, &rloc4, sizeof (rloc4)); - vec_add1 (rlocs, rloc); - curr_rloc = &rlocs[vec_len (rlocs) - 1]; - } - else if (unformat (input, "rloc %U", unformat_ip6_address, &rloc6)) - { - rloc.is_ip4 = 0; - clib_memcpy (&rloc.addr, &rloc6, sizeof (rloc6)); - vec_add1 (rlocs, rloc); - curr_rloc = &rlocs[vec_len (rlocs) - 1]; - } - else if (unformat (input, "action %U", - unformat_negative_mapping_action, &action)) + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "socket %s", &file_name)) { - ; + file_name_set = 1; } + else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance)) + ; + else if (unformat (i, "server")) + is_server = 1; + else if (unformat (i, "gso")) + enable_gso = 1; + else if (unformat (i, "packed")) + enable_packed = 1; else - { - clib_warning ("parse error '%U'", format_unformat_error, input); - return -99; - } + break; } - if (0 == eid_set) + if (sw_if_index_set == 0) { - errmsg ("missing params!"); + errmsg ("missing sw_if_index or interface name"); return -99; } - if (is_add && (~0 == action) && 0 == vec_len (rlocs)) + if (file_name_set == 0) { - errmsg ("no action set for negative map-reply!"); + errmsg ("missing socket file name"); return -99; } - data_len = vec_len (rlocs) * sizeof (vl_api_remote_locator_t); + if (vec_len (file_name) > 255) + { + errmsg ("socket file name too long"); + return -99; + } + vec_add1 (file_name, 0); - M2 (ONE_ADD_DEL_REMOTE_MAPPING, mp, data_len); - mp->is_add = is_add; - mp->vni = htonl (vni); - mp->action = (u8) action; - mp->is_src_dst = seid_set; - mp->eid_len = eid->len; - mp->seid_len = seid->len; - mp->del_all = del_all; - mp->eid_type = eid->type; - lisp_eid_put_vat (mp->eid, eid->addr, eid->type); - lisp_eid_put_vat (mp->seid, seid->addr, seid->type); + M (MODIFY_VHOST_USER_IF, mp); - mp->rloc_num = clib_host_to_net_u32 (vec_len (rlocs)); - clib_memcpy (mp->rlocs, rlocs, data_len); - vec_free (rlocs); + mp->sw_if_index = ntohl (sw_if_index); + mp->is_server = is_server; + mp->enable_gso = enable_gso; + mp->enable_packed = enable_packed; + clib_memcpy (mp->sock_filename, file_name, vec_len (file_name)); + vec_free (file_name); + if (custom_dev_instance != ~0) + { + mp->renumber = 1; + mp->custom_dev_instance = ntohl (custom_dev_instance); + } - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_add_del_remote_mapping api_one_add_del_remote_mapping - -/** - * Add/del ONE adjacency. Saves mapping in ONE control plane and updates - * forwarding entries in data-plane accordingly. - * - * @param vam vpp API test context - * @return return code - */ static int -api_one_add_del_adjacency (vat_main_t * vam) +api_delete_vhost_user_if (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_add_del_adjacency_t *mp; - u32 vni = 0; - ip4_address_t leid4, reid4; - ip6_address_t leid6, reid6; - u8 reid_mac[6] = { 0 }; - u8 leid_mac[6] = { 0 }; - u8 reid_type, leid_type; - u32 leid_len = 0, reid_len = 0, len; - u8 is_add = 1; + unformat_input_t *i = vam->input; + vl_api_delete_vhost_user_if_t *mp; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; int ret; - leid_type = reid_type = (u8) ~ 0; - - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) - { - is_add = 0; - } - else if (unformat (input, "add")) - { - is_add = 1; - } - else if (unformat (input, "reid %U/%d", unformat_ip4_address, - &reid4, &len)) - { - reid_type = 0; /* ipv4 */ - reid_len = len; - } - else if (unformat (input, "reid %U/%d", unformat_ip6_address, - &reid6, &len)) - { - reid_type = 1; /* ipv6 */ - reid_len = len; - } - else if (unformat (input, "reid %U", unformat_ethernet_address, - reid_mac)) - { - reid_type = 2; /* mac */ - } - else if (unformat (input, "leid %U/%d", unformat_ip4_address, - &leid4, &len)) - { - leid_type = 0; /* ipv4 */ - leid_len = len; - } - else if (unformat (input, "leid %U/%d", unformat_ip6_address, - &leid6, &len)) - { - leid_type = 1; /* ipv6 */ - leid_len = len; - } - else if (unformat (input, "leid %U", unformat_ethernet_address, - leid_mac)) - { - leid_type = 2; /* mac */ - } - else if (unformat (input, "vni %d", &vni)) - { - ; - } + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; - } + break; } - if ((u8) ~ 0 == reid_type) + if (sw_if_index_set == 0) { - errmsg ("missing params!"); + errmsg ("missing sw_if_index or interface name"); return -99; } - if (leid_type != reid_type) - { - errmsg ("remote and local EIDs are of different types!"); - return -99; - } - M (ONE_ADD_DEL_ADJACENCY, mp); - mp->is_add = is_add; - mp->vni = htonl (vni); - mp->leid_len = leid_len; - mp->reid_len = reid_len; - mp->eid_type = reid_type; + M (DELETE_VHOST_USER_IF, mp); - switch (mp->eid_type) - { - case 0: - clib_memcpy (mp->leid, &leid4, sizeof (leid4)); - clib_memcpy (mp->reid, &reid4, sizeof (reid4)); - break; - case 1: - clib_memcpy (mp->leid, &leid6, sizeof (leid6)); - clib_memcpy (mp->reid, &reid6, sizeof (reid6)); - break; - case 2: - clib_memcpy (mp->leid, leid_mac, 6); - clib_memcpy (mp->reid, reid_mac, 6); - break; - default: - errmsg ("unknown EID type %d!", mp->eid_type); - return 0; - } + mp->sw_if_index = ntohl (sw_if_index); - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_add_del_adjacency api_one_add_del_adjacency +static void vl_api_sw_interface_vhost_user_details_t_handler + (vl_api_sw_interface_vhost_user_details_t * mp) +{ + vat_main_t *vam = &vat_main; + u64 features; -uword -unformat_gpe_encap_mode (unformat_input_t * input, va_list * args) + features = + clib_net_to_host_u32 (mp->features_first_32) | ((u64) + clib_net_to_host_u32 + (mp->features_last_32) << + 32); + + print (vam->ofp, "%-25s %3" PRIu32 " %6" PRIu32 " %8x %6d %7d %s", + (char *) mp->interface_name, + ntohl (mp->sw_if_index), ntohl (mp->virtio_net_hdr_sz), + features, mp->is_server, + ntohl (mp->num_regions), (char *) mp->sock_filename); + print (vam->ofp, " Status: '%s'", strerror (ntohl (mp->sock_errno))); +} + +static void vl_api_sw_interface_vhost_user_details_t_handler_json + (vl_api_sw_interface_vhost_user_details_t * mp) { - u32 *mode = va_arg (*args, u32 *); + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; - if (unformat (input, "lisp")) - *mode = 0; - else if (unformat (input, "vxlan")) - *mode = 1; - else - return 0; + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); - return 1; + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_string_copy (node, "interface_name", + mp->interface_name); + vat_json_object_add_uint (node, "virtio_net_hdr_sz", + ntohl (mp->virtio_net_hdr_sz)); + vat_json_object_add_uint (node, "features_first_32", + clib_net_to_host_u32 (mp->features_first_32)); + vat_json_object_add_uint (node, "features_last_32", + clib_net_to_host_u32 (mp->features_last_32)); + vat_json_object_add_uint (node, "is_server", mp->is_server); + vat_json_object_add_string_copy (node, "sock_filename", mp->sock_filename); + vat_json_object_add_uint (node, "num_regions", ntohl (mp->num_regions)); + vat_json_object_add_uint (node, "sock_errno", ntohl (mp->sock_errno)); } static int -api_gpe_get_encap_mode (vat_main_t * vam) +api_sw_interface_vhost_user_dump (vat_main_t * vam) { - vl_api_gpe_get_encap_mode_t *mp; + unformat_input_t *i = vam->input; + vl_api_sw_interface_vhost_user_dump_t *mp; + vl_api_control_ping_t *mp_ping; int ret; + u32 sw_if_index = ~0; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + ; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + ; + else + break; + } - /* Construct the API message */ - M (GPE_GET_ENCAP_MODE, mp); + print (vam->ofp, + "Interface name idx hdr_sz features server regions filename"); - /* send it... */ + /* Get list of vhost-user interfaces */ + M (SW_INTERFACE_VHOST_USER_DUMP, mp); + mp->sw_if_index = ntohl (sw_if_index); S (mp); - /* Wait for a reply... */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } static int -api_gpe_set_encap_mode (vat_main_t * vam) +api_show_version (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_gpe_set_encap_mode_t *mp; + vl_api_show_version_t *mp; int ret; - u32 mode = 0; - - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "%U", unformat_gpe_encap_mode, &mode)) - ; - else - break; - } - /* Construct the API message */ - M (GPE_SET_ENCAP_MODE, mp); - - mp->mode = mode; + M (SHOW_VERSION, mp); - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } + static int -api_lisp_gpe_add_del_iface (vat_main_t * vam) +api_vxlan_gpe_add_del_tunnel (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_gpe_add_del_iface_t *mp; - u8 action_set = 0, is_add = 1, is_l2 = 0, dp_table_set = 0, vni_set = 0; - u32 dp_table = 0, vni = 0; + unformat_input_t *line_input = vam->input; + vl_api_vxlan_gpe_add_del_tunnel_t *mp; + ip46_address_t local, remote; + u8 is_add = 1; + u8 local_set = 0; + u8 remote_set = 0; + u8 grp_set = 0; + u32 mcast_sw_if_index = ~0; + u32 encap_vrf_id = 0; + u32 decap_vrf_id = 0; + u8 protocol = ~0; + u32 vni; + u8 vni_set = 0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "up")) + if (unformat (line_input, "del")) + is_add = 0; + else if (unformat (line_input, "local %U", + unformat_ip46_address, &local)) { - action_set = 1; - is_add = 1; + local_set = 1; } - else if (unformat (input, "down")) + else if (unformat (line_input, "remote %U", + unformat_ip46_address, &remote)) { - action_set = 1; - is_add = 0; + remote_set = 1; } - else if (unformat (input, "table_id %d", &dp_table)) + else if (unformat (line_input, "group %U %U", + unformat_ip46_address, &remote, + api_unformat_sw_if_index, vam, &mcast_sw_if_index)) { - dp_table_set = 1; + grp_set = remote_set = 1; } - else if (unformat (input, "bd_id %d", &dp_table)) + else if (unformat (line_input, "group %U", + unformat_ip46_address, &remote)) { - dp_table_set = 1; - is_l2 = 1; + grp_set = remote_set = 1; } - else if (unformat (input, "vni %d", &vni)) + else + if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index)) + ; + else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) + ; + else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id)) + ; + else if (unformat (line_input, "vni %d", &vni)) + vni_set = 1; + else if (unformat (line_input, "next-ip4")) + protocol = 1; + else if (unformat (line_input, "next-ip6")) + protocol = 2; + else if (unformat (line_input, "next-ethernet")) + protocol = 3; + else if (unformat (line_input, "next-nsh")) + protocol = 4; + else { - vni_set = 1; + errmsg ("parse error '%U'", format_unformat_error, line_input); + return -99; } - else - break; } - if (action_set == 0) + if (local_set == 0) { - errmsg ("Action not set"); + errmsg ("tunnel local address not specified"); return -99; } - if (dp_table_set == 0 || vni_set == 0) + if (remote_set == 0) { - errmsg ("vni and dp_table must be set"); + errmsg ("tunnel remote address not specified"); return -99; } - - /* Construct the API message */ - M (GPE_ADD_DEL_IFACE, mp); - - mp->is_add = is_add; - mp->dp_table = clib_host_to_net_u32 (dp_table); - mp->is_l2 = is_l2; - mp->vni = clib_host_to_net_u32 (vni); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_one_map_register_fallback_threshold (vat_main_t * vam) -{ - unformat_input_t *input = vam->input; - vl_api_one_map_register_fallback_threshold_t *mp; - u32 value = 0; - u8 is_set = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (grp_set && mcast_sw_if_index == ~0) { - if (unformat (input, "%u", &value)) - is_set = 1; - else - { - clib_warning ("parse error '%U'", format_unformat_error, input); - return -99; - } + errmsg ("tunnel nonexistent multicast device"); + return -99; + } + if (ip46_address_is_ip4 (&local) != ip46_address_is_ip4 (&remote)) + { + errmsg ("both IPv4 and IPv6 addresses specified"); + return -99; } - if (!is_set) + if (vni_set == 0) { - errmsg ("fallback threshold value is missing!"); + errmsg ("vni not specified"); return -99; } - M (ONE_MAP_REGISTER_FALLBACK_THRESHOLD, mp); - mp->value = clib_host_to_net_u32 (value); + M (VXLAN_GPE_ADD_DEL_TUNNEL, mp); - /* send it... */ - S (mp); + ip_address_encode (&local, + ip46_address_is_ip4 (&local) ? IP46_TYPE_IP4 : + IP46_TYPE_IP6, &mp->local); + ip_address_encode (&remote, + ip46_address_is_ip4 (&remote) ? IP46_TYPE_IP4 : + IP46_TYPE_IP6, &mp->remote); - /* Wait for a reply... */ + mp->mcast_sw_if_index = ntohl (mcast_sw_if_index); + mp->encap_vrf_id = ntohl (encap_vrf_id); + mp->decap_vrf_id = ntohl (decap_vrf_id); + mp->protocol = protocol; + mp->vni = ntohl (vni); + mp->is_add = is_add; + + S (mp); W (ret); return ret; } -static int -api_show_one_map_register_fallback_threshold (vat_main_t * vam) +static void vl_api_vxlan_gpe_tunnel_details_t_handler + (vl_api_vxlan_gpe_tunnel_details_t * mp) { - vl_api_show_one_map_register_fallback_threshold_t *mp; - int ret; - - M (SHOW_ONE_MAP_REGISTER_FALLBACK_THRESHOLD, mp); + vat_main_t *vam = &vat_main; + ip46_address_t local, remote; - /* send it... */ - S (mp); + ip_address_decode (&mp->local, &local); + ip_address_decode (&mp->remote, &remote); - /* Wait for a reply... */ - W (ret); - return ret; + print (vam->ofp, "%11d%24U%24U%13d%12d%19d%14d%14d", + ntohl (mp->sw_if_index), + format_ip46_address, &local, IP46_TYPE_ANY, + format_ip46_address, &remote, IP46_TYPE_ANY, + ntohl (mp->vni), mp->protocol, + ntohl (mp->mcast_sw_if_index), + ntohl (mp->encap_vrf_id), ntohl (mp->decap_vrf_id)); } -uword -unformat_lisp_transport_protocol (unformat_input_t * input, va_list * args) + +static void vl_api_vxlan_gpe_tunnel_details_t_handler_json + (vl_api_vxlan_gpe_tunnel_details_t * mp) { - u32 *proto = va_arg (*args, u32 *); + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + struct in_addr ip4; + struct in6_addr ip6; + ip46_address_t local, remote; - if (unformat (input, "udp")) - *proto = 1; - else if (unformat (input, "api")) - *proto = 2; - else - return 0; + ip_address_decode (&mp->local, &local); + ip_address_decode (&mp->remote, &remote); - return 1; + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + if (ip46_address_is_ip4 (&local)) + { + clib_memcpy (&ip4, &local.ip4, sizeof (ip4)); + vat_json_object_add_ip4 (node, "local", ip4); + clib_memcpy (&ip4, &remote.ip4, sizeof (ip4)); + vat_json_object_add_ip4 (node, "remote", ip4); + } + else + { + clib_memcpy (&ip6, &local.ip6, sizeof (ip6)); + vat_json_object_add_ip6 (node, "local", ip6); + clib_memcpy (&ip6, &remote.ip6, sizeof (ip6)); + vat_json_object_add_ip6 (node, "remote", ip6); + } + vat_json_object_add_uint (node, "vni", ntohl (mp->vni)); + vat_json_object_add_uint (node, "protocol", ntohl (mp->protocol)); + vat_json_object_add_uint (node, "mcast_sw_if_index", + ntohl (mp->mcast_sw_if_index)); + vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id)); + vat_json_object_add_uint (node, "decap_vrf_id", ntohl (mp->decap_vrf_id)); + vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0); } static int -api_one_set_transport_protocol (vat_main_t * vam) +api_vxlan_gpe_tunnel_dump (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_set_transport_protocol_t *mp; - u8 is_set = 0; - u32 protocol = 0; + unformat_input_t *i = vam->input; + vl_api_vxlan_gpe_tunnel_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u32 sw_if_index; + u8 sw_if_index_set = 0; int ret; /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "%U", unformat_lisp_transport_protocol, &protocol)) - is_set = 1; + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else - { - clib_warning ("parse error '%U'", format_unformat_error, input); - return -99; - } + break; + } + + if (sw_if_index_set == 0) + { + sw_if_index = ~0; } - if (!is_set) + if (!vam->json_output) { - errmsg ("Transport protocol missing!"); - return -99; + print (vam->ofp, "%11s%24s%24s%13s%15s%19s%14s%14s", + "sw_if_index", "local", "remote", "vni", + "protocol", "mcast_sw_if_index", "encap_vrf_id", "decap_vrf_id"); } - M (ONE_SET_TRANSPORT_PROTOCOL, mp); - mp->protocol = (u8) protocol; + /* Get list of vxlan-tunnel interfaces */ + M (VXLAN_GPE_TUNNEL_DUMP, mp); + + mp->sw_if_index = htonl (sw_if_index); - /* send it... */ S (mp); - /* Wait for a reply... */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } -static int -api_one_get_transport_protocol (vat_main_t * vam) +static void vl_api_l2_fib_table_details_t_handler + (vl_api_l2_fib_table_details_t * mp) { - vl_api_one_get_transport_protocol_t *mp; - int ret; + vat_main_t *vam = &vat_main; - M (ONE_GET_TRANSPORT_PROTOCOL, mp); + print (vam->ofp, "%3" PRIu32 " %U %3" PRIu32 + " %d %d %d", + ntohl (mp->bd_id), format_ethernet_address, mp->mac, + ntohl (mp->sw_if_index), mp->static_mac, mp->filter_mac, + mp->bvi_mac); +} - /* send it... */ - S (mp); +static void vl_api_l2_fib_table_details_t_handler_json + (vl_api_l2_fib_table_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; - /* Wait for a reply... */ - W (ret); - return ret; + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id)); + vat_json_object_add_bytes (node, "mac", mp->mac, 6); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "static_mac", mp->static_mac); + vat_json_object_add_uint (node, "filter_mac", mp->filter_mac); + vat_json_object_add_uint (node, "bvi_mac", mp->bvi_mac); } static int -api_one_map_register_set_ttl (vat_main_t * vam) +api_l2_fib_table_dump (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_map_register_set_ttl_t *mp; - u32 ttl = 0; - u8 is_set = 0; + unformat_input_t *i = vam->input; + vl_api_l2_fib_table_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u32 bd_id; + u8 bd_id_set = 0; int ret; /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "%u", &ttl)) - is_set = 1; + if (unformat (i, "bd_id %d", &bd_id)) + bd_id_set = 1; else - { - clib_warning ("parse error '%U'", format_unformat_error, input); - return -99; - } + break; } - if (!is_set) + if (bd_id_set == 0) { - errmsg ("TTL value missing!"); + errmsg ("missing bridge domain"); return -99; } - M (ONE_MAP_REGISTER_SET_TTL, mp); - mp->ttl = clib_host_to_net_u32 (ttl); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_show_one_map_register_ttl (vat_main_t * vam) -{ - vl_api_show_one_map_register_ttl_t *mp; - int ret; + print (vam->ofp, "BD-ID Mac Address sw-ndx Static Filter BVI"); - M (SHOW_ONE_MAP_REGISTER_TTL, mp); + /* Get list of l2 fib entries */ + M (L2_FIB_TABLE_DUMP, mp); - /* send it... */ + mp->bd_id = ntohl (bd_id); S (mp); - /* Wait for a reply... */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } -/** - * Add/del map request itr rlocs from ONE control plane and updates - * - * @param vam vpp API test context - * @return return code - */ + static int -api_one_add_del_map_request_itr_rlocs (vat_main_t * vam) +api_interface_name_renumber (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_add_del_map_request_itr_rlocs_t *mp; - u8 *locator_set_name = 0; - u8 locator_set_name_set = 0; - u8 is_add = 1; + unformat_input_t *line_input = vam->input; + vl_api_interface_name_renumber_t *mp; + u32 sw_if_index = ~0; + u32 new_show_dev_instance = ~0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) - { - is_add = 0; - } - else if (unformat (input, "%_%v%_", &locator_set_name)) - { - locator_set_name_set = 1; - } + if (unformat (line_input, "%U", api_unformat_sw_if_index, vam, + &sw_if_index)) + ; + else if (unformat (line_input, "sw_if_index %d", &sw_if_index)) + ; + else if (unformat (line_input, "new_show_dev_instance %d", + &new_show_dev_instance)) + ; else - { - clib_warning ("parse error '%U'", format_unformat_error, input); - return -99; - } + break; } - if (is_add && !locator_set_name_set) + if (sw_if_index == ~0) { - errmsg ("itr-rloc is not set!"); + errmsg ("missing interface name or sw_if_index"); return -99; } - if (is_add && vec_len (locator_set_name) > 64) + if (new_show_dev_instance == ~0) { - errmsg ("itr-rloc locator-set name too long"); - vec_free (locator_set_name); + errmsg ("missing new_show_dev_instance"); return -99; } - M (ONE_ADD_DEL_MAP_REQUEST_ITR_RLOCS, mp); - mp->is_add = is_add; - if (is_add) - { - clib_memcpy (mp->locator_set_name, locator_set_name, - vec_len (locator_set_name)); - } - else - { - clib_memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name)); - } - vec_free (locator_set_name); + M (INTERFACE_NAME_RENUMBER, mp); - /* send it... */ - S (mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->new_show_dev_instance = ntohl (new_show_dev_instance); - /* Wait for a reply... */ + S (mp); W (ret); return ret; } -#define api_lisp_add_del_map_request_itr_rlocs api_one_add_del_map_request_itr_rlocs - static int -api_one_locator_dump (vat_main_t * vam) +api_want_l2_macs_events (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_locator_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u8 is_index_set = 0, is_name_set = 0; - u8 *ls_name = 0; - u32 ls_index = ~0; + unformat_input_t *line_input = vam->input; + vl_api_want_l2_macs_events_t *mp; + u8 enable_disable = 1; + u32 scan_delay = 0; + u32 max_macs_in_event = 0; + u32 learn_limit = 0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "ls_name %_%v%_", &ls_name)) - { - is_name_set = 1; - } - else if (unformat (input, "ls_index %d", &ls_index)) - { - is_index_set = 1; - } + if (unformat (line_input, "learn-limit %d", &learn_limit)) + ; + else if (unformat (line_input, "scan-delay %d", &scan_delay)) + ; + else if (unformat (line_input, "max-entries %d", &max_macs_in_event)) + ; + else if (unformat (line_input, "disable")) + enable_disable = 0; else - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; - } - } - - if (!is_index_set && !is_name_set) - { - errmsg ("error: expected one of index or name!"); - return -99; - } - - if (is_index_set && is_name_set) - { - errmsg ("error: only one param expected!"); - return -99; - } - - if (vec_len (ls_name) > 62) - { - errmsg ("error: locator set name too long!"); - return -99; - } - - if (!vam->json_output) - { - print (vam->ofp, "%=16s%=16s%=16s", "locator", "priority", "weight"); - } - - M (ONE_LOCATOR_DUMP, mp); - mp->is_index_set = is_index_set; - - if (is_index_set) - mp->ls_index = clib_host_to_net_u32 (ls_index); - else - { - vec_add1 (ls_name, 0); - strncpy ((char *) mp->ls_name, (char *) ls_name, - sizeof (mp->ls_name) - 1); + break; } - /* send it... */ + M (WANT_L2_MACS_EVENTS, mp); + mp->enable_disable = enable_disable; + mp->pid = htonl (getpid ()); + mp->learn_limit = htonl (learn_limit); + mp->scan_delay = (u8) scan_delay; + mp->max_macs_in_event = (u8) (max_macs_in_event / 10); S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_locator_dump api_one_locator_dump - static int -api_one_locator_set_dump (vat_main_t * vam) +api_input_acl_set_interface (vat_main_t * vam) { - vl_api_one_locator_set_dump_t *mp; - vl_api_control_ping_t *mp_ping; - unformat_input_t *input = vam->input; - u8 filter = 0; + unformat_input_t *i = vam->input; + vl_api_input_acl_set_interface_t *mp; + u32 sw_if_index; + int sw_if_index_set; + u32 ip4_table_index = ~0; + u32 ip6_table_index = ~0; + u32 l2_table_index = ~0; + u8 is_add = 1; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "local")) - { - filter = 1; - } - else if (unformat (input, "remote")) - { - filter = 2; - } + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "ip4-table %d", &ip4_table_index)) + ; + else if (unformat (i, "ip6-table %d", &ip6_table_index)) + ; + else if (unformat (i, "l2-table %d", &l2_table_index)) + ; else { - errmsg ("parse error '%U'", format_unformat_error, input); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (!vam->json_output) + if (sw_if_index_set == 0) { - print (vam->ofp, "%=10s%=15s", "ls_index", "ls_name"); + errmsg ("missing interface name or sw_if_index"); + return -99; } - M (ONE_LOCATOR_SET_DUMP, mp); + M (INPUT_ACL_SET_INTERFACE, mp); - mp->filter = filter; + mp->sw_if_index = ntohl (sw_if_index); + mp->ip4_table_index = ntohl (ip4_table_index); + mp->ip6_table_index = ntohl (ip6_table_index); + mp->l2_table_index = ntohl (l2_table_index); + mp->is_add = is_add; - /* send it... */ S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_locator_set_dump api_one_locator_set_dump - static int -api_one_eid_table_map_dump (vat_main_t * vam) +api_output_acl_set_interface (vat_main_t * vam) { - u8 is_l2 = 0; - u8 mode_set = 0; - unformat_input_t *input = vam->input; - vl_api_one_eid_table_map_dump_t *mp; - vl_api_control_ping_t *mp_ping; + unformat_input_t *i = vam->input; + vl_api_output_acl_set_interface_t *mp; + u32 sw_if_index; + int sw_if_index_set; + u32 ip4_table_index = ~0; + u32 ip6_table_index = ~0; + u32 l2_table_index = ~0; + u8 is_add = 1; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "l2")) - { - is_l2 = 1; - mode_set = 1; - } - else if (unformat (input, "l3")) - { - is_l2 = 0; - mode_set = 1; - } + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "ip4-table %d", &ip4_table_index)) + ; + else if (unformat (i, "ip6-table %d", &ip6_table_index)) + ; + else if (unformat (i, "l2-table %d", &l2_table_index)) + ; else { - errmsg ("parse error '%U'", format_unformat_error, input); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (!mode_set) + if (sw_if_index_set == 0) { - errmsg ("expected one of 'l2' or 'l3' parameter!"); + errmsg ("missing interface name or sw_if_index"); return -99; } - if (!vam->json_output) - { - print (vam->ofp, "%=10s%=10s", "VNI", is_l2 ? "BD" : "VRF"); - } - - M (ONE_EID_TABLE_MAP_DUMP, mp); - mp->is_l2 = is_l2; - - /* send it... */ - S (mp); + M (OUTPUT_ACL_SET_INTERFACE, mp); - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + mp->sw_if_index = ntohl (sw_if_index); + mp->ip4_table_index = ntohl (ip4_table_index); + mp->ip6_table_index = ntohl (ip6_table_index); + mp->l2_table_index = ntohl (l2_table_index); + mp->is_add = is_add; - /* Wait for a reply... */ + S (mp); W (ret); return ret; } -#define api_lisp_eid_table_map_dump api_one_eid_table_map_dump - static int -api_one_eid_table_vni_dump (vat_main_t * vam) +api_ip_address_dump (vat_main_t * vam) { - vl_api_one_eid_table_vni_dump_t *mp; + unformat_input_t *i = vam->input; + vl_api_ip_address_dump_t *mp; vl_api_control_ping_t *mp_ping; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; + u8 ipv4_set = 0; + u8 ipv6_set = 0; int ret; - if (!vam->json_output) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - print (vam->ofp, "VNI"); + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "ipv4")) + ipv4_set = 1; + else if (unformat (i, "ipv6")) + ipv6_set = 1; + else + break; } - M (ONE_EID_TABLE_VNI_DUMP, mp); + if (ipv4_set && ipv6_set) + { + errmsg ("ipv4 and ipv6 flags cannot be both set"); + return -99; + } - /* send it... */ + if ((!ipv4_set) && (!ipv6_set)) + { + errmsg ("no ipv4 nor ipv6 flag set"); + return -99; + } + + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } + + vam->current_sw_if_index = sw_if_index; + vam->is_ipv6 = ipv6_set; + + M (IP_ADDRESS_DUMP, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->is_ipv6 = ipv6_set; S (mp); /* Use a control ping for synchronization */ MPING (CONTROL_PING, mp_ping); S (mp_ping); - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_eid_table_vni_dump api_one_eid_table_vni_dump - static int -api_one_eid_table_dump (vat_main_t * vam) +api_ip_dump (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_one_eid_table_dump_t *mp; + vl_api_ip_dump_t *mp; vl_api_control_ping_t *mp_ping; - struct in_addr ip4; - struct in6_addr ip6; - u8 mac[6]; - u8 eid_type = ~0, eid_set = 0; - u32 prefix_length = ~0, t, vni = 0; - u8 filter = 0; + unformat_input_t *in = vam->input; + int ipv4_set = 0; + int ipv6_set = 0; + int is_ipv6; + int i; int ret; - lisp_nsh_api_t nsh; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (in) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "eid %U/%d", unformat_ip4_address, &ip4, &t)) - { - eid_set = 1; - eid_type = 0; - prefix_length = t; - } - else if (unformat (i, "eid %U/%d", unformat_ip6_address, &ip6, &t)) - { - eid_set = 1; - eid_type = 1; - prefix_length = t; - } - else if (unformat (i, "eid %U", unformat_ethernet_address, mac)) - { - eid_set = 1; - eid_type = 2; - } - else if (unformat (i, "eid %U", unformat_nsh_address, &nsh)) - { - eid_set = 1; - eid_type = 3; - } - else if (unformat (i, "vni %d", &t)) - { - vni = t; - } - else if (unformat (i, "local")) - { - filter = 1; - } - else if (unformat (i, "remote")) - { - filter = 2; - } + if (unformat (in, "ipv4")) + ipv4_set = 1; + else if (unformat (in, "ipv6")) + ipv6_set = 1; else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - if (!vam->json_output) + if (ipv4_set && ipv6_set) + { + errmsg ("ipv4 and ipv6 flags cannot be both set"); + return -99; + } + + if ((!ipv4_set) && (!ipv6_set)) { - print (vam->ofp, "%-35s%-20s%-30s%-20s%-20s%-10s%-20s", "EID", - "type", "ls_index", "ttl", "authoritative", "key_id", "key"); + errmsg ("no ipv4 nor ipv6 flag set"); + return -99; } - M (ONE_EID_TABLE_DUMP, mp); + is_ipv6 = ipv6_set; + vam->is_ipv6 = is_ipv6; - mp->filter = filter; - if (eid_set) + /* free old data */ + for (i = 0; i < vec_len (vam->ip_details_by_sw_if_index[is_ipv6]); i++) { - mp->eid_set = 1; - mp->vni = htonl (vni); - mp->eid_type = eid_type; - switch (eid_type) - { - case 0: - mp->prefix_length = prefix_length; - clib_memcpy (mp->eid, &ip4, sizeof (ip4)); - break; - case 1: - mp->prefix_length = prefix_length; - clib_memcpy (mp->eid, &ip6, sizeof (ip6)); - break; - case 2: - clib_memcpy (mp->eid, mac, sizeof (mac)); - break; - case 3: - clib_memcpy (mp->eid, &nsh, sizeof (nsh)); - break; - default: - errmsg ("unknown EID type %d!", eid_type); - return -99; - } + vec_free (vam->ip_details_by_sw_if_index[is_ipv6][i].addr); } + vec_free (vam->ip_details_by_sw_if_index[is_ipv6]); - /* send it... */ + M (IP_DUMP, mp); + mp->is_ipv6 = ipv6_set; S (mp); /* Use a control ping for synchronization */ MPING (CONTROL_PING, mp_ping); S (mp_ping); - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_eid_table_dump api_one_eid_table_dump - static int -api_lisp_gpe_fwd_entries_get (vat_main_t * vam) +api_ipsec_spd_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_gpe_fwd_entries_get_t *mp; - u8 vni_set = 0; - u32 vni = ~0; + vl_api_ipsec_spd_add_del_t *mp; + u32 spd_id = ~0; + u8 is_add = 1; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "vni %d", &vni)) - { - vni_set = 1; - } + if (unformat (i, "spd_id %d", &spd_id)) + ; + else if (unformat (i, "del")) + is_add = 0; else { - errmsg ("parse error '%U'", format_unformat_error, i); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - - if (!vni_set) + if (spd_id == ~0) { - errmsg ("vni not set!"); + errmsg ("spd_id must be set"); return -99; } - if (!vam->json_output) - { - print (vam->ofp, "%10s %10s %s %40s", "fwd_index", "dp_table", - "leid", "reid"); - } + M (IPSEC_SPD_ADD_DEL, mp); - M (GPE_FWD_ENTRIES_GET, mp); - mp->vni = clib_host_to_net_u32 (vni); + mp->spd_id = ntohl (spd_id); + mp->is_add = is_add; - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } -#define vl_api_gpe_native_fwd_rpaths_get_reply_t_endian vl_noop_handler -#define vl_api_gpe_native_fwd_rpaths_get_reply_t_print vl_noop_handler -#define vl_api_gpe_fwd_entry_vnis_get_reply_t_endian vl_noop_handler -#define vl_api_gpe_fwd_entry_vnis_get_reply_t_print vl_noop_handler -#define vl_api_gpe_fwd_entries_get_reply_t_endian vl_noop_handler -#define vl_api_gpe_fwd_entries_get_reply_t_print vl_noop_handler -#define vl_api_gpe_fwd_entry_path_details_t_endian vl_noop_handler -#define vl_api_gpe_fwd_entry_path_details_t_print vl_noop_handler - static int -api_one_adjacencies_get (vat_main_t * vam) +api_ipsec_interface_add_del_spd (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_one_adjacencies_get_t *mp; - u8 vni_set = 0; - u32 vni = ~0; + vl_api_ipsec_interface_add_del_spd_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u32 spd_id = (u32) ~ 0; + u8 is_add = 1; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "vni %d", &vni)) - { - vni_set = 1; - } + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "spd_id %d", &spd_id)) + ; + else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else { - errmsg ("parse error '%U'", format_unformat_error, i); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } + } - if (!vni_set) + if (spd_id == (u32) ~ 0) { - errmsg ("vni not set!"); + errmsg ("spd_id must be set"); return -99; } - if (!vam->json_output) + if (sw_if_index_set == 0) { - print (vam->ofp, "%s %40s", "leid", "reid"); + errmsg ("missing interface name or sw_if_index"); + return -99; } - M (ONE_ADJACENCIES_GET, mp); - mp->vni = clib_host_to_net_u32 (vni); + M (IPSEC_INTERFACE_ADD_DEL_SPD, mp); - /* send it... */ - S (mp); + mp->spd_id = ntohl (spd_id); + mp->sw_if_index = ntohl (sw_if_index); + mp->is_add = is_add; - /* Wait for a reply... */ + S (mp); W (ret); return ret; } -#define api_lisp_adjacencies_get api_one_adjacencies_get - static int -api_gpe_native_fwd_rpaths_get (vat_main_t * vam) +api_ipsec_spd_entry_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_gpe_native_fwd_rpaths_get_t *mp; + vl_api_ipsec_spd_entry_add_del_t *mp; + u8 is_add = 1, is_outbound = 0; + u32 spd_id = 0, sa_id = 0, protocol = 0, policy = 0; + i32 priority = 0; + u32 rport_start = 0, rport_stop = (u32) ~ 0; + u32 lport_start = 0, lport_stop = (u32) ~ 0; + vl_api_address_t laddr_start = { }, laddr_stop = + { + }, raddr_start = + { + }, raddr_stop = + { + }; int ret; - u8 ip_family_set = 0, is_ip4 = 1; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "ip4")) - { - ip_family_set = 1; - is_ip4 = 1; - } - else if (unformat (i, "ip6")) + if (unformat (i, "del")) + is_add = 0; + if (unformat (i, "outbound")) + is_outbound = 1; + if (unformat (i, "inbound")) + is_outbound = 0; + else if (unformat (i, "spd_id %d", &spd_id)) + ; + else if (unformat (i, "sa_id %d", &sa_id)) + ; + else if (unformat (i, "priority %d", &priority)) + ; + else if (unformat (i, "protocol %d", &protocol)) + ; + else if (unformat (i, "lport_start %d", &lport_start)) + ; + else if (unformat (i, "lport_stop %d", &lport_stop)) + ; + else if (unformat (i, "rport_start %d", &rport_start)) + ; + else if (unformat (i, "rport_stop %d", &rport_stop)) + ; + else if (unformat (i, "laddr_start %U", + unformat_vl_api_address, &laddr_start)) + ; + else if (unformat (i, "laddr_stop %U", unformat_vl_api_address, + &laddr_stop)) + ; + else if (unformat (i, "raddr_start %U", unformat_vl_api_address, + &raddr_start)) + ; + else if (unformat (i, "raddr_stop %U", unformat_vl_api_address, + &raddr_stop)) + ; + else + if (unformat (i, "action %U", unformat_ipsec_policy_action, &policy)) { - ip_family_set = 1; - is_ip4 = 0; + if (policy == IPSEC_POLICY_ACTION_RESOLVE) + { + clib_warning ("unsupported action: 'resolve'"); + return -99; + } } else { - errmsg ("parse error '%U'", format_unformat_error, i); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } - } - if (!ip_family_set) - { - errmsg ("ip family not set!"); - return -99; } - M (GPE_NATIVE_FWD_RPATHS_GET, mp); - mp->is_ip4 = is_ip4; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} + M (IPSEC_SPD_ENTRY_ADD_DEL, mp); -static int -api_gpe_fwd_entry_vnis_get (vat_main_t * vam) -{ - vl_api_gpe_fwd_entry_vnis_get_t *mp; - int ret; + mp->is_add = is_add; - if (!vam->json_output) - { - print (vam->ofp, "VNIs"); - } + mp->entry.spd_id = ntohl (spd_id); + mp->entry.priority = ntohl (priority); + mp->entry.is_outbound = is_outbound; - M (GPE_FWD_ENTRY_VNIS_GET, mp); + clib_memcpy (&mp->entry.remote_address_start, &raddr_start, + sizeof (vl_api_address_t)); + clib_memcpy (&mp->entry.remote_address_stop, &raddr_stop, + sizeof (vl_api_address_t)); + clib_memcpy (&mp->entry.local_address_start, &laddr_start, + sizeof (vl_api_address_t)); + clib_memcpy (&mp->entry.local_address_stop, &laddr_stop, + sizeof (vl_api_address_t)); - /* send it... */ - S (mp); + mp->entry.protocol = (u8) protocol; + mp->entry.local_port_start = ntohs ((u16) lport_start); + mp->entry.local_port_stop = ntohs ((u16) lport_stop); + mp->entry.remote_port_start = ntohs ((u16) rport_start); + mp->entry.remote_port_stop = ntohs ((u16) rport_stop); + mp->entry.policy = (u8) policy; + mp->entry.sa_id = ntohl (sa_id); - /* Wait for a reply... */ + S (mp); W (ret); return ret; } static int -api_gpe_add_del_native_fwd_rpath (vat_main_t * vam) +api_ipsec_sad_entry_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_gpe_add_del_native_fwd_rpath_t *mp; - int ret = 0; - u8 is_add = 1, ip_set = 0, is_ip4 = 1; - struct in_addr ip4; - struct in6_addr ip6; - u32 table_id = 0, nh_sw_if_index = ~0; + vl_api_ipsec_sad_entry_add_del_t *mp; + u32 sad_id = 0, spi = 0; + u8 *ck = 0, *ik = 0; + u8 is_add = 1; - clib_memset (&ip4, 0, sizeof (ip4)); - clib_memset (&ip6, 0, sizeof (ip6)); + vl_api_ipsec_crypto_alg_t crypto_alg = IPSEC_API_CRYPTO_ALG_NONE; + vl_api_ipsec_integ_alg_t integ_alg = IPSEC_API_INTEG_ALG_NONE; + vl_api_ipsec_sad_flags_t flags = IPSEC_API_SAD_FLAG_NONE; + vl_api_ipsec_proto_t protocol = IPSEC_API_PROTO_AH; + vl_api_address_t tun_src, tun_dst; + int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { if (unformat (i, "del")) is_add = 0; - else if (unformat (i, "via %U %U", unformat_ip4_address, &ip4, - api_unformat_sw_if_index, vam, &nh_sw_if_index)) - { - ip_set = 1; - is_ip4 = 1; - } - else if (unformat (i, "via %U %U", unformat_ip6_address, &ip6, - api_unformat_sw_if_index, vam, &nh_sw_if_index)) - { - ip_set = 1; - is_ip4 = 0; - } - else if (unformat (i, "via %U", unformat_ip4_address, &ip4)) + else if (unformat (i, "sad_id %d", &sad_id)) + ; + else if (unformat (i, "spi %d", &spi)) + ; + else if (unformat (i, "esp")) + protocol = IPSEC_API_PROTO_ESP; + else + if (unformat (i, "tunnel_src %U", unformat_vl_api_address, &tun_src)) { - ip_set = 1; - is_ip4 = 1; - nh_sw_if_index = ~0; + flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL; + if (ADDRESS_IP6 == tun_src.af) + flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL_V6; } - else if (unformat (i, "via %U", unformat_ip6_address, &ip6)) + else + if (unformat (i, "tunnel_dst %U", unformat_vl_api_address, &tun_dst)) { - ip_set = 1; - is_ip4 = 0; - nh_sw_if_index = ~0; + flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL; + if (ADDRESS_IP6 == tun_src.af) + flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL_V6; } - else if (unformat (i, "table %d", &table_id)) + else + if (unformat (i, "crypto_alg %U", + unformat_ipsec_api_crypto_alg, &crypto_alg)) + ; + else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck)) + ; + else if (unformat (i, "integ_alg %U", + unformat_ipsec_api_integ_alg, &integ_alg)) + ; + else if (unformat (i, "integ_key %U", unformat_hex_string, &ik)) ; else { - errmsg ("parse error '%U'", format_unformat_error, i); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } - } - if (!ip_set) - { - errmsg ("nh addr not set!"); - return -99; } - M (GPE_ADD_DEL_NATIVE_FWD_RPATH, mp); + M (IPSEC_SAD_ENTRY_ADD_DEL, mp); + mp->is_add = is_add; - mp->table_id = clib_host_to_net_u32 (table_id); - mp->nh_sw_if_index = clib_host_to_net_u32 (nh_sw_if_index); - mp->is_ip4 = is_ip4; - if (is_ip4) - clib_memcpy (mp->nh_addr, &ip4, sizeof (ip4)); - else - clib_memcpy (mp->nh_addr, &ip6, sizeof (ip6)); + mp->entry.sad_id = ntohl (sad_id); + mp->entry.protocol = protocol; + mp->entry.spi = ntohl (spi); + mp->entry.flags = flags; - /* send it... */ - S (mp); + mp->entry.crypto_algorithm = crypto_alg; + mp->entry.integrity_algorithm = integ_alg; + mp->entry.crypto_key.length = vec_len (ck); + mp->entry.integrity_key.length = vec_len (ik); - /* Wait for a reply... */ - W (ret); - return ret; -} + if (mp->entry.crypto_key.length > sizeof (mp->entry.crypto_key.data)) + mp->entry.crypto_key.length = sizeof (mp->entry.crypto_key.data); -static int -api_one_map_server_dump (vat_main_t * vam) -{ - vl_api_one_map_server_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; + if (mp->entry.integrity_key.length > sizeof (mp->entry.integrity_key.data)) + mp->entry.integrity_key.length = sizeof (mp->entry.integrity_key.data); - if (!vam->json_output) + if (ck) + clib_memcpy (mp->entry.crypto_key.data, ck, mp->entry.crypto_key.length); + if (ik) + clib_memcpy (mp->entry.integrity_key.data, ik, + mp->entry.integrity_key.length); + + if (flags & IPSEC_API_SAD_FLAG_IS_TUNNEL) { - print (vam->ofp, "%=20s", "Map server"); + clib_memcpy (&mp->entry.tunnel_src, &tun_src, + sizeof (mp->entry.tunnel_src)); + clib_memcpy (&mp->entry.tunnel_dst, &tun_dst, + sizeof (mp->entry.tunnel_dst)); } - M (ONE_MAP_SERVER_DUMP, mp); - /* send it... */ S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_map_server_dump api_one_map_server_dump +static void +vl_api_ipsec_sa_details_t_handler (vl_api_ipsec_sa_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "sa_id %u sw_if_index %u spi %u proto %u crypto_alg %u " + "crypto_key %U integ_alg %u integ_key %U flags %x " + "tunnel_src_addr %U tunnel_dst_addr %U " + "salt %u seq_outbound %lu last_seq_inbound %lu " + "replay_window %lu stat_index %u\n", + ntohl (mp->entry.sad_id), + ntohl (mp->sw_if_index), + ntohl (mp->entry.spi), + ntohl (mp->entry.protocol), + ntohl (mp->entry.crypto_algorithm), + format_hex_bytes, mp->entry.crypto_key.data, + mp->entry.crypto_key.length, ntohl (mp->entry.integrity_algorithm), + format_hex_bytes, mp->entry.integrity_key.data, + mp->entry.integrity_key.length, ntohl (mp->entry.flags), + format_vl_api_address, &mp->entry.tunnel_src, format_vl_api_address, + &mp->entry.tunnel_dst, ntohl (mp->salt), + clib_net_to_host_u64 (mp->seq_outbound), + clib_net_to_host_u64 (mp->last_seq_inbound), + clib_net_to_host_u64 (mp->replay_window), ntohl (mp->stat_index)); +} + +#define vl_api_ipsec_sa_details_t_endian vl_noop_handler +#define vl_api_ipsec_sa_details_t_print vl_noop_handler + +static void vl_api_ipsec_sa_details_t_handler_json + (vl_api_ipsec_sa_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + vl_api_ipsec_sad_flags_t flags; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "sa_id", ntohl (mp->entry.sad_id)); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "spi", ntohl (mp->entry.spi)); + vat_json_object_add_uint (node, "proto", ntohl (mp->entry.protocol)); + vat_json_object_add_uint (node, "crypto_alg", + ntohl (mp->entry.crypto_algorithm)); + vat_json_object_add_uint (node, "integ_alg", + ntohl (mp->entry.integrity_algorithm)); + flags = ntohl (mp->entry.flags); + vat_json_object_add_uint (node, "use_esn", + ! !(flags & IPSEC_API_SAD_FLAG_USE_ESN)); + vat_json_object_add_uint (node, "use_anti_replay", + ! !(flags & IPSEC_API_SAD_FLAG_USE_ANTI_REPLAY)); + vat_json_object_add_uint (node, "is_tunnel", + ! !(flags & IPSEC_API_SAD_FLAG_IS_TUNNEL)); + vat_json_object_add_uint (node, "is_tunnel_ip6", + ! !(flags & IPSEC_API_SAD_FLAG_IS_TUNNEL_V6)); + vat_json_object_add_uint (node, "udp_encap", + ! !(flags & IPSEC_API_SAD_FLAG_UDP_ENCAP)); + vat_json_object_add_bytes (node, "crypto_key", mp->entry.crypto_key.data, + mp->entry.crypto_key.length); + vat_json_object_add_bytes (node, "integ_key", mp->entry.integrity_key.data, + mp->entry.integrity_key.length); + vat_json_object_add_address (node, "src", &mp->entry.tunnel_src); + vat_json_object_add_address (node, "dst", &mp->entry.tunnel_dst); + vat_json_object_add_uint (node, "replay_window", + clib_net_to_host_u64 (mp->replay_window)); + vat_json_object_add_uint (node, "stat_index", ntohl (mp->stat_index)); +} static int -api_one_map_resolver_dump (vat_main_t * vam) +api_ipsec_sa_dump (vat_main_t * vam) { - vl_api_one_map_resolver_dump_t *mp; + unformat_input_t *i = vam->input; + vl_api_ipsec_sa_dump_t *mp; vl_api_control_ping_t *mp_ping; + u32 sa_id = ~0; int ret; - if (!vam->json_output) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - print (vam->ofp, "%=20s", "Map resolver"); + if (unformat (i, "sa_id %d", &sa_id)) + ; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - M (ONE_MAP_RESOLVER_DUMP, mp); - /* send it... */ + M (IPSEC_SA_DUMP, mp); + + mp->sa_id = ntohl (sa_id); + S (mp); /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); + M (CONTROL_PING, mp_ping); S (mp_ping); - /* Wait for a reply... */ - W (ret); - return ret; -} - -#define api_lisp_map_resolver_dump api_one_map_resolver_dump - -static int -api_one_stats_flush (vat_main_t * vam) -{ - vl_api_one_stats_flush_t *mp; - int ret = 0; - - M (ONE_STATS_FLUSH, mp); - S (mp); W (ret); return ret; } static int -api_one_stats_dump (vat_main_t * vam) +api_get_first_msg_id (vat_main_t * vam) { - vl_api_one_stats_dump_t *mp; - vl_api_control_ping_t *mp_ping; + vl_api_get_first_msg_id_t *mp; + unformat_input_t *i = vam->input; + u8 *name; + u8 name_set = 0; int ret; - M (ONE_STATS_DUMP, mp); - /* send it... */ - S (mp); + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "client %s", &name)) + name_set = 1; + else + break; + } - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + if (name_set == 0) + { + errmsg ("missing client name"); + return -99; + } + vec_add1 (name, 0); - /* Wait for a reply... */ + if (vec_len (name) > 63) + { + errmsg ("client name too long"); + return -99; + } + + M (GET_FIRST_MSG_ID, mp); + clib_memcpy (mp->name, name, vec_len (name)); + S (mp); W (ret); return ret; } static int -api_show_one_status (vat_main_t * vam) +api_cop_interface_enable_disable (vat_main_t * vam) { - vl_api_show_one_status_t *mp; + unformat_input_t *line_input = vam->input; + vl_api_cop_interface_enable_disable_t *mp; + u32 sw_if_index = ~0; + u8 enable_disable = 1; int ret; - if (!vam->json_output) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "disable")) + enable_disable = 0; + if (unformat (line_input, "enable")) + enable_disable = 1; + else if (unformat (line_input, "%U", api_unformat_sw_if_index, + vam, &sw_if_index)) + ; + else if (unformat (line_input, "sw_if_index %d", &sw_if_index)) + ; + else + break; + } + + if (sw_if_index == ~0) { - print (vam->ofp, "%-20s%-16s", "ONE status", "locator-set"); + errmsg ("missing interface name or sw_if_index"); + return -99; } - M (SHOW_ONE_STATUS, mp); + /* Construct the API message */ + M (COP_INTERFACE_ENABLE_DISABLE, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->enable_disable = enable_disable; + /* send it... */ S (mp); - /* Wait for a reply... */ + /* Wait for the reply */ W (ret); return ret; } -#define api_show_lisp_status api_show_one_status - static int -api_lisp_gpe_fwd_entry_path_dump (vat_main_t * vam) +api_cop_whitelist_enable_disable (vat_main_t * vam) { - vl_api_gpe_fwd_entry_path_dump_t *mp; - vl_api_control_ping_t *mp_ping; - unformat_input_t *i = vam->input; - u32 fwd_entry_index = ~0; + unformat_input_t *line_input = vam->input; + vl_api_cop_whitelist_enable_disable_t *mp; + u32 sw_if_index = ~0; + u8 ip4 = 0, ip6 = 0, default_cop = 0; + u32 fib_id = 0; int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "index %d", &fwd_entry_index)) + if (unformat (line_input, "ip4")) + ip4 = 1; + else if (unformat (line_input, "ip6")) + ip6 = 1; + else if (unformat (line_input, "default")) + default_cop = 1; + else if (unformat (line_input, "%U", api_unformat_sw_if_index, + vam, &sw_if_index)) + ; + else if (unformat (line_input, "sw_if_index %d", &sw_if_index)) + ; + else if (unformat (line_input, "fib-id %d", &fib_id)) ; else break; } - if (~0 == fwd_entry_index) + if (sw_if_index == ~0) { - errmsg ("no index specified!"); + errmsg ("missing interface name or sw_if_index"); return -99; } - if (!vam->json_output) - { - print (vam->ofp, "first line"); - } - - M (GPE_FWD_ENTRY_PATH_DUMP, mp); + /* Construct the API message */ + M (COP_WHITELIST_ENABLE_DISABLE, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->fib_id = ntohl (fib_id); + mp->ip4 = ip4; + mp->ip6 = ip6; + mp->default_cop = default_cop; /* send it... */ S (mp); - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - /* Wait for a reply... */ + /* Wait for the reply */ W (ret); return ret; } static int -api_one_get_map_request_itr_rlocs (vat_main_t * vam) +api_get_node_graph (vat_main_t * vam) { - vl_api_one_get_map_request_itr_rlocs_t *mp; + vl_api_get_node_graph_t *mp; int ret; - if (!vam->json_output) - { - print (vam->ofp, "%=20s", "itr-rlocs:"); - } + M (GET_NODE_GRAPH, mp); - M (ONE_GET_MAP_REQUEST_ITR_RLOCS, mp); /* send it... */ S (mp); - /* Wait for a reply... */ + /* Wait for the reply */ W (ret); return ret; } -#define api_lisp_get_map_request_itr_rlocs api_one_get_map_request_itr_rlocs - static int api_af_packet_create (vat_main_t * vam) { @@ -17374,12 +11456,12 @@ api_policer_add_del (vat_main_t * vam) mp->rate_type = rate_type; mp->round_type = round_type; mp->type = type; - mp->conform_action_type = conform_action.action_type; - mp->conform_dscp = conform_action.dscp; - mp->exceed_action_type = exceed_action.action_type; - mp->exceed_dscp = exceed_action.dscp; - mp->violate_action_type = violate_action.action_type; - mp->violate_dscp = violate_action.dscp; + mp->conform_action.type = conform_action.action_type; + mp->conform_action.dscp = conform_action.dscp; + mp->exceed_action.type = exceed_action.action_type; + mp->exceed_action.dscp = exceed_action.dscp; + mp->violate_action.type = violate_action.action_type; + mp->violate_action.dscp = violate_action.dscp; mp->color_aware = color_aware; S (mp); @@ -17513,100 +11595,6 @@ api_policer_classify_dump (vat_main_t * vam) return ret; } -static int -api_netmap_create (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_netmap_create_t *mp; - u8 *if_name = 0; - u8 hw_addr[6]; - u8 random_hw_addr = 1; - u8 is_pipe = 0; - u8 is_master = 0; - int ret; - - clib_memset (hw_addr, 0, sizeof (hw_addr)); - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "name %s", &if_name)) - vec_add1 (if_name, 0); - else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr)) - random_hw_addr = 0; - else if (unformat (i, "pipe")) - is_pipe = 1; - else if (unformat (i, "master")) - is_master = 1; - else if (unformat (i, "slave")) - is_master = 0; - else - break; - } - - if (!vec_len (if_name)) - { - errmsg ("interface name must be specified"); - return -99; - } - - if (vec_len (if_name) > 64) - { - errmsg ("interface name too long"); - return -99; - } - - M (NETMAP_CREATE, mp); - - clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name)); - clib_memcpy (mp->hw_addr, hw_addr, 6); - mp->use_random_hw_addr = random_hw_addr; - mp->is_pipe = is_pipe; - mp->is_master = is_master; - vec_free (if_name); - - S (mp); - W (ret); - return ret; -} - -static int -api_netmap_delete (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_netmap_delete_t *mp; - u8 *if_name = 0; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "name %s", &if_name)) - vec_add1 (if_name, 0); - else - break; - } - - if (!vec_len (if_name)) - { - errmsg ("interface name must be specified"); - return -99; - } - - if (vec_len (if_name) > 64) - { - errmsg ("interface name too long"); - return -99; - } - - M (NETMAP_DELETE, mp); - - clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name)); - vec_free (if_name); - - S (mp); - W (ret); - return ret; -} - static u8 * format_fib_api_path_nh_proto (u8 * s, va_list * args) { @@ -17638,7 +11626,7 @@ format_fib_api_path_nh_proto (u8 * s, va_list * args) static u8 * format_vl_api_ip_address_union (u8 * s, va_list * args) { - vl_api_address_family_t af = va_arg (*args, vl_api_address_family_t); + vl_api_address_family_t af = va_arg (*args, int); const vl_api_address_union_t *u = va_arg (*args, vl_api_address_union_t *); switch (af) @@ -17725,7 +11713,7 @@ vl_api_mpls_fib_path_json_print (vat_json_node_t * node, clib_memcpy (&ip4, &fp->nh.address.ip4, sizeof (ip4)); vat_json_object_add_ip4 (node, "next_hop", ip4); } - else if (fp->proto == FIB_API_PATH_NH_PROTO_IP4) + else if (fp->proto == FIB_API_PATH_NH_PROTO_IP6) { clib_memcpy (&ip6, &fp->nh.address.ip6, sizeof (ip6)); vat_json_object_add_ip6 (node, "next_hop", ip6); @@ -18676,17 +12664,15 @@ api_pg_capture (vat_main_t * vam) } } - u32 name_len = vec_len (pcap_file); /* Construct the API message */ M (PG_CAPTURE, mp); mp->context = 0; mp->interface_id = ntohl (if_id); mp->is_enabled = enable; mp->count = ntohl (count); - mp->pcap_name_length = ntohl (name_len); if (pcap_file_set != 0) { - clib_memcpy (mp->pcap_file_name, pcap_file, name_len); + vl_api_vec_to_api_string (pcap_file, &mp->pcap_file_name); } vec_free (pcap_file); @@ -18724,15 +12710,13 @@ api_pg_enable_disable (vat_main_t * vam) } } - u32 name_len = vec_len (stream_name); /* Construct the API message */ M (PG_ENABLE_DISABLE, mp); mp->context = 0; mp->is_enabled = enable; if (stream_name_set != 0) { - mp->stream_name_length = ntohl (name_len); - clib_memcpy (mp->stream_name, stream_name, name_len); + vl_api_vec_to_api_string (stream_name, &mp->stream_name); } vec_free (stream_name); @@ -18741,6 +12725,44 @@ api_pg_enable_disable (vat_main_t * vam) return ret; } +int +api_pg_interface_enable_disable_coalesce (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_pg_interface_enable_disable_coalesce_t *mp; + + u32 sw_if_index = ~0; + u8 enable = 1; + int ret; + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + ; + else if (unformat (input, "sw_if_index %d", &sw_if_index)) + ; + else if (unformat (input, "disable")) + enable = 0; + else + break; + } + + if (sw_if_index == ~0) + { + errmsg ("Interface required but not specified"); + return -99; + } + + /* Construct the API message */ + M (PG_INTERFACE_ENABLE_DISABLE_COALESCE, mp); + mp->context = 0; + mp->coalesce_enabled = enable; + mp->sw_if_index = htonl (sw_if_index); + + S (mp); + W (ret); + return ret; +} + int api_ip_source_and_port_range_check_add_del (vat_main_t * vam) { @@ -19573,104 +13595,6 @@ api_p2p_ethernet_del (vat_main_t * vam) return ret; } -static int -api_lldp_config (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_lldp_config_t *mp; - int tx_hold = 0; - int tx_interval = 0; - u8 *sys_name = NULL; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "system-name %s", &sys_name)) - ; - else if (unformat (i, "tx-hold %d", &tx_hold)) - ; - else if (unformat (i, "tx-interval %d", &tx_interval)) - ; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - vec_add1 (sys_name, 0); - - M (LLDP_CONFIG, mp); - mp->tx_hold = htonl (tx_hold); - mp->tx_interval = htonl (tx_interval); - clib_memcpy (mp->system_name, sys_name, vec_len (sys_name)); - vec_free (sys_name); - - S (mp); - W (ret); - return ret; -} - -static int -api_sw_interface_set_lldp (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_lldp_t *mp; - u32 sw_if_index = ~0; - u32 enable = 1; - u8 *port_desc = NULL, *mgmt_oid = NULL; - ip4_address_t ip4_addr; - ip6_address_t ip6_addr; - int ret; - - clib_memset (&ip4_addr, 0, sizeof (ip4_addr)); - clib_memset (&ip6_addr, 0, sizeof (ip6_addr)); - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "disable")) - enable = 0; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - ; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - ; - else if (unformat (i, "port-desc %s", &port_desc)) - ; - else if (unformat (i, "mgmt-ip4 %U", unformat_ip4_address, &ip4_addr)) - ; - else if (unformat (i, "mgmt-ip6 %U", unformat_ip6_address, &ip6_addr)) - ; - else if (unformat (i, "mgmt-oid %s", &mgmt_oid)) - ; - else - break; - } - - if (sw_if_index == ~0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - /* Construct the API message */ - vec_add1 (port_desc, 0); - vec_add1 (mgmt_oid, 0); - M (SW_INTERFACE_SET_LLDP, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->enable = enable; - clib_memcpy (mp->port_desc, port_desc, vec_len (port_desc)); - clib_memcpy (mp->mgmt_oid, mgmt_oid, vec_len (mgmt_oid)); - clib_memcpy (mp->mgmt_ip4, &ip4_addr, sizeof (ip4_addr)); - clib_memcpy (mp->mgmt_ip6, &ip6_addr, sizeof (ip6_addr)); - vec_free (port_desc); - vec_free (mgmt_oid); - - S (mp); - W (ret); - return ret; -} - static int api_tcp_configure_src_addresses (vat_main_t * vam) { @@ -19789,8 +13713,7 @@ api_app_namespace_add_del (vat_main_t * vam) } M (APP_NAMESPACE_ADD_DEL, mp); - clib_memcpy (mp->namespace_id, ns_id, vec_len (ns_id)); - mp->namespace_id_len = vec_len (ns_id); + vl_api_vec_to_api_string (ns_id, &mp->namespace_id); mp->secret = clib_host_to_net_u64 (secret); mp->sw_if_index = clib_host_to_net_u32 (sw_if_index); mp->ip4_fib_id = clib_host_to_net_u32 (ip4_fib_id); @@ -19864,15 +13787,20 @@ static void vl_api_session_rules_details_t_handler (vl_api_session_rules_details_t * mp) { vat_main_t *vam = &vat_main; + fib_prefix_t lcl, rmt; - if (mp->is_ip4) + ip_prefix_decode (&mp->lcl, &lcl); + ip_prefix_decode (&mp->rmt, &rmt); + + if (lcl.fp_proto == FIB_PROTOCOL_IP4) { print (vam->ofp, "appns %u tp %u scope %d %U/%d %d %U/%d %d action: %d tag: %s", clib_net_to_host_u32 (mp->appns_index), mp->transport_proto, - mp->scope, format_ip4_address, &mp->lcl_ip, mp->lcl_plen, + mp->scope, format_ip4_address, &lcl.fp_addr.ip4, lcl.fp_len, clib_net_to_host_u16 (mp->lcl_port), format_ip4_address, - &mp->rmt_ip, mp->rmt_plen, clib_net_to_host_u16 (mp->rmt_port), + &rmt.fp_addr.ip4, rmt.fp_len, + clib_net_to_host_u16 (mp->rmt_port), clib_net_to_host_u32 (mp->action_index), mp->tag); } else @@ -19880,9 +13808,10 @@ vl_api_session_rules_details_t_handler (vl_api_session_rules_details_t * mp) print (vam->ofp, "appns %u tp %u scope %d %U/%d %d %U/%d %d action: %d tag: %s", clib_net_to_host_u32 (mp->appns_index), mp->transport_proto, - mp->scope, format_ip6_address, &mp->lcl_ip, mp->lcl_plen, + mp->scope, format_ip6_address, &lcl.fp_addr.ip6, lcl.fp_len, clib_net_to_host_u16 (mp->lcl_port), format_ip6_address, - &mp->rmt_ip, mp->rmt_plen, clib_net_to_host_u16 (mp->rmt_port), + &rmt.fp_addr.ip6, rmt.fp_len, + clib_net_to_host_u16 (mp->rmt_port), clib_net_to_host_u32 (mp->action_index), mp->tag); } } @@ -19896,6 +13825,11 @@ vl_api_session_rules_details_t_handler_json (vl_api_session_rules_details_t * struct in6_addr ip6; struct in_addr ip4; + fib_prefix_t lcl, rmt; + + ip_prefix_decode (&mp->lcl, &lcl); + ip_prefix_decode (&mp->rmt, &rmt); + if (VAT_JSON_ARRAY != vam->json_tree.type) { ASSERT (VAT_JSON_NONE == vam->json_tree.type); @@ -19904,7 +13838,6 @@ vl_api_session_rules_details_t_handler_json (vl_api_session_rules_details_t * node = vat_json_array_add (&vam->json_tree); vat_json_init_object (node); - vat_json_object_add_uint (node, "is_ip4", mp->is_ip4 ? 1 : 0); vat_json_object_add_uint (node, "appns_index", clib_net_to_host_u32 (mp->appns_index)); vat_json_object_add_uint (node, "transport_proto", mp->transport_proto); @@ -19915,21 +13848,21 @@ vl_api_session_rules_details_t_handler_json (vl_api_session_rules_details_t * clib_net_to_host_u16 (mp->lcl_port)); vat_json_object_add_uint (node, "rmt_port", clib_net_to_host_u16 (mp->rmt_port)); - vat_json_object_add_uint (node, "lcl_plen", mp->lcl_plen); - vat_json_object_add_uint (node, "rmt_plen", mp->rmt_plen); + vat_json_object_add_uint (node, "lcl_plen", lcl.fp_len); + vat_json_object_add_uint (node, "rmt_plen", rmt.fp_len); vat_json_object_add_string_copy (node, "tag", mp->tag); - if (mp->is_ip4) + if (lcl.fp_proto == FIB_PROTOCOL_IP4) { - clib_memcpy (&ip4, mp->lcl_ip, sizeof (ip4)); + clib_memcpy (&ip4, &lcl.fp_addr.ip4, sizeof (ip4)); vat_json_object_add_ip4 (node, "lcl_ip", ip4); - clib_memcpy (&ip4, mp->rmt_ip, sizeof (ip4)); + clib_memcpy (&ip4, &rmt.fp_addr.ip4, sizeof (ip4)); vat_json_object_add_ip4 (node, "rmt_ip", ip4); } else { - clib_memcpy (&ip6, mp->lcl_ip, sizeof (ip6)); + clib_memcpy (&ip6, &lcl.fp_addr.ip6, sizeof (ip6)); vat_json_object_add_ip6 (node, "lcl_ip", ip6); - clib_memcpy (&ip6, mp->rmt_ip, sizeof (ip6)); + clib_memcpy (&ip6, &rmt.fp_addr.ip6, sizeof (ip6)); vat_json_object_add_ip6 (node, "rmt_ip", ip6); } } @@ -19946,6 +13879,7 @@ api_session_rule_add_del (vat_main_t * vam) u8 is_ip4 = 1, conn_set = 0; u8 is_add = 1, *tag = 0; int ret; + fib_prefix_t lcl, rmt; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { @@ -20000,26 +13934,34 @@ api_session_rule_add_del (vat_main_t * vam) M (SESSION_RULE_ADD_DEL, mp); - mp->is_ip4 = is_ip4; - mp->transport_proto = proto; - mp->lcl_port = clib_host_to_net_u16 ((u16) lcl_port); - mp->rmt_port = clib_host_to_net_u16 ((u16) rmt_port); - mp->lcl_plen = lcl_plen; - mp->rmt_plen = rmt_plen; - mp->action_index = clib_host_to_net_u32 (action); - mp->appns_index = clib_host_to_net_u32 (appns_index); - mp->scope = scope; - mp->is_add = is_add; + clib_memset (&lcl, 0, sizeof (lcl)); + clib_memset (&rmt, 0, sizeof (rmt)); if (is_ip4) { - clib_memcpy (mp->lcl_ip, &lcl_ip4, sizeof (lcl_ip4)); - clib_memcpy (mp->rmt_ip, &rmt_ip4, sizeof (rmt_ip4)); + ip_set (&lcl.fp_addr, &lcl_ip4, 1); + ip_set (&rmt.fp_addr, &rmt_ip4, 1); + lcl.fp_len = lcl_plen; + rmt.fp_len = rmt_plen; } else { - clib_memcpy (mp->lcl_ip, &lcl_ip6, sizeof (lcl_ip6)); - clib_memcpy (mp->rmt_ip, &rmt_ip6, sizeof (rmt_ip6)); + ip_set (&lcl.fp_addr, &lcl_ip6, 0); + ip_set (&rmt.fp_addr, &rmt_ip6, 0); + lcl.fp_len = lcl_plen; + rmt.fp_len = rmt_plen; } + + + ip_prefix_encode (&lcl, &mp->lcl); + ip_prefix_encode (&rmt, &mp->rmt); + mp->lcl_port = clib_host_to_net_u16 ((u16) lcl_port); + mp->rmt_port = clib_host_to_net_u16 ((u16) rmt_port); + mp->transport_proto = + proto ? TRANSPORT_PROTO_API_UDP : TRANSPORT_PROTO_API_TCP; + mp->action_index = clib_host_to_net_u32 (action); + mp->appns_index = clib_host_to_net_u32 (appns_index); + mp->scope = scope; + mp->is_add = is_add; if (tag) { clib_memcpy (mp->tag, tag, vec_len (tag)); @@ -20698,8 +14640,6 @@ _(sw_interface_set_vpath, \ " | sw_if_index enable | disable") \ _(sw_interface_set_vxlan_bypass, \ " | sw_if_index [ip4 | ip6] [enable | disable]") \ -_(sw_interface_set_geneve_bypass, \ - " | sw_if_index [ip4 | ip6] [enable | disable]") \ _(sw_interface_set_l2_xconnect, \ "rx | rx_sw_if_index tx | tx_sw_if_index \n" \ "enable | disable") \ @@ -20720,12 +14660,12 @@ _(l2_flags, \ _(bridge_flags, \ "bd_id [learn] [forward] [uu-flood] [flood] [arp-term] [disable]\n") \ _(tap_create_v2, \ - "id [hw-addr ] [host-ns ] [rx-ring-size [tx-ring-size ] [host-mtu-size ] [gso | no-gso]") \ + "id [hw-addr ] [host-if-name ] [host-ns ] [num-rx-queues ] [rx-ring-size ] [tx-ring-size ] [host-bridge ] [host-mac-addr ] [host-ip4-addr ] [host-ip6-addr ] [host-mtu-size ] [gso | no-gso | csum-offload | gro-coalesce] [persist] [attach] [tun] [packed] [in-order]") \ _(tap_delete_v2, \ " | sw_if_index ") \ _(sw_interface_tap_v2_dump, "") \ -_(virtio_pci_create, \ - "pci-addr [use_random_mac | hw-addr ] [features ] [gso-enabled | csum-offload-enabled]") \ +_(virtio_pci_create_v2, \ + "pci-addr [use_random_mac | hw-addr ] [features ] [gso-enabled [gro-coalesce] | csum-offload-enabled] [packed] [in-order] [buffering]") \ _(virtio_pci_delete, \ " | sw_if_index ") \ _(sw_interface_virtio_pci_dump, "") \ @@ -20733,15 +14673,19 @@ _(bond_create, \ "[hw-addr ] {round-robin | active-backup | " \ "broadcast | {lacp | xor} [load-balance { l2 | l23 | l34 }]} " \ "[id ]") \ +_(bond_create2, \ + "[hw-addr ] {mode round-robin | active-backup | " \ + "broadcast | {lacp | xor} [load-balance { l2 | l23 | l34 }]} " \ + "[id ] [gso]") \ _(bond_delete, \ " | sw_if_index ") \ -_(bond_enslave, \ +_(bond_add_member, \ "sw_if_index bond [is_passive] [is_long_timeout]") \ -_(bond_detach_slave, \ +_(bond_detach_member, \ "sw_if_index ") \ _(sw_interface_set_bond_weight, " | sw_if_index weight ") \ -_(sw_interface_bond_dump, "") \ -_(sw_interface_slave_dump, \ + _(sw_bond_interface_dump, " | sw_if_index ") \ + _(sw_member_interface_dump, \ " | sw_if_index ") \ _(ip_table_add_del, \ "table [ipv6] [add | del]\n") \ @@ -20815,18 +14759,6 @@ _(classify_set_interface_l2_tables, \ " [other-table ]") \ _(get_node_index, "node next ") \ -_(l2tpv3_create_tunnel, \ - "client_address our_address \n" \ - "[local_session_id ][remote_session_id ][local_cookie ]\n" \ - "[remote_cookie ]\n[l2-sublayer-preset]\n") \ -_(l2tpv3_set_tunnel_cookies, \ - " | sw_if_index [new_local_cookie ]\n" \ - "[new_remote_cookie ]\n") \ -_(l2tpv3_interface_enable_disable, \ - " | sw_if_index enable | disable") \ -_(l2tpv3_set_lookup_key, \ - "lookup_v6_src | lookup_v6_dst | lookup_session_id") \ -_(sw_if_l2tpv3_tunnel_dump, "") \ _(vxlan_offload_rx, \ "hw { | hw_if_index } " \ "rx { | sw_if_index } [del]") \ @@ -20834,16 +14766,7 @@ _(vxlan_add_del_tunnel, \ "src { dst | group \n" \ "{ | mcast_sw_if_index } [instance ]}\n" \ "vni [encap-vrf-id ] [decap-next ] [del]") \ -_(geneve_add_del_tunnel, \ - "src { dst | group \n" \ - "{ | mcast_sw_if_index } }\n" \ - "vni [encap-vrf-id ] [decap-next ] [del]") \ _(vxlan_tunnel_dump, "[ | sw_if_index ]") \ -_(geneve_tunnel_dump, "[ | sw_if_index ]") \ -_(gre_tunnel_add_del, \ - "src dst [outer-fib-id ] [instance ]\n" \ - "[teb | erspan ] [del]") \ -_(gre_tunnel_dump, "[ | sw_if_index ]") \ _(l2_fib_clear_table, "") \ _(l2_interface_efp_filter, "sw_if_index enable | disable") \ _(l2_interface_vlan_tag_rewrite, \ @@ -20853,12 +14776,12 @@ _(l2_interface_vlan_tag_rewrite, \ _(create_vhost_user_if, \ "socket [server] [renumber ] " \ "[disable_mrg_rxbuf] [disable_indirect_desc] [gso] " \ - "[mac ]") \ + "[mac ] [packed]") \ _(modify_vhost_user_if, \ " | sw_if_index socket \n" \ - "[server] [renumber ] [gso]") \ + "[server] [renumber ] [gso] [packed]") \ _(delete_vhost_user_if, " | sw_if_index ") \ -_(sw_interface_vhost_user_dump, "") \ +_(sw_interface_vhost_user_dump, " | sw_if_index ") \ _(show_version, "") \ _(show_threads, "") \ _(vxlan_gpe_add_del_tunnel, \ @@ -20886,13 +14809,7 @@ _(ipsec_spd_entry_add_del, "spd_id priority action \n" \ " (inbound|outbound) [sa_id ] laddr_start \n" \ " laddr_stop raddr_start raddr_stop \n" \ " [lport_start lport_stop ] [rport_start rport_stop ]" ) \ -_(ipsec_tunnel_if_add_del, "local_spi remote_spi \n" \ - " crypto_alg local_crypto_key remote_crypto_key \n" \ - " integ_alg local_integ_key remote_integ_key \n" \ - " local_ip remote_ip [esn] [anti_replay] [del]\n" \ - " [instance ]") \ _(ipsec_sa_dump, "[sa_id ]") \ -_(ipsec_tunnel_if_set_sa, " sa_id \n") \ _(delete_loopback,"sw_if_index ") \ _(bd_ip_mac_add_del, "bd_id [del]") \ _(bd_ip_mac_flush, "bd_id ") \ @@ -20906,128 +14823,6 @@ _(get_node_graph, " ") \ _(sw_interface_clear_stats," | sw_if_index ") \ _(ioam_enable, "[trace] [pow] [ppc ]") \ _(ioam_disable, "") \ -_(one_add_del_locator_set, "locator-set [iface |" \ - " sw_if_index p " \ - "w ] [del]") \ -_(one_add_del_locator, "locator-set " \ - "iface | sw_if_index " \ - "p w [del]") \ -_(one_add_del_local_eid,"vni eid " \ - "/ | " \ - "locator-set [del]" \ - "[key-id sha1|sha256 secret-key ]")\ -_(one_add_del_map_resolver, " [del]") \ -_(one_add_del_map_server, " [del]") \ -_(one_enable_disable, "enable|disable") \ -_(one_map_register_enable_disable, "enable|disable") \ -_(one_map_register_fallback_threshold, "") \ -_(one_rloc_probe_enable_disable, "enable|disable") \ -_(one_add_del_remote_mapping, "add|del vni eid " \ - "[seid ] " \ - "rloc p " \ - "w [rloc ... ] " \ - "action [del-all]") \ -_(one_add_del_adjacency, "add|del vni reid leid " \ - "") \ -_(one_pitr_set_locator_set, "locator-set | del") \ -_(one_use_petr, "ip-address> | disable") \ -_(one_map_request_mode, "src-dst|dst-only") \ -_(one_add_del_map_request_itr_rlocs, " [del]") \ -_(one_eid_table_add_del_map, "[del] vni vrf ") \ -_(one_locator_set_dump, "[local | remote]") \ -_(one_locator_dump, "ls_index | ls_name ") \ -_(one_eid_table_dump, "[eid / | ] [vni] " \ - "[local] | [remote]") \ -_(one_add_del_ndp_entry, "[del] mac bd ip6 ") \ -_(one_ndp_bd_get, "") \ -_(one_ndp_entries_get, "bd ") \ -_(one_add_del_l2_arp_entry, "[del] mac bd ip4 ") \ -_(one_l2_arp_bd_get, "") \ -_(one_l2_arp_entries_get, "bd ") \ -_(one_stats_enable_disable, "enable|disable") \ -_(show_one_stats_enable_disable, "") \ -_(one_eid_table_vni_dump, "") \ -_(one_eid_table_map_dump, "l2|l3") \ -_(one_map_resolver_dump, "") \ -_(one_map_server_dump, "") \ -_(one_adjacencies_get, "vni ") \ -_(one_nsh_set_locator_set, "[del] ls ") \ -_(show_one_rloc_probe_state, "") \ -_(show_one_map_register_state, "") \ -_(show_one_status, "") \ -_(one_stats_dump, "") \ -_(one_stats_flush, "") \ -_(one_get_map_request_itr_rlocs, "") \ -_(one_map_register_set_ttl, "") \ -_(one_set_transport_protocol, "udp|api") \ -_(one_get_transport_protocol, "") \ -_(one_enable_disable_xtr_mode, "enable|disable") \ -_(one_show_xtr_mode, "") \ -_(one_enable_disable_pitr_mode, "enable|disable") \ -_(one_show_pitr_mode, "") \ -_(one_enable_disable_petr_mode, "enable|disable") \ -_(one_show_petr_mode, "") \ -_(show_one_nsh_mapping, "") \ -_(show_one_pitr, "") \ -_(show_one_use_petr, "") \ -_(show_one_map_request_mode, "") \ -_(show_one_map_register_ttl, "") \ -_(show_one_map_register_fallback_threshold, "") \ -_(lisp_add_del_locator_set, "locator-set [iface |"\ - " sw_if_index p " \ - "w ] [del]") \ -_(lisp_add_del_locator, "locator-set " \ - "iface | sw_if_index " \ - "p w [del]") \ -_(lisp_add_del_local_eid,"vni eid " \ - "/ | " \ - "locator-set [del]" \ - "[key-id sha1|sha256 secret-key ]") \ -_(lisp_add_del_map_resolver, " [del]") \ -_(lisp_add_del_map_server, " [del]") \ -_(lisp_enable_disable, "enable|disable") \ -_(lisp_map_register_enable_disable, "enable|disable") \ -_(lisp_rloc_probe_enable_disable, "enable|disable") \ -_(lisp_add_del_remote_mapping, "add|del vni eid " \ - "[seid ] " \ - "rloc p " \ - "w [rloc ... ] " \ - "action [del-all]") \ -_(lisp_add_del_adjacency, "add|del vni reid leid " \ - "") \ -_(lisp_pitr_set_locator_set, "locator-set | del") \ -_(lisp_use_petr, " | disable") \ -_(lisp_map_request_mode, "src-dst|dst-only") \ -_(lisp_add_del_map_request_itr_rlocs, " [del]") \ -_(lisp_eid_table_add_del_map, "[del] vni vrf ") \ -_(lisp_locator_set_dump, "[local | remote]") \ -_(lisp_locator_dump, "ls_index | ls_name ") \ -_(lisp_eid_table_dump, "[eid / | ] [vni] " \ - "[local] | [remote]") \ -_(lisp_eid_table_vni_dump, "") \ -_(lisp_eid_table_map_dump, "l2|l3") \ -_(lisp_map_resolver_dump, "") \ -_(lisp_map_server_dump, "") \ -_(lisp_adjacencies_get, "vni ") \ -_(gpe_fwd_entry_vnis_get, "") \ -_(gpe_native_fwd_rpaths_get, "ip4 | ip6") \ -_(gpe_add_del_native_fwd_rpath, "[del] via [iface] " \ - "[table ]") \ -_(lisp_gpe_fwd_entries_get, "vni ") \ -_(lisp_gpe_fwd_entry_path_dump, "index ") \ -_(gpe_set_encap_mode, "lisp|vxlan") \ -_(gpe_get_encap_mode, "") \ -_(lisp_gpe_add_del_iface, "up|down") \ -_(lisp_gpe_enable_disable, "enable|disable") \ -_(lisp_gpe_add_del_fwd_entry, "reid [leid ] vni " \ - "vrf/bd loc-pair w ... [del]") \ -_(show_lisp_rloc_probe_state, "") \ -_(show_lisp_map_register_state, "") \ -_(show_lisp_status, "") \ -_(lisp_get_map_request_itr_rlocs, "") \ -_(show_lisp_pitr, "") \ -_(show_lisp_use_petr, "") \ -_(show_lisp_map_request_mode, "") \ _(af_packet_create, "name [hw_addr ]") \ _(af_packet_delete, "name ") \ _(af_packet_dump, "") \ @@ -21037,9 +14832,6 @@ _(policer_classify_set_interface, \ " | sw_if_index [ip4-table ] [ip6-table ]\n" \ " [l2-table ] [del]") \ _(policer_classify_dump, "type [ip4|ip6|l2]") \ -_(netmap_create, "name [hw-addr ] [pipe] " \ - "[master|slave]") \ -_(netmap_delete, "name ") \ _(mpls_tunnel_dump, "tunnel_index ") \ _(mpls_table_dump, "") \ _(mpls_route_dump, "table-id ") \ @@ -21061,6 +14853,7 @@ _(get_next_index, "node-name next-node-name ") \ _(pg_create_interface, "if_id [gso-enabled gso-size ]") \ _(pg_capture, "if_id pcap count [disable]") \ _(pg_enable_disable, "[stream ] disable") \ +_(pg_interface_enable_disable_coalesce, " | sw_if_index enable | disable") \ _(ip_source_and_port_range_check_add_del, \ "/ range - vrf ") \ _(ip_source_and_port_range_check_interface_add_del, \ @@ -21092,9 +14885,6 @@ _(hw_interface_set_mtu, " | hw_if_index mtu ") \ _(sw_interface_get_table, " | sw_if_index [ipv6]") \ _(p2p_ethernet_add, " | sw_if_index remote_mac sub_id ") \ _(p2p_ethernet_del, " | sw_if_index remote_mac ") \ -_(lldp_config, "system-name tx-hold tx-interval ") \ -_(sw_interface_set_lldp, " | sw_if_index [port-desc ]\n" \ - " [mgmt-ip4 ] [mgmt-ip6 ] [mgmt-oid ] [disable]") \ _(tcp_configure_src_addresses, "first-last [vrf ]") \ _(sock_init_shm, "size ") \ _(app_namespace_add_del, "[add] id secret sw_if_index ")\