X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvat%2Fapi_format.c;h=f8af24b0ea7e0518615cbd3a224ea4596850213a;hb=3d1ef873d;hp=3c0b0f9570a430cf1214c3b066aefc861ef77851;hpb=ff55c816c966bdd6928c22ee764358c0a61436dc;p=vpp.git diff --git a/src/vat/api_format.c b/src/vat/api_format.c index 3c0b0f9570a..f8af24b0ea7 100644 --- a/src/vat/api_format.c +++ b/src/vat/api_format.c @@ -18,6 +18,7 @@ */ #include +#include #include #include #include @@ -58,7 +59,6 @@ #include "vat/json_format.h" #include #include -#include #include #include @@ -86,6 +86,9 @@ #define __plugin_msg_base 0 #include +void vl_api_set_elog_main (elog_main_t * m); +int vl_api_set_elog_trace_api_messages (int enable); + #if VPP_API_TEST_BUILTIN == 0 #include @@ -165,7 +168,8 @@ errmsg (char *fmt, ...) if (vam->ifp != stdin) fformat (vam->ofp, "%s(%d): \n", vam->current_file, vam->input_line_number); - fformat (vam->ofp, (char *) s); + else + fformat (vam->ofp, "%s\n", (char *) s); fflush (vam->ofp); } #endif @@ -738,9 +742,9 @@ increment_v6_address (vl_api_ip6_address_t * i) static void increment_address (vl_api_address_t * a) { - if (a->af == ADDRESS_IP4) + if (clib_net_to_host_u32 (a->af) == ADDRESS_IP4) increment_v4_address (&a->un.ip4); - else if (a->af == ADDRESS_IP6) + else if (clib_net_to_host_u32 (a->af) == ADDRESS_IP6) increment_v6_address (&a->un.ip6); } @@ -789,8 +793,8 @@ static void vat_json_object_add_prefix (vat_json_node_t * node, const vl_api_prefix_t * prefix) { - vat_json_object_add_uint (node, "address_length", prefix->address_length); - vat_json_object_add_address (node, "prefix", &prefix->address); + vat_json_object_add_uint (node, "len", prefix->len); + vat_json_object_add_address (node, "address", &prefix->address); } static void vl_api_create_loopback_reply_t_handler @@ -989,14 +993,11 @@ static void vl_api_sw_interface_details_t_handler sub->sw_if_index = ntohl (mp->sw_if_index); sub->sub_id = ntohl (mp->sub_id); - sub->sub_dot1ad = mp->sub_dot1ad; + sub->raw_flags = ntohl (mp->sub_if_flags & SUB_IF_API_FLAG_MASK_VNET); + sub->sub_number_of_tags = mp->sub_number_of_tags; sub->sub_outer_vlan_id = ntohs (mp->sub_outer_vlan_id); sub->sub_inner_vlan_id = ntohs (mp->sub_inner_vlan_id); - sub->sub_exact_match = mp->sub_exact_match; - sub->sub_default = mp->sub_default; - sub->sub_outer_vlan_id_any = mp->sub_outer_vlan_id_any; - sub->sub_inner_vlan_id_any = mp->sub_inner_vlan_id_any; /* vlan tag rewrite */ sub->vtr_op = ntohl (mp->vtr_op); @@ -1023,37 +1024,28 @@ static void vl_api_sw_interface_details_t_handler_json vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); vat_json_object_add_uint (node, "sup_sw_if_index", ntohl (mp->sup_sw_if_index)); - vat_json_object_add_uint (node, "l2_address_length", - ntohl (mp->l2_address_length)); vat_json_object_add_bytes (node, "l2_address", mp->l2_address, sizeof (mp->l2_address)); vat_json_object_add_string_copy (node, "interface_name", mp->interface_name); - vat_json_object_add_uint (node, "admin_up_down", mp->admin_up_down); - vat_json_object_add_uint (node, "link_up_down", mp->link_up_down); + vat_json_object_add_uint (node, "flags", mp->flags); vat_json_object_add_uint (node, "link_duplex", mp->link_duplex); vat_json_object_add_uint (node, "link_speed", mp->link_speed); vat_json_object_add_uint (node, "mtu", ntohs (mp->link_mtu)); vat_json_object_add_uint (node, "sub_id", ntohl (mp->sub_id)); - vat_json_object_add_uint (node, "sub_dot1ad", mp->sub_dot1ad); vat_json_object_add_uint (node, "sub_number_of_tags", mp->sub_number_of_tags); vat_json_object_add_uint (node, "sub_outer_vlan_id", ntohs (mp->sub_outer_vlan_id)); vat_json_object_add_uint (node, "sub_inner_vlan_id", ntohs (mp->sub_inner_vlan_id)); - vat_json_object_add_uint (node, "sub_exact_match", mp->sub_exact_match); - vat_json_object_add_uint (node, "sub_default", mp->sub_default); - vat_json_object_add_uint (node, "sub_outer_vlan_id_any", - mp->sub_outer_vlan_id_any); - vat_json_object_add_uint (node, "sub_inner_vlan_id_any", - mp->sub_inner_vlan_id_any); + vat_json_object_add_uint (node, "sub_if_flags", ntohl (mp->sub_if_flags)); vat_json_object_add_uint (node, "vtr_op", ntohl (mp->vtr_op)); vat_json_object_add_uint (node, "vtr_push_dot1q", ntohl (mp->vtr_push_dot1q)); vat_json_object_add_uint (node, "vtr_tag1", ntohl (mp->vtr_tag1)); vat_json_object_add_uint (node, "vtr_tag2", ntohl (mp->vtr_tag2)); - if (mp->sub_dot1ah) + if (ntohl (mp->sub_if_flags) & SUB_IF_API_FLAG_DOT1AH) { vat_json_object_add_string_copy (node, "pbb_vtr_dmac", format (0, "%U", @@ -1076,8 +1068,10 @@ static void vl_api_sw_interface_event_t_handler if (vam->interface_event_display) errmsg ("interface flags: sw_if_index %d %s %s", ntohl (mp->sw_if_index), - mp->admin_up_down ? "admin-up" : "admin-down", - mp->link_up_down ? "link-up" : "link-down"); + ((ntohl (mp->flags)) & IF_STATUS_API_FLAG_ADMIN_UP) ? + "admin-up" : "admin-down", + ((ntohl (mp->flags)) & IF_STATUS_API_FLAG_LINK_UP) ? + "link-up" : "link-down"); } #endif @@ -1330,30 +1324,10 @@ static void vl_api_show_version_reply_t_handler if (retval >= 0) { - u8 *s = 0; - char *p = (char *) &mp->program; - - s = vl_api_from_api_to_vec ((vl_api_string_t *) p); - errmsg (" program: %v\n", s); - vec_free (s); - - p += - vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t); - s = vl_api_from_api_to_vec ((vl_api_string_t *) p); - errmsg (" version: %v\n", s); - vec_free (s); - - p += - vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t); - s = vl_api_from_api_to_vec ((vl_api_string_t *) p); - errmsg (" build date: %v\n", s); - vec_free (s); - - p += - vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t); - s = vl_api_from_api_to_vec ((vl_api_string_t *) p); - errmsg ("build directory: %v\n", s); - vec_free (s); + errmsg (" program: %s", mp->program); + errmsg (" version: %s", mp->version); + errmsg (" build date: %s", mp->build_date); + errmsg ("build directory: %s", mp->build_directory); } vam->retval = retval; vam->result_ready = 1; @@ -1367,22 +1341,11 @@ static void vl_api_show_version_reply_t_handler_json vat_json_init_object (&node); vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - char *p = (char *) &mp->program; - vat_json_object_add_string_copy (&node, "program", - vl_api_from_api_string ((vl_api_string_t *) - p)); - p += vl_api_string_len ((vl_api_string_t *) p) + sizeof (u32); - vat_json_object_add_string_copy (&node, "version", - vl_api_from_api_string ((vl_api_string_t *) - p)); - p += vl_api_string_len ((vl_api_string_t *) p) + sizeof (u32); - vat_json_object_add_string_copy (&node, "build_date", - vl_api_from_api_string ((vl_api_string_t *) - p)); - p += vl_api_string_len ((vl_api_string_t *) p) + sizeof (u32); + vat_json_object_add_string_copy (&node, "program", mp->program); + vat_json_object_add_string_copy (&node, "version", mp->version); + vat_json_object_add_string_copy (&node, "build_date", mp->build_date); vat_json_object_add_string_copy (&node, "build_directory", - vl_api_from_api_string ((vl_api_string_t *) - p)); + mp->build_directory); vat_json_print (vam->ofp, &node); vat_json_free (&node); @@ -2037,6 +2000,49 @@ static void vl_api_bond_detach_slave_reply_t_handler_json vam->result_ready = 1; } +static int +api_sw_interface_set_bond_weight (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_bond_weight_t *mp; + u32 sw_if_index = ~0; + u32 weight = 0; + u8 weight_enter = 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)) + ; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + ; + else if (unformat (i, "weight %u", &weight)) + weight_enter = 1; + else + break; + } + + if (sw_if_index == ~0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } + if (weight_enter == 0) + { + errmsg ("missing valid weight"); + return -99; + } + + /* Construct the API message */ + M (SW_INTERFACE_SET_BOND_WEIGHT, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->weight = ntohl (weight); + + S (mp); + W (ret); + return ret; +} + static void vl_api_sw_interface_bond_details_t_handler (vl_api_sw_interface_bond_details_t * mp) { @@ -2045,8 +2051,8 @@ static void vl_api_sw_interface_bond_details_t_handler print (vam->ofp, "%-16s %-12d %-12U %-13U %-14u %-14u", mp->interface_name, ntohl (mp->sw_if_index), - format_bond_mode, mp->mode, format_bond_load_balance, mp->lb, - ntohl (mp->active_slaves), ntohl (mp->slaves)); + format_bond_mode, ntohl (mp->mode), format_bond_load_balance, + ntohl (mp->lb), ntohl (mp->active_slaves), ntohl (mp->slaves)); } static void vl_api_sw_interface_bond_details_t_handler_json @@ -2066,8 +2072,8 @@ static void vl_api_sw_interface_bond_details_t_handler_json 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, "mode", mp->mode); - vat_json_object_add_uint (node, "load_balance", mp->lb); + 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)); } @@ -2102,8 +2108,9 @@ static void vl_api_sw_interface_slave_details_t_handler vat_main_t *vam = &vat_main; print (vam->ofp, - "%-25s %-12d %-12d %d", mp->interface_name, - ntohl (mp->sw_if_index), mp->is_passive, mp->is_long_timeout); + "%-25s %-12d %-7d %-12d %-10d %-10d", mp->interface_name, + ntohl (mp->sw_if_index), mp->is_passive, mp->is_long_timeout, + ntohl (mp->weight), mp->is_local_numa); } static void vl_api_sw_interface_slave_details_t_handler_json @@ -2125,6 +2132,8 @@ static void vl_api_sw_interface_slave_details_t_handler_json mp->interface_name); vat_json_object_add_uint (node, "passive", mp->is_passive); vat_json_object_add_uint (node, "long_timeout", mp->is_long_timeout); + vat_json_object_add_uint (node, "weight", ntohl (mp->weight)); + vat_json_object_add_uint (node, "is_local_numa", mp->is_local_numa); } static int @@ -2155,8 +2164,9 @@ api_sw_interface_slave_dump (vat_main_t * vam) } print (vam->ofp, - "\n%-25s %-12s %-12s %s", - "slave interface name", "sw_if_index", "passive", "long_timeout"); + "\n%-25s %-12s %-7s %-12s %-10s %-10s", + "slave interface name", "sw_if_index", "passive", "long_timeout", + "weight", "local numa"); /* Get list of bond interfaces */ M (SW_INTERFACE_SLAVE_DUMP, mp); @@ -2571,70 +2581,6 @@ static void vl_api_create_vhost_user_if_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_dns_resolve_name_reply_t_handler - (vl_api_dns_resolve_name_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) - { - if (mp->ip4_set) - clib_warning ("ip4 address %U", format_ip4_address, - (ip4_address_t *) mp->ip4_address); - if (mp->ip6_set) - clib_warning ("ip6 address %U", format_ip6_address, - (ip6_address_t *) mp->ip6_address); - } - else - clib_warning ("retval %d", retval); - } -} - -static void vl_api_dns_resolve_name_reply_t_handler_json - (vl_api_dns_resolve_name_reply_t * mp) -{ - clib_warning ("not implemented"); -} - -static void vl_api_dns_resolve_ip_reply_t_handler - (vl_api_dns_resolve_ip_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) - { - clib_warning ("canonical name %s", mp->name); - } - else - clib_warning ("retval %d", retval); - } -} - -static void vl_api_dns_resolve_ip_reply_t_handler_json - (vl_api_dns_resolve_ip_reply_t * mp) -{ - clib_warning ("not implemented"); -} - - static void vl_api_ip_address_details_t_handler (vl_api_ip_address_details_t * mp) { @@ -2664,7 +2610,7 @@ static void vl_api_ip_address_details_t_handler 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.address_length; + address->prefix_length = mp->prefix.len; #undef addresses } @@ -5142,6 +5088,7 @@ _(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) \ @@ -5262,8 +5209,6 @@ _(p2p_ethernet_del_reply) \ _(lldp_config_reply) \ _(sw_interface_set_lldp_reply) \ _(tcp_configure_src_addresses_reply) \ -_(dns_enable_disable_reply) \ -_(dns_name_server_add_del_reply) \ _(session_rule_add_del_reply) \ _(ip_container_proxy_add_del_reply) \ _(output_acl_set_interface_reply) \ @@ -5346,6 +5291,7 @@ _(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) \ @@ -5580,10 +5526,6 @@ _(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) \ -_(DNS_ENABLE_DISABLE_REPLY, dns_enable_disable_reply) \ -_(DNS_NAME_SERVER_ADD_DEL_REPLY, dns_name_server_add_del_reply) \ -_(DNS_RESOLVE_NAME_REPLY, dns_resolve_name_reply) \ -_(DNS_RESOLVE_IP_REPLY, dns_resolve_ip_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) \ @@ -6013,7 +5955,7 @@ api_sw_interface_set_flags (vat_main_t * vam) /* Construct the API message */ M (SW_INTERFACE_SET_FLAGS, mp); mp->sw_if_index = ntohl (sw_if_index); - mp->admin_up_down = admin_up; + mp->flags = ntohl ((admin_up) ? IF_STATUS_API_FLAG_ADMIN_UP : 0); /* send it... */ S (mp); @@ -6069,7 +6011,7 @@ api_sw_interface_set_rx_mode (vat_main_t * vam) /* Construct the API message */ M (SW_INTERFACE_SET_RX_MODE, mp); mp->sw_if_index = ntohl (sw_if_index); - mp->mode = mode; + 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; @@ -6305,14 +6247,15 @@ api_sw_interface_add_del_address (vat_main_t * vam) mp->del_all = del_all; if (v6_address_set) { - mp->is_ipv6 = 1; - clib_memcpy (mp->address, &v6address, sizeof (v6address)); + mp->prefix.address.af = ADDRESS_IP6; + clib_memcpy (mp->prefix.address.un.ip6, &v6address, sizeof (v6address)); } else { - clib_memcpy (mp->address, &v4address, sizeof (v4address)); + mp->prefix.address.af = ADDRESS_IP4; + clib_memcpy (mp->prefix.address.un.ip4, &v4address, sizeof (v4address)); } - mp->address_length = address_length; + mp->prefix.len = address_length; /* send it... */ S (mp); @@ -7635,16 +7578,9 @@ api_tap_delete_v2 (vat_main_t * vam) } uword -unformat_pci_addr (unformat_input_t * input, va_list * args) +unformat_vlib_pci_addr (unformat_input_t * input, va_list * args) { - struct pci_addr_t - { - u16 domain; - u8 bus; - u8 slot:5; - u8 function:3; - } *addr; - addr = va_arg (*args, struct pci_addr_t *); + 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])) @@ -7679,7 +7615,7 @@ api_virtio_pci_create (vat_main_t * vam) { random_mac = 0; } - else if (unformat (i, "pci-addr %U", unformat_pci_addr, &pci_addr)) + else if (unformat (i, "pci-addr %U", unformat_vlib_pci_addr, &pci_addr)) ; else if (unformat (i, "features 0x%llx", &features)) ; @@ -7766,6 +7702,7 @@ api_bond_create (vat_main_t * vam) 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; @@ -7781,6 +7718,8 @@ api_bond_create (vat_main_t * vam) 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 @@ -7798,9 +7737,10 @@ api_bond_create (vat_main_t * vam) mp->use_custom_mac = custom_mac; - mp->mode = mode; - mp->lb = lb; + 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); @@ -9214,6 +9154,16 @@ _(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) { @@ -9223,14 +9173,14 @@ api_create_subif (vat_main_t * vam) u8 sw_if_index_set = 0; u32 sub_id; u8 sub_id_set = 0; - u32 no_tags = 0; - u32 one_tag = 0; - u32 two_tags = 0; - u32 dot1ad = 0; - u32 exact_match = 0; - u32 default_sub = 0; - u32 outer_vlan_id_any = 0; - u32 inner_vlan_id_any = 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; @@ -9276,8 +9226,8 @@ api_create_subif (vat_main_t * vam) mp->sw_if_index = ntohl (sw_if_index); mp->sub_id = ntohl (sub_id); -#define _(a) mp->a = a; - foreach_create_subif_bit; +#define _(a,b) mp->sub_if_flags |= (1 << a); + foreach_create_subif_flag; #undef _ mp->outer_vlan_id = ntohs (outer_vlan_id); @@ -13293,6 +13243,7 @@ api_create_vhost_user_if (vat_main_t * vam) u8 disable_mrg_rxbuf = 0; u8 disable_indirect_desc = 0; u8 *tag = 0; + u8 enable_gso = 0; int ret; /* Shut up coverity */ @@ -13314,6 +13265,8 @@ api_create_vhost_user_if (vat_main_t * vam) 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)) ; else @@ -13338,6 +13291,7 @@ api_create_vhost_user_if (vat_main_t * vam) 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) @@ -13368,6 +13322,7 @@ api_modify_vhost_user_if (vat_main_t * vam) u32 custom_dev_instance = ~0; u8 sw_if_index_set = 0; u32 sw_if_index = (u32) ~ 0; + u8 enable_gso = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) @@ -13384,6 +13339,8 @@ api_modify_vhost_user_if (vat_main_t * vam) ; else if (unformat (i, "server")) is_server = 1; + else if (unformat (i, "gso")) + enable_gso = 1; else break; } @@ -13411,6 +13368,7 @@ api_modify_vhost_user_if (vat_main_t * vam) 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) @@ -18922,7 +18880,7 @@ static void vl_api_mpls_route_details_t_handler (vl_api_mpls_route_details_t * mp) { vat_main_t *vam = &vat_main; - int count = ntohl (mp->mr_route.mr_n_paths); + int count = (int) clib_net_to_host_u32 (mp->mr_route.mr_n_paths); vl_api_fib_path_t *fp; int i; @@ -18942,7 +18900,7 @@ static void vl_api_mpls_route_details_t_handler_json (vl_api_mpls_route_details_t * mp) { vat_main_t *vam = &vat_main; - int count = ntohl (mp->mr_route.mr_n_paths); + int count = (int) clib_host_to_net_u32 (mp->mr_route.mr_n_paths); vat_json_node_t *node = NULL; vl_api_fib_path_t *fp; int i; @@ -19202,8 +19160,7 @@ vl_api_ip_route_details_t_handler (vl_api_ip_route_details_t * mp) print (vam->ofp, "table-id %d, prefix %U/%d", ntohl (mp->route.table_id), - format_ip46_address, - mp->route.prefix.address, mp->route.prefix.address_length); + format_ip46_address, mp->route.prefix.address, mp->route.prefix.len); for (i = 0; i < count; i++) { fp = &mp->route.paths[i]; @@ -19243,8 +19200,7 @@ static void vl_api_ip_route_details_t_handler_json clib_memcpy (&ip4, &mp->route.prefix.address.un.ip4, sizeof (ip4)); vat_json_object_add_ip4 (node, "prefix", ip4); } - vat_json_object_add_uint (node, "mask_length", - mp->route.prefix.address_length); + vat_json_object_add_uint (node, "mask_length", mp->route.prefix.len); vat_json_object_add_uint (node, "path_count", count); for (i = 0; i < count; i++) { @@ -19744,12 +19700,24 @@ api_pg_create_interface (vat_main_t * vam) unformat_input_t *input = vam->input; vl_api_pg_create_interface_t *mp; - u32 if_id = ~0; + u32 if_id = ~0, gso_size = 0; + u8 gso_enabled = 0; int ret; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { if (unformat (input, "if_id %d", &if_id)) ; + else if (unformat (input, "gso-enabled")) + { + gso_enabled = 1; + if (unformat (input, "gso-size %u", &gso_size)) + ; + else + { + errmsg ("missing gso-size"); + return -99; + } + } else break; } @@ -19763,6 +19731,7 @@ api_pg_create_interface (vat_main_t * vam) M (PG_CREATE_INTERFACE, mp); mp->context = 0; mp->interface_id = ntohl (if_id); + mp->gso_enabled = gso_enabled; S (mp); W (ret); @@ -20926,172 +20895,6 @@ api_sock_init_shm (vat_main_t * vam) #endif } -static int -api_dns_enable_disable (vat_main_t * vam) -{ - unformat_input_t *line_input = vam->input; - vl_api_dns_enable_disable_t *mp; - u8 enable_disable = 1; - int ret; - - 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 - break; - } - - /* Construct the API message */ - M (DNS_ENABLE_DISABLE, mp); - mp->enable = enable_disable; - - /* send it... */ - S (mp); - /* Wait for the reply */ - W (ret); - return ret; -} - -static int -api_dns_resolve_name (vat_main_t * vam) -{ - unformat_input_t *line_input = vam->input; - vl_api_dns_resolve_name_t *mp; - u8 *name = 0; - int ret; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (line_input, "%s", &name)) - ; - else - break; - } - - if (vec_len (name) > 127) - { - errmsg ("name too long"); - return -99; - } - - /* Construct the API message */ - M (DNS_RESOLVE_NAME, mp); - memcpy (mp->name, name, vec_len (name)); - vec_free (name); - - /* send it... */ - S (mp); - /* Wait for the reply */ - W (ret); - return ret; -} - -static int -api_dns_resolve_ip (vat_main_t * vam) -{ - unformat_input_t *line_input = vam->input; - vl_api_dns_resolve_ip_t *mp; - int is_ip6 = -1; - ip4_address_t addr4; - ip6_address_t addr6; - int ret; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (line_input, "%U", unformat_ip6_address, &addr6)) - is_ip6 = 1; - else if (unformat (line_input, "%U", unformat_ip4_address, &addr4)) - is_ip6 = 0; - else - break; - } - - if (is_ip6 == -1) - { - errmsg ("missing address"); - return -99; - } - - /* Construct the API message */ - M (DNS_RESOLVE_IP, mp); - mp->is_ip6 = is_ip6; - if (is_ip6) - memcpy (mp->address, &addr6, sizeof (addr6)); - else - memcpy (mp->address, &addr4, sizeof (addr4)); - - /* send it... */ - S (mp); - /* Wait for the reply */ - W (ret); - return ret; -} - -static int -api_dns_name_server_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_dns_name_server_add_del_t *mp; - u8 is_add = 1; - ip6_address_t ip6_server; - ip4_address_t ip4_server; - int ip6_set = 0; - int ip4_set = 0; - int ret = 0; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", unformat_ip6_address, &ip6_server)) - ip6_set = 1; - else if (unformat (i, "%U", unformat_ip4_address, &ip4_server)) - ip4_set = 1; - else if (unformat (i, "del")) - is_add = 0; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (ip4_set && ip6_set) - { - errmsg ("Only one server address allowed per message"); - return -99; - } - if ((ip4_set + ip6_set) == 0) - { - errmsg ("Server address required"); - return -99; - } - - /* Construct the API message */ - M (DNS_NAME_SERVER_ADD_DEL, mp); - - if (ip6_set) - { - memcpy (mp->server_address, &ip6_server, sizeof (ip6_address_t)); - mp->is_ip6 = 1; - } - else - { - memcpy (mp->server_address, &ip4_server, sizeof (ip4_address_t)); - mp->is_ip6 = 0; - } - - mp->is_add = is_add; - - /* send it... */ - S (mp); - - /* Wait for a reply, return good/bad news */ - W (ret); - return ret; -} - static void vl_api_session_rules_details_t_handler (vl_api_session_rules_details_t * mp) { @@ -21311,7 +21114,7 @@ api_ip_container_proxy_add_del (vat_main_t * vam) else break; } - if (sw_if_index == ~0 || pfx.address_length == 0) + if (sw_if_index == ~0 || pfx.len == 0) { errmsg ("address and sw_if_index must be set"); return -99; @@ -21368,8 +21171,8 @@ api_qos_record_enable_disable (vat_main_t * vam) M (QOS_RECORD_ENABLE_DISABLE, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->input_source = qs; + mp->record.sw_if_index = ntohl (sw_if_index); + mp->record.input_source = qs; mp->enable = enable; S (mp); @@ -21405,6 +21208,98 @@ comment (vat_main_t * vam) return 0; } +static int +elog_save (vat_main_t * vam) +{ +#if VPP_API_TEST_BUILTIN == 0 + elog_main_t *em = &vam->elog_main; + unformat_input_t *i = vam->input; + char *file, *chroot_file; + clib_error_t *error; + + if (!unformat (i, "%s", &file)) + { + errmsg ("expected file name, got `%U'", format_unformat_error, i); + return 0; + } + + /* It's fairly hard to get "../oopsie" through unformat; just in case */ + if (strstr (file, "..") || index (file, '/')) + { + errmsg ("illegal characters in filename '%s'", file); + return 0; + } + + chroot_file = (char *) format (0, "/tmp/%s%c", file, 0); + + vec_free (file); + + errmsg ("Saving %wd of %wd events to %s", + elog_n_events_in_buffer (em), + elog_buffer_capacity (em), chroot_file); + + error = elog_write_file (em, chroot_file, 1 /* flush ring */ ); + vec_free (chroot_file); + + if (error) + clib_error_report (error); +#else + errmsg ("Use the vpp event loger..."); +#endif + + return 0; +} + +static int +elog_setup (vat_main_t * vam) +{ +#if VPP_API_TEST_BUILTIN == 0 + elog_main_t *em = &vam->elog_main; + unformat_input_t *i = vam->input; + u32 nevents = 128 << 10; + + (void) unformat (i, "nevents %d", &nevents); + + elog_init (em, nevents); + vl_api_set_elog_main (em); + vl_api_set_elog_trace_api_messages (1); + errmsg ("Event logger initialized with %u events", nevents); +#else + errmsg ("Use the vpp event loger..."); +#endif + return 0; +} + +static int +elog_enable (vat_main_t * vam) +{ +#if VPP_API_TEST_BUILTIN == 0 + elog_main_t *em = &vam->elog_main; + + elog_enable_disable (em, 1 /* enable */ ); + vl_api_set_elog_trace_api_messages (1); + errmsg ("Event logger enabled..."); +#else + errmsg ("Use the vpp event loger..."); +#endif + return 0; +} + +static int +elog_disable (vat_main_t * vam) +{ +#if VPP_API_TEST_BUILTIN == 0 + elog_main_t *em = &vam->elog_main; + + elog_enable_disable (em, 0 /* enable */ ); + vl_api_set_elog_trace_api_messages (1); + errmsg ("Event logger disabled..."); +#else + errmsg ("Use the vpp event loger..."); +#endif + return 0; +} + static int statseg (vat_main_t * vam) { @@ -21872,13 +21767,14 @@ _(sw_interface_virtio_pci_dump, "") \ _(bond_create, \ "[hw-addr ] {round-robin | active-backup | " \ "broadcast | {lacp | xor} [load-balance { l2 | l23 | l34 }]} " \ - "[id ]") \ + "[id ]") \ _(bond_delete, \ " | sw_if_index ") \ _(bond_enslave, \ - "sw_if_index bond [is_passive] [is_long_timeout]") \ + "sw_if_index bond [is_passive] [is_long_timeout]") \ _(bond_detach_slave, \ "sw_if_index ") \ + _(sw_interface_set_bond_weight, " | sw_if_index weight ") \ _(sw_interface_bond_dump, "") \ _(sw_interface_slave_dump, \ " | sw_if_index ") \ @@ -22016,11 +21912,11 @@ _(l2_interface_vlan_tag_rewrite, \ "[translate-2-[1|2]] [push_dot1q 0] tag1 tag2 ") \ _(create_vhost_user_if, \ "socket [server] [renumber ] " \ - "[disable_mrg_rxbuf] [disable_indirect_desc] " \ + "[disable_mrg_rxbuf] [disable_indirect_desc] [gso] " \ "[mac ]") \ _(modify_vhost_user_if, \ " | sw_if_index socket \n" \ - "[server] [renumber ]") \ + "[server] [renumber ] [gso]") \ _(delete_vhost_user_if, " | sw_if_index ") \ _(sw_interface_vhost_user_dump, "") \ _(show_version, "") \ @@ -22227,7 +22123,7 @@ _(ipfix_classify_table_dump, "") \ _(sw_interface_span_enable_disable, "[l2] [src | src_sw_if_index ] [disable | [[dst | dst_sw_if_index ] [both|rx|tx]]]") \ _(sw_interface_span_dump, "[l2]") \ _(get_next_index, "node-name next-node-name ") \ -_(pg_create_interface, "if_id ") \ +_(pg_create_interface, "if_id [gso-enabled gso-size ]") \ _(pg_capture, "if_id pcap count [disable]") \ _(pg_enable_disable, "[stream ] disable") \ _(ip_source_and_port_range_check_add_del, \ @@ -22264,12 +22160,6 @@ _(sw_interface_set_lldp, " | sw_if_index [port-desc ]\n _(tcp_configure_src_addresses, "first-last [vrf ]") \ _(sock_init_shm, "size ") \ _(app_namespace_add_del, "[add] id secret sw_if_index ")\ -_(dns_enable_disable, "[enable][disable]") \ -_(dns_name_server_add_del, " [del]") \ -_(dns_resolve_name, "") \ -_(dns_resolve_ip, "") \ -_(dns_name_server_add_del, " [del]") \ -_(dns_resolve_name, "") \ _(session_rule_add_del, "[add|del] proto / " \ " / action ") \ _(session_rules_dump, "") \ @@ -22289,6 +22179,10 @@ _(dump_ipv6_table, "usage: dump_ipv6_table") \ _(dump_macro_table, "usage: dump_macro_table ") \ _(dump_node_table, "usage: dump_node_table") \ _(dump_msg_api_table, "usage: dump_msg_api_table") \ +_(elog_setup, "usage: elog_setup [nevents, default 128K]") \ +_(elog_disable, "usage: elog_disable") \ +_(elog_enable, "usage: elog_enable") \ +_(elog_save, "usage: elog_save ") \ _(get_msg_id, "usage: get_msg_id name_and_crc") \ _(echo, "usage: echo ") \ _(exec, "usage: exec ") \