X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=vpp-api-test%2Fvat%2Fapi_format.c;h=bf1a3931b0b9787be3c99246ac7105fc39e89d53;hb=195bceec5685cb367519e37f22b36f5f99819827;hp=c36e0591b3938d39fdfae4f65e0da02a09c9884d;hpb=a9edd85e4cb35fd55c515dbfbad37aecd28c1431;p=vpp.git diff --git a/vpp-api-test/vat/api_format.c b/vpp-api-test/vat/api_format.c index c36e0591b39..bf1a3931b0b 100644 --- a/vpp-api-test/vat/api_format.c +++ b/vpp-api-test/vat/api_format.c @@ -27,8 +27,7 @@ #include #include #include -#include -#include +#include #include #include @@ -847,98 +846,6 @@ static void vl_api_mpls_gre_add_del_tunnel_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_nsh_gre_add_del_tunnel_reply_t_handler -(vl_api_nsh_gre_add_del_tunnel_reply_t * mp) -{ - vat_main_t * vam = &vat_main; - i32 retval = ntohl(mp->retval); - u32 sw_if_index = ntohl(mp->sw_if_index); - - if (retval >= 0 && sw_if_index != (u32)~0) { - errmsg ("sw_if_index %d\n", ntohl(mp->sw_if_index)); - } - vam->retval = retval; - vam->result_ready = 1; -} - -static void vl_api_nsh_gre_add_del_tunnel_reply_t_handler_json -(vl_api_nsh_gre_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_nsh_vxlan_gpe_add_del_tunnel_reply_t_handler -(vl_api_nsh_vxlan_gpe_add_del_tunnel_reply_t * mp) -{ - vat_main_t * vam = &vat_main; - i32 retval = ntohl(mp->retval); - u32 sw_if_index = ntohl(mp->sw_if_index); - - if (retval >= 0 && sw_if_index != (u32)~0) { - errmsg ("sw_if_index %d\n", ntohl(mp->sw_if_index)); - } - vam->retval = retval; - vam->result_ready = 1; -} - -static void vl_api_nsh_vxlan_gpe_add_del_tunnel_reply_t_handler_json -(vl_api_nsh_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_lisp_gpe_add_del_tunnel_reply_t_handler -(vl_api_lisp_gpe_add_del_tunnel_reply_t * mp) -{ - vat_main_t * vam = &vat_main; - i32 retval = ntohl(mp->retval); - u32 sw_if_index = ntohl(mp->sw_if_index); - - if (retval >= 0 && sw_if_index != (u32)~0) { - errmsg ("sw_if_index %d\n", ntohl(mp->sw_if_index)); - } - vam->retval = retval; - vam->result_ready = 1; -} - -static void vl_api_lisp_gpe_add_del_tunnel_reply_t_handler_json -(vl_api_lisp_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_show_version_reply_t_handler (vl_api_show_version_reply_t * mp) @@ -1908,12 +1815,27 @@ vl_api_lisp_locator_set_details_t_handler ( vl_api_lisp_locator_set_details_t *mp) { vat_main_t *vam = &vat_main; + u8 * tmp_str = NULL; + + if (mp->local) { + fformat(vam->ofp, "%=20s%=16d%=16d%=16d\n", + mp->locator_set_name, + ntohl(mp->sw_if_index), + mp->priority, + mp->weight); + } else { + tmp_str = format(0,"%U/%d", + mp->is_ipv6 ? format_ip6_address : format_ip4_address, + mp->ip_address, + mp->prefix_len); - fformat(vam->ofp, "%=20s%=16d%=16d%=16d\n", - mp->locator_set_name, - ntohl(mp->sw_if_index), - mp->priority, - mp->weight); + fformat(vam->ofp, "%=20s%=16s%=16d%=16d\n", + mp->locator_set_name, + tmp_str, + mp->priority, + mp->weight); + vec_free(tmp_str); + } } static void @@ -1922,6 +1844,8 @@ vl_api_lisp_locator_set_details_t_handler_json ( { 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); @@ -1931,7 +1855,18 @@ vl_api_lisp_locator_set_details_t_handler_json ( vat_json_init_object(node); vat_json_object_add_string_copy(node, "locator-set", mp->locator_set_name); - vat_json_object_add_uint(node, "locator", ntohl(mp->sw_if_index)); + if (mp->local) { + vat_json_object_add_uint(node, "locator", ntohl(mp->sw_if_index)); + } else { + if (mp->is_ipv6) { + clib_memcpy(&ip6, mp->ip_address, sizeof(ip6)); + vat_json_object_add_ip6(node, "locator", ip6); + } else { + clib_memcpy(&ip4, mp->ip_address, sizeof(ip4)); + vat_json_object_add_ip4(node, "locator", ip4); + } + vat_json_object_add_uint(node, "prefix-length", mp->prefix_len); + } vat_json_object_add_uint(node, "priority", mp->priority); vat_json_object_add_uint(node, "weight", mp->weight); } @@ -2114,24 +2049,28 @@ vl_api_lisp_map_resolver_details_t_handler_json ( } static void -vl_api_lisp_gpe_enable_disable_status_details_t_handler -(vl_api_lisp_gpe_enable_disable_status_details_t *mp) +vl_api_lisp_enable_disable_status_details_t_handler +(vl_api_lisp_enable_disable_status_details_t *mp) { vat_main_t *vam = &vat_main; - fformat(vam->ofp, "%=20s\n", - mp->is_en ? "enable" : "disable"); + fformat(vam->ofp, "feature: %s\ngpe: %s\n", + mp->feature_status ? "enabled" : "disabled", + mp->gpe_status ? "enabled" : "disabled"); } static void -vl_api_lisp_gpe_enable_disable_status_details_t_handler_json -(vl_api_lisp_gpe_enable_disable_status_details_t *mp) +vl_api_lisp_enable_disable_status_details_t_handler_json +(vl_api_lisp_enable_disable_status_details_t *mp) { vat_main_t *vam = &vat_main; vat_json_node_t *node = NULL; - u8 *str = NULL; + u8 * gpe_status = NULL; + u8 * feature_status = NULL; - str = format(0, "%s", mp->is_en ? "enable" : "disable"); + gpe_status = format (0, "%s", mp->gpe_status ? "enabled" : "disabled"); + feature_status = format (0, "%s", + mp->feature_status ? "enabled" : "disabled"); if (VAT_JSON_ARRAY != vam->json_tree.type) { ASSERT(VAT_JSON_NONE == vam->json_tree.type); @@ -2140,7 +2079,11 @@ vl_api_lisp_gpe_enable_disable_status_details_t_handler_json node = vat_json_array_add(&vam->json_tree); vat_json_init_object(node); - vat_json_object_add_string_copy(node, "lisp_gpe", str); + 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); } #define vl_api_vnet_ip4_fib_counters_t_endian vl_noop_handler @@ -2190,7 +2133,7 @@ _(set_arp_neighbor_limit_reply) \ _(l2_patch_add_del_reply) \ _(sr_tunnel_add_del_reply) \ _(sr_policy_add_del_reply) \ -_(sr_multicast_map_add_del_reply) \ +_(sr_multicast_map_add_del_reply) \ _(classify_add_del_session_reply) \ _(classify_set_interface_ip_table_reply) \ _(classify_set_interface_l2_tables_reply) \ @@ -2232,7 +2175,11 @@ _(lisp_add_del_local_eid_reply) \ _(lisp_gpe_add_del_fwd_entry_reply) \ _(lisp_add_del_map_resolver_reply) \ _(lisp_gpe_enable_disable_reply) \ -_(lisp_gpe_add_del_iface_reply) +_(lisp_gpe_add_del_iface_reply) \ +_(lisp_enable_disable_reply) \ +_(vxlan_gpe_add_del_tunnel_reply) \ +_(af_packet_create_reply) \ +_(af_packet_delete_reply) #define _(n) \ static void vl_api_##n##_t_handler \ @@ -2358,10 +2305,8 @@ _(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) \ -_(NSH_GRE_ADD_DEL_TUNNEL_REPLY, nsh_gre_add_del_tunnel_reply) \ _(L2_FIB_TABLE_ENTRY, l2_fib_table_entry) \ -_(NSH_VXLAN_GPE_ADD_DEL_TUNNEL_REPLY, nsh_vxlan_gpe_add_del_tunnel_reply) \ -_(LISP_GPE_ADD_DEL_TUNNEL_REPLY, lisp_gpe_add_del_tunnel_reply) \ +_(VXLAN_GPE_ADD_DEL_TUNNEL_REPLY, vxlan_gpe_add_del_tunnel_reply) \ _(INTERFACE_NAME_RENUMBER_REPLY, interface_name_renumber_reply) \ _(WANT_IP4_ARP_EVENTS_REPLY, want_ip4_arp_events_reply) \ _(IP4_ARP_EVENT, ip4_arp_event) \ @@ -2405,13 +2350,16 @@ _(LISP_ADD_DEL_LOCAL_EID_REPLY, lisp_add_del_local_eid_reply) \ _(LISP_GPE_ADD_DEL_FWD_ENTRY_REPLY, lisp_gpe_add_del_fwd_entry_reply) \ _(LISP_ADD_DEL_MAP_RESOLVER_REPLY, lisp_add_del_map_resolver_reply) \ _(LISP_GPE_ENABLE_DISABLE_REPLY, lisp_gpe_enable_disable_reply) \ +_(LISP_ENABLE_DISABLE_REPLY, lisp_enable_disable_reply) \ _(LISP_GPE_ADD_DEL_IFACE_REPLY, lisp_gpe_add_del_iface_reply) \ _(LISP_LOCATOR_SET_DETAILS, lisp_locator_set_details) \ _(LISP_LOCAL_EID_TABLE_DETAILS, lisp_local_eid_table_details) \ _(LISP_GPE_TUNNEL_DETAILS, lisp_gpe_tunnel_details) \ _(LISP_MAP_RESOLVER_DETAILS, lisp_map_resolver_details) \ -_(LISP_GPE_ENABLE_DISABLE_STATUS_DETAILS, \ - lisp_gpe_enable_disable_status_details) +_(LISP_ENABLE_DISABLE_STATUS_DETAILS, \ + lisp_enable_disable_status_details) \ +_(AF_PACKET_CREATE_REPLY, af_packet_create_reply) \ +_(AF_PACKET_DELETE_REPLY, af_packet_delete_reply) /* M: construct, but don't yet send a message */ @@ -2984,6 +2932,12 @@ int api_sw_interface_dump (vat_main_t * vam) strncpy ((char *) mp->name_filter, "l2tpv3_tunnel", sizeof(mp->name_filter)-1); S; + /* and GRE tunnel interfaces */ + M(SW_INTERFACE_DUMP, sw_interface_dump); + mp->name_filter_valid = 1; + strncpy ((char *) mp->name_filter, "gre", sizeof(mp->name_filter)-1); + S; + /* Use a control ping for synchronization */ { vl_api_control_ping_t * mp; @@ -7919,452 +7873,81 @@ static int api_show_version (vat_main_t * vam) return 0; } -static uword unformat_nsh_gre_decap_next -(unformat_input_t * input, va_list * args) -{ - u32 * result = va_arg (*args, u32 *); - u32 tmp; - - if (unformat (input, "drop")) - *result = NSH_GRE_INPUT_NEXT_DROP; - else if (unformat (input, "ip4")) - *result = NSH_GRE_INPUT_NEXT_IP4_INPUT; - else if (unformat (input, "ip6")) - *result = NSH_GRE_INPUT_NEXT_IP6_INPUT; - else if (unformat (input, "ethernet")) - *result = NSH_GRE_INPUT_NEXT_ETHERNET_INPUT; - else if (unformat (input, "%d", &tmp)) - *result = tmp; - else - return 0; - return 1; -} -static int api_nsh_gre_add_del_tunnel (vat_main_t * vam) +static int api_vxlan_gpe_add_del_tunnel (vat_main_t * vam) { unformat_input_t * line_input = vam->input; - vl_api_nsh_gre_add_del_tunnel_t *mp; + vl_api_vxlan_gpe_add_del_tunnel_t *mp; f64 timeout; - ip4_address_t src, dst; + ip4_address_t local, remote; u8 is_add = 1; - u8 src_set = 0; - u8 dst_set = 0; + u8 local_set = 0; + u8 remote_set = 0; u32 encap_vrf_id = 0; u32 decap_vrf_id = 0; - u8 ver_o_c = 0; - u8 md_type = 0; - u8 next_protocol = 1; /* ip4 */ - u32 spi; - u8 spi_set = 0; - u32 si; - u8 si_set = 0; - u32 spi_si; - u32 c1 = 0; - u32 c2 = 0; - u32 c3 = 0; - u32 c4 = 0; - u32 *tlvs = 0; - u32 decap_next_index = NSH_GRE_INPUT_NEXT_IP4_INPUT; - u32 tmp; - int i; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "del")) - is_add = 0; - else if (unformat (line_input, "src %U", - unformat_ip4_address, &src)) - src_set = 1; - else if (unformat (line_input, "dst %U", - unformat_ip4_address, &dst)) - dst_set = 1; - 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, "decap-next %U", - unformat_nsh_gre_decap_next, &decap_next_index)) - ; - else if (unformat (line_input, "version %d", &tmp)) - ver_o_c |= (tmp & 3) << 6; - else if (unformat (line_input, "o-bit %d", &tmp)) - ver_o_c |= (tmp & 1) << 5; - else if (unformat (line_input, "c-bit %d", &tmp)) - ver_o_c |= (tmp & 1) << 4; - else if (unformat (line_input, "md-type %d", &tmp)) - md_type = tmp; - else if (unformat(line_input, "next-ip4")) - next_protocol = 1; - else if (unformat(line_input, "next-ip6")) - next_protocol = 2; - else if (unformat(line_input, "next-ethernet")) - next_protocol = 3; - else if (unformat (line_input, "c1 %d", &c1)) - ; - else if (unformat (line_input, "c2 %d", &c2)) - ; - else if (unformat (line_input, "c3 %d", &c3)) - ; - else if (unformat (line_input, "c4 %d", &c4)) - ; - else if (unformat (line_input, "spi %d", &spi)) - spi_set = 1; - else if (unformat (line_input, "si %d", &si)) - si_set = 1; - else if (unformat (line_input, "tlv %x")) - vec_add1 (tlvs, tmp); - else { - errmsg ("parse error '%U'\n", format_unformat_error, line_input); - return -99; - } - } - - if (src_set == 0) { - errmsg ("tunnel src address not specified\n"); - return -99; - } - if (dst_set == 0) { - errmsg ("tunnel dst address not specified\n"); - return -99; - } - - if (spi_set == 0) { - errmsg ("spi not specified\n"); - return -99; - } - - if (si_set == 0) { - errmsg ("si not specified\n"); - return -99; - } - - M2 (NSH_GRE_ADD_DEL_TUNNEL, nsh_gre_add_del_tunnel, - sizeof(u32) * vec_len (tlvs)); - - spi_si = (spi<<8) | si; - - mp->src = src.as_u32; - mp->dst = dst.as_u32; - mp->encap_vrf_id = ntohl(encap_vrf_id); - mp->decap_vrf_id = ntohl(decap_vrf_id); - mp->decap_next_index = ntohl(decap_next_index); - mp->tlv_len_in_words = vec_len (tlvs); - mp->is_add = is_add; - mp->ver_o_c = ver_o_c; - mp->length = 6 + vec_len(tlvs); - mp->md_type = md_type; - mp->next_protocol = next_protocol; - mp->spi_si = ntohl(spi_si); - mp->c1 = ntohl(c1); - mp->c2 = ntohl(c2); - mp->c3 = ntohl(c3); - mp->c4 = ntohl(c4); - - for (i = 0; i < vec_len(tlvs); i++) - mp->tlvs[i] = ntohl(tlvs[i]); - - vec_free (tlvs); - - S; W; - /* NOTREACHED */ - return 0; -} - -static uword unformat_nsh_vxlan_gpe_decap_next -(unformat_input_t * input, va_list * args) -{ - u32 * result = va_arg (*args, u32 *); - u32 tmp; - - if (unformat (input, "drop")) - *result = NSH_VXLAN_GPE_INPUT_NEXT_DROP; - else if (unformat (input, "ip4")) - *result = NSH_VXLAN_GPE_INPUT_NEXT_IP4_INPUT; - else if (unformat (input, "ip6")) - *result = NSH_VXLAN_GPE_INPUT_NEXT_IP6_INPUT; - else if (unformat (input, "ethernet")) - *result = NSH_VXLAN_GPE_INPUT_NEXT_ETHERNET_INPUT; - else if (unformat (input, "nsh-vxlan-gpe")) - *result = NSH_VXLAN_GPE_INPUT_NEXT_ETHERNET_INPUT; - else if (unformat (input, "%d", &tmp)) - *result = tmp; - else - return 0; - return 1; -} - -static int api_nsh_vxlan_gpe_add_del_tunnel (vat_main_t * vam) -{ - unformat_input_t * line_input = vam->input; - vl_api_nsh_vxlan_gpe_add_del_tunnel_t *mp; - f64 timeout; - ip4_address_t src, dst; - u8 is_add = 1; - u8 src_set = 0; - u8 dst_set = 0; - u32 encap_vrf_id = 0; - u32 decap_vrf_id = 0; - u8 ver_o_c = 0; - u8 md_type = 0; - u8 next_protocol = 1; /* ip4 */ - u32 spi; - u8 spi_set = 0; - u32 si; - u8 si_set = 0; - u32 spi_si; - u32 c1 = 0; - u32 c2 = 0; - u32 c3 = 0; - u32 c4 = 0; - u32 *tlvs = 0; - u32 decap_next_index = NSH_GRE_INPUT_NEXT_IP4_INPUT; + u8 protocol = ~0; u32 vni; u8 vni_set = 0; - u32 tmp; - int i; while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { if (unformat (line_input, "del")) is_add = 0; - else if (unformat (line_input, "src %U", - unformat_ip4_address, &src)) - src_set = 1; - else if (unformat (line_input, "dst %U", - unformat_ip4_address, &dst)) - dst_set = 1; + else if (unformat (line_input, "local %U", + unformat_ip4_address, &local)) + local_set = 1; + else if (unformat (line_input, "remote %U", + unformat_ip4_address, &remote)) + remote_set = 1; 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, "decap-next %U", - unformat_nsh_vxlan_gpe_decap_next, - &decap_next_index)) - ; else if (unformat (line_input, "vni %d", &vni)) vni_set = 1; - else if (unformat (line_input, "version %d", &tmp)) - ver_o_c |= (tmp & 3) << 6; - else if (unformat (line_input, "o-bit %d", &tmp)) - ver_o_c |= (tmp & 1) << 5; - else if (unformat (line_input, "c-bit %d", &tmp)) - ver_o_c |= (tmp & 1) << 4; - else if (unformat (line_input, "md-type %d", &tmp)) - md_type = tmp; else if (unformat(line_input, "next-ip4")) - next_protocol = 1; + protocol = 1; else if (unformat(line_input, "next-ip6")) - next_protocol = 2; + protocol = 2; else if (unformat(line_input, "next-ethernet")) - next_protocol = 3; - else if (unformat (line_input, "c1 %d", &c1)) - ; - else if (unformat (line_input, "c2 %d", &c2)) - ; - else if (unformat (line_input, "c3 %d", &c3)) - ; - else if (unformat (line_input, "c4 %d", &c4)) - ; - else if (unformat (line_input, "spi %d", &spi)) - spi_set = 1; - else if (unformat (line_input, "si %d", &si)) - si_set = 1; - else if (unformat (line_input, "tlv %x")) - vec_add1 (tlvs, tmp); + protocol = 3; + else if (unformat(line_input, "next-nsh")) + protocol = 4; else { errmsg ("parse error '%U'\n", format_unformat_error, line_input); return -99; } } - if (src_set == 0) { - errmsg ("tunnel src address not specified\n"); + if (local_set == 0) { + errmsg ("tunnel local address not specified\n"); return -99; } - if (dst_set == 0) { - errmsg ("tunnel dst address not specified\n"); + if (remote_set == 0) { + errmsg ("tunnel remote address not specified\n"); return -99; } - if (spi_set == 0) { - errmsg ("spi not specified\n"); - return -99; - } - - if (si_set == 0) { - errmsg ("si not specified\n"); - return -99; - } if (vni_set == 0) { errmsg ("vni not specified\n"); return -99; } - M2 (NSH_VXLAN_GPE_ADD_DEL_TUNNEL, nsh_vxlan_gpe_add_del_tunnel, - sizeof(u32) * vec_len (tlvs)); + M(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel); - spi_si = (spi<<8) | si; - - mp->src = src.as_u32; - mp->dst = dst.as_u32; + mp->local = local.as_u32; + mp->remote = remote.as_u32; mp->encap_vrf_id = ntohl(encap_vrf_id); mp->decap_vrf_id = ntohl(decap_vrf_id); - mp->decap_next_index = ntohl(decap_next_index); - mp->tlv_len_in_words = vec_len (tlvs); + mp->protocol = ntohl(protocol); mp->vni = ntohl(vni); mp->is_add = is_add; - mp->ver_o_c = ver_o_c; - mp->length = 6 + vec_len(tlvs); - mp->md_type = md_type; - mp->next_protocol = next_protocol; - mp->spi_si = ntohl(spi_si); - mp->c1 = ntohl(c1); - mp->c2 = ntohl(c2); - mp->c3 = ntohl(c3); - mp->c4 = ntohl(c4); - - for (i = 0; i < vec_len(tlvs); i++) - mp->tlvs[i] = ntohl(tlvs[i]); - vec_free (tlvs); S; W; /* NOTREACHED */ return 0; } -static uword unformat_lisp_gpe_decap_next (unformat_input_t * input, - va_list * args) -{ - u32 * result = va_arg (*args, u32 *); - u32 tmp; - - if (unformat (input, "drop")) - *result = LISP_GPE_INPUT_NEXT_DROP; - else if (unformat (input, "ip4")) - *result = LISP_GPE_INPUT_NEXT_IP4_INPUT; - else if (unformat (input, "ip6")) - *result = LISP_GPE_INPUT_NEXT_IP6_INPUT; - else if (unformat (input, "ethernet")) - *result = LISP_GPE_INPUT_NEXT_IP6_INPUT; - else if (unformat (input, "%d", &tmp)) - *result = tmp; - else - return 0; - return 1; -} - -static int -api_lisp_gpe_add_del_tunnel (vat_main_t * vam) -{ - unformat_input_t * line_input = vam->input; - vl_api_lisp_gpe_add_del_tunnel_t *mp; - f64 timeout; - ip4_address_t src, dst; - u8 is_add = 1; - u8 src_set = 0; - u8 dst_set = 0; - u32 encap_vrf_id = 0; - u32 decap_vrf_id = 0; - u8 next_protocol = LISP_GPE_NEXT_PROTOCOL_IP4; - u32 decap_next_index = LISP_GPE_INPUT_NEXT_IP4_INPUT; - u8 flags = LISP_GPE_FLAGS_P; - u8 ver_res = 0; - u8 res = 0; - u32 iid = 0; - u8 iid_set = 0; - u32 tmp; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "del")) - is_add = 0; - else if (unformat (line_input, "src %U", - unformat_ip4_address, &src)) - src_set = 1; - else if (unformat (line_input, "dst %U", - unformat_ip4_address, &dst)) - dst_set = 1; - 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, "decap-next %U", - unformat_lisp_gpe_decap_next, - &decap_next_index)) - ; - else if (unformat(line_input, "next-ip4")) - next_protocol = 1; - else if (unformat(line_input, "next-ip6")) - next_protocol = 2; - else if (unformat(line_input, "next-ethernet")) - next_protocol = 3; - else if (unformat(line_input, "next-nsh")) - next_protocol = 4; - /* Allow the user to specify anything they want in the LISP hdr */ - else if (unformat (line_input, "ver_res %x", &tmp)) - ver_res = tmp; - else if (unformat (line_input, "res %x", &tmp)) - res = tmp; - else if (unformat (line_input, "flags %x", &tmp)) - flags = tmp; - else if (unformat (line_input, "n-bit")) - flags |= LISP_GPE_FLAGS_N; - else if (unformat (line_input, "l-bit")) - flags |= LISP_GPE_FLAGS_L; - else if (unformat (line_input, "e-bit")) - flags |= LISP_GPE_FLAGS_E; - else if (unformat (line_input, "v-bit")) - flags |= LISP_GPE_FLAGS_V; - else if (unformat (line_input, "i-bit")) - flags |= LISP_GPE_FLAGS_V; - else if (unformat (line_input, "not-p-bit")) - flags &= !LISP_GPE_FLAGS_P; - else if (unformat (line_input, "p-bit")) - flags |= LISP_GPE_FLAGS_P; - else if (unformat (line_input, "o-bit")) - flags |= LISP_GPE_FLAGS_O; - else if (unformat (line_input, "iidx %x", &iid)) - iid_set = 1; - else if (unformat (line_input, "iid %d", &iid)) - iid_set = 1; - else { - errmsg ("parse error '%U'\n", format_unformat_error, line_input); - return -99; - } - } - - if (src_set == 0) { - errmsg ("tunnel src address not specified\n"); - return -99; - } - if (dst_set == 0) { - errmsg ("tunnel dst address not specified\n"); - return -99; - } - if (iid_set == 0) { - errmsg ("iid not specified\n"); - return -99; - } - - M(LISP_GPE_ADD_DEL_TUNNEL, lisp_gpe_add_del_tunnel); - - mp->src = src.as_u32; - mp->dst = dst.as_u32; - mp->encap_vrf_id = ntohl(encap_vrf_id); - mp->decap_vrf_id = ntohl(decap_vrf_id); - mp->decap_next_index = ntohl(decap_next_index); - mp->is_add = is_add; - mp->flags = flags; - mp->ver_res = ver_res; - mp->res = res; - mp->next_protocol = next_protocol; - mp->iid = ntohl(iid); - - S; W; - - /* NOTREACHED */ - return 0; -} - - u8 * format_l2_fib_mac_address (u8 * s, va_list * args) { u8 * a = va_arg (*args, u8 *); @@ -9941,6 +9524,18 @@ api_lisp_add_del_local_eid(vat_main_t * vam) return -99; } + if (eidv4_set && eid_lenght > 32) { + errmsg ("eid prefix to big\n"); + vec_free(locator_set_name); + return -99; + } + + if (eidv6_set && eid_lenght > 128) { + errmsg ("eid prefix to big\n"); + vec_free(locator_set_name); + return -99; + } + /* Construct the API message */ M(LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid); @@ -10169,6 +9764,178 @@ api_lisp_gpe_enable_disable (vat_main_t * vam) return 0; } +static int +api_lisp_enable_disable (vat_main_t * vam) +{ + unformat_input_t * input = vam->input; + vl_api_lisp_enable_disable_t *mp; + f64 timeout = ~0; + u8 is_set = 0; + u8 is_en = 0; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "enable")) + { + is_set = 1; + is_en = 1; + } + else if (unformat (input, "disable")) + { + is_set = 1; + } + else + break; + } + + if (!is_set) + { + errmsg ("Value not set\n"); + return -99; + } + + /* Construct the API message */ + M(LISP_ENABLE_DISABLE, lisp_enable_disable); + + mp->is_en = is_en; + + /* send it... */ + S; + + /* Wait for a reply... */ + W; + + /* NOTREACHED */ + return 0; +} + +/** Used for transferring locators via VPP API */ +typedef CLIB_PACKED(struct +{ + u8 is_ip4; /**< is locator an IPv4 address? */ + u8 addr[16]; /**< IPv4/IPv6 address */ +}) rloc_t; + +/** + * Add/del remote mapping from LISP control plane and updates + * forwarding entries in data-plane accordingly. + * + * @param vam vpp API test context + * @return return code + */ +static int +api_lisp_add_del_remote_mapping (vat_main_t * vam) +{ + unformat_input_t * input = vam->input; + vl_api_lisp_add_del_remote_mapping_t *mp; + f64 timeout = ~0; + u32 vni = 0; + u8 seid_set = 0, deid_set = 0; + ip4_address_t seid4, deid4, rloc4; + ip6_address_t seid6, deid6, rloc6; + u32 seid_len = 0, deid_len = 0, len; + u8 deid_is_ip4 = 0, seid_is_ip4 = 0; + u8 is_add = 1; + u32 action = ~0; + rloc_t * rlocs = 0, rloc; + + /* 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, "add")) { + is_add = 1; + } else if (unformat(input, "deid %U/%d", unformat_ip4_address, + &deid4, &len)) { + deid_set = 1; + deid_is_ip4 = 1; + deid_len = len; + } else if (unformat(input, "deid %U/%d", unformat_ip6_address, + &deid6, &len)) { + deid_set = 1; + deid_is_ip4 = 0; + deid_len = len; + } else if (unformat(input, "seid %U/%d", unformat_ip4_address, + &seid4, &len)) { + seid_set = 1; + seid_is_ip4 = 1; + seid_len = len; + } else if (unformat(input, "seid %U/%d", unformat_ip6_address, + &seid6, &len)) { + seid_set = 1; + seid_is_ip4 = 0; + seid_len = len; + } else if (unformat(input, "vni %d", &vni)) { + ; + } 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); + } 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); + } else if (unformat(input, "action %d", &action)) { + ; + } else { + clib_warning ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!seid_set || !deid_set) { + errmsg ("missing params!"); + return -99; + } + + if (seid_is_ip4 != deid_is_ip4) { + errmsg ("source and destination EIDs are not in " "same IP family!"); + return -99; + } + + if (is_add && (~0 == action) + && 0 == vec_len (rlocs)) { + errmsg ("no action set for negative map-reply!"); + return -99; + } + + M(LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping); + mp->is_add = is_add; + mp->vni = htonl (vni); + mp->seid_len = seid_len; + mp->action = (u8) action; + mp->deid_len = deid_len; + if (seid_is_ip4) { + mp->eid_is_ip4 = 1; + clib_memcpy (mp->seid, &seid4, sizeof (seid4)); + } else { + mp->eid_is_ip4 = 0; + clib_memcpy (mp->seid, &seid6, sizeof (seid6)); + } + + if (deid_is_ip4) { + mp->eid_is_ip4 = 1; + clib_memcpy (mp->deid, &deid4, sizeof (deid4)); + } else { + mp->eid_is_ip4 = 0; + clib_memcpy (mp->deid, &deid6, sizeof (deid6)); + } + + mp->rloc_num = vec_len (rlocs); + clib_memcpy (mp->rlocs, rlocs, (sizeof (rloc_t) * vec_len (rlocs))); + vec_free (rlocs); + + /* send it... */ + S; + + /* Wait for a reply... */ + W; + + /* NOTREACHED */ + return 0; +} + static int api_lisp_gpe_add_del_iface(vat_main_t * vam) { @@ -10333,18 +10100,18 @@ api_lisp_map_resolver_dump(vat_main_t *vam) } static int -api_lisp_gpe_enable_disable_status_dump(vat_main_t *vam) +api_lisp_enable_disable_status_dump(vat_main_t *vam) { - vl_api_lisp_gpe_enable_disable_status_dump_t *mp; + vl_api_lisp_enable_disable_status_dump_t *mp; f64 timeout = ~0; if (!vam->json_output) { fformat(vam->ofp, "%=20s\n", - "lisp gpe"); + "lisp status:"); } - M(LISP_GPE_ENABLE_DISABLE_STATUS_DUMP, - lisp_gpe_enable_disable_status_dump); + M(LISP_ENABLE_DISABLE_STATUS_DUMP, + lisp_enable_disable_status_dump); /* send it... */ S; @@ -10361,6 +10128,84 @@ api_lisp_gpe_enable_disable_status_dump(vat_main_t *vam) return 0; } +static int +api_af_packet_create (vat_main_t * vam) +{ + unformat_input_t * i = vam->input; + vl_api_af_packet_create_t * mp; + f64 timeout; + u8 * host_if_name = 0; + u8 hw_addr[6]; + u8 random_hw_addr = 1; + + memset (hw_addr, 0, sizeof (hw_addr)); + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { + if (unformat (i, "name %s", &host_if_name)) + vec_add1 (host_if_name, 0); + else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr)) + random_hw_addr = 0; + else + break; + } + + if (!vec_len (host_if_name)) { + errmsg ("host-interface name must be specified"); + return -99; + } + + if (vec_len (host_if_name) > 64) { + errmsg ("host-interface name too long"); + return -99; + } + + M(AF_PACKET_CREATE, af_packet_create); + + clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name)); + clib_memcpy (mp->hw_addr, hw_addr, 6); + mp->use_random_hw_addr = random_hw_addr; + vec_free (host_if_name); + + S; W; + /* NOTREACHED */ + return 0; +} + +static int +api_af_packet_delete (vat_main_t * vam) +{ + unformat_input_t * i = vam->input; + vl_api_af_packet_delete_t * mp; + f64 timeout; + u8 * host_if_name = 0; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { + if (unformat (i, "name %s", &host_if_name)) + vec_add1 (host_if_name, 0); + else + break; + } + + if (!vec_len (host_if_name)) { + errmsg ("host-interface name must be specified"); + return -99; + } + + if (vec_len (host_if_name) > 64) { + errmsg ("host-interface name too long"); + return -99; + } + + M(AF_PACKET_DELETE, af_packet_delete); + + clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name)); + vec_free (host_if_name); + + S; W; + /* NOTREACHED */ + return 0; +} + static int q_or_quit (vat_main_t * vam) { longjmp (vam->jump_buf, 1); @@ -10767,25 +10612,11 @@ _(modify_vhost_user_if, \ _(delete_vhost_user_if, " | sw_if_index ") \ _(sw_interface_vhost_user_dump, "") \ _(show_version, "") \ -_(nsh_gre_add_del_tunnel, \ - "src dst " \ - "c1 c2 c3 c4 spi si \n" \ - "[encap-fib-id ] [decap-fib-id ] [o-bit <1|0>]\n" \ - "[c-bit <1|0>] [md-type ][next-ip4][next-ip6][next-ethernet]\n" \ - "[tlv ][del]") \ -_(nsh_vxlan_gpe_add_del_tunnel, \ - "src dst vni \n" \ - "c1 c2 c3 c4 spi si \n" \ - "[encap-vrf-id ] [decap-vrf-id ] [o-bit <1|0>]\n" \ - "[c-bit <1|0>] [md-type ][next-ip4][next-ip6][next-ethernet]\n" \ - "[tlv ][del]") \ +_(vxlan_gpe_add_del_tunnel, \ + "local remote vni \n" \ + "[encap-vrf-id ] [decap-vrf-id ] [next-ip4][next-ip6]" \ + "[next-ethernet] [next-nsh]\n") \ _(l2_fib_table_dump, "bd_id ") \ -_(lisp_gpe_add_del_tunnel, \ - "src dst iid |iidx <0xnn>\n" \ - "[encap-vrf-id ] [decap-vrf-id ]\n" \ - "[n-bit][l-bit][e-bit][v-bit][i-bit][p-bit][not-p-bit][o-bit]\n" \ - "[next-ip4][next-ip6][next-ethernet][next-nsh]\n" \ - "[decap-next [ip4|ip6|ethernet|nsh-encap|]][del]") \ _(interface_name_renumber, \ " | sw_if_index new_show_dev_instance ") \ _(input_acl_set_interface, \ @@ -10849,12 +10680,18 @@ _(lisp_gpe_add_del_fwd_entry, "eid / " \ "sloc dloc [del]") \ _(lisp_add_del_map_resolver, " [del]") \ _(lisp_gpe_enable_disable, "enable|disable") \ +_(lisp_enable_disable, "enable|disable") \ _(lisp_gpe_add_del_iface, "up|down") \ +_(lisp_add_del_remote_mapping, "add|del vni deid seid" \ + " rloc " \ + "[rloc ... ]") \ _(lisp_locator_set_dump, "") \ _(lisp_local_eid_table_dump, "") \ _(lisp_gpe_tunnel_dump, "") \ _(lisp_map_resolver_dump, "") \ -_(lisp_gpe_enable_disable_status_dump, "") +_(lisp_enable_disable_status_dump, "") \ +_(af_packet_create, "name [hw_addr ]") \ +_(af_packet_delete, "name ") /* List of command functions, CLI names map directly to functions */ #define foreach_cli_function \