vec_free (s);
}
+static void
+api_lisp_gpe_fwd_entry_net_to_host (vl_api_lisp_gpe_fwd_entry_t * e)
+{
+ e->dp_table = clib_net_to_host_u32 (e->dp_table);
+ e->fwd_entry_index = clib_net_to_host_u32 (e->fwd_entry_index);
+}
+
+static void
+ lisp_gpe_fwd_entries_get_reply_t_net_to_host
+ (vl_api_lisp_gpe_fwd_entries_get_reply_t * mp)
+{
+ u32 i;
+
+ mp->count = clib_net_to_host_u32 (mp->count);
+ for (i = 0; i < mp->count; i++)
+ {
+ api_lisp_gpe_fwd_entry_net_to_host (&mp->entries[i]);
+ }
+}
+
+static void
+ vl_api_lisp_gpe_fwd_entry_path_details_t_handler
+ (vl_api_lisp_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_lisp_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_lisp_gpe_fwd_entry_path_details_t_handler_json
+ (vl_api_lisp_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;
+
+ 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);
+
+ 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_lisp_gpe_fwd_entries_get_reply_t_handler
+ (vl_api_lisp_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_lisp_gpe_fwd_entry_t *e;
+
+ if (retval)
+ goto end;
+
+ lisp_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_lisp_gpe_fwd_entries_get_reply_t_handler_json
+ (vl_api_lisp_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_lisp_gpe_fwd_entry_t *fwd;
+
+ if (retval)
+ goto end;
+
+ lisp_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);
+
+ 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;
+}
+
static void
vl_api_lisp_adjacencies_get_reply_t_handler
(vl_api_lisp_adjacencies_get_reply_t * mp)
_(LISP_MAP_RESOLVER_DETAILS, lisp_map_resolver_details) \
_(LISP_MAP_SERVER_DETAILS, lisp_map_server_details) \
_(LISP_ADJACENCIES_GET_REPLY, lisp_adjacencies_get_reply) \
+_(LISP_GPE_FWD_ENTRIES_GET_REPLY, lisp_gpe_fwd_entries_get_reply) \
+_(LISP_GPE_FWD_ENTRY_PATH_DETAILS, \
+ lisp_gpe_fwd_entry_path_details) \
_(SHOW_LISP_STATUS_REPLY, show_lisp_status_reply) \
_(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS_REPLY, \
lisp_add_del_map_request_itr_rlocs_reply) \
}
- M (CLI_REQUEST, cli_request);
+ M (CLI_REQUEST, mp);
/*
* Copy cmd into shared memory.
* in \n\0.
*/
u32 len = vec_len (vam->input->buffer);
- M2 (CLI_INBAND, cli_inband, len);
+ M2 (CLI_INBAND, mp, len);
clib_memcpy (mp->cmd, vam->input->buffer, len);
mp->length = htonl (len);
}
/* Construct the API message */
- M (CREATE_LOOPBACK, create_loopback);
+ M (CREATE_LOOPBACK, mp);
if (mac_set)
clib_memcpy (mp->mac_address, mac_address, sizeof (mac_address));
}
/* Construct the API message */
- M (DELETE_LOOPBACK, delete_loopback);
+ M (DELETE_LOOPBACK, mp);
mp->sw_if_index = ntohl (sw_if_index);
S;
return -99;
}
- M (WANT_STATS, want_stats);
+ M (WANT_STATS, mp);
mp->enable_disable = enable;
S;
return -99;
}
- M (WANT_INTERFACE_EVENTS, want_interface_events);
+ M (WANT_INTERFACE_EVENTS, mp);
mp->enable_disable = enable;
vam->interface_event_display = enable;
vam->sw_if_index_by_interface_name = hash_create_string (0, sizeof (uword));
/* Get list of ethernets */
- M (SW_INTERFACE_DUMP, sw_interface_dump);
+ M (SW_INTERFACE_DUMP, mp);
mp->name_filter_valid = 1;
strncpy ((char *) mp->name_filter, "Ether", sizeof (mp->name_filter) - 1);
S;
/* and local / loopback interfaces */
- M (SW_INTERFACE_DUMP, sw_interface_dump);
+ M (SW_INTERFACE_DUMP, mp);
mp->name_filter_valid = 1;
strncpy ((char *) mp->name_filter, "lo", sizeof (mp->name_filter) - 1);
S;
/* and packet-generator interfaces */
- M (SW_INTERFACE_DUMP, sw_interface_dump);
+ M (SW_INTERFACE_DUMP, mp);
mp->name_filter_valid = 1;
strncpy ((char *) mp->name_filter, "pg", sizeof (mp->name_filter) - 1);
S;
/* and vxlan-gpe tunnel interfaces */
- M (SW_INTERFACE_DUMP, sw_interface_dump);
+ M (SW_INTERFACE_DUMP, mp);
mp->name_filter_valid = 1;
strncpy ((char *) mp->name_filter, "vxlan_gpe",
sizeof (mp->name_filter) - 1);
S;
/* and vxlan tunnel interfaces */
- M (SW_INTERFACE_DUMP, sw_interface_dump);
+ M (SW_INTERFACE_DUMP, mp);
mp->name_filter_valid = 1;
strncpy ((char *) mp->name_filter, "vxlan", sizeof (mp->name_filter) - 1);
S;
/* and host (af_packet) interfaces */
- M (SW_INTERFACE_DUMP, sw_interface_dump);
+ M (SW_INTERFACE_DUMP, mp);
mp->name_filter_valid = 1;
strncpy ((char *) mp->name_filter, "host", sizeof (mp->name_filter) - 1);
S;
/* and l2tpv3 tunnel interfaces */
- M (SW_INTERFACE_DUMP, sw_interface_dump);
+ M (SW_INTERFACE_DUMP, mp);
mp->name_filter_valid = 1;
strncpy ((char *) mp->name_filter, "l2tpv3_tunnel",
sizeof (mp->name_filter) - 1);
S;
/* and GRE tunnel interfaces */
- M (SW_INTERFACE_DUMP, sw_interface_dump);
+ M (SW_INTERFACE_DUMP, mp);
mp->name_filter_valid = 1;
strncpy ((char *) mp->name_filter, "gre", sizeof (mp->name_filter) - 1);
S;
/* and LISP-GPE interfaces */
- M (SW_INTERFACE_DUMP, sw_interface_dump);
+ M (SW_INTERFACE_DUMP, mp);
mp->name_filter_valid = 1;
strncpy ((char *) mp->name_filter, "lisp_gpe",
sizeof (mp->name_filter) - 1);
S;
/* and IPSEC tunnel interfaces */
- M (SW_INTERFACE_DUMP, sw_interface_dump);
+ M (SW_INTERFACE_DUMP, mp);
mp->name_filter_valid = 1;
strncpy ((char *) mp->name_filter, "ipsec", sizeof (mp->name_filter) - 1);
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
}
/* Construct the API message */
- M (SW_INTERFACE_SET_FLAGS, sw_interface_set_flags);
+ M (SW_INTERFACE_SET_FLAGS, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->admin_up_down = admin_up;
mp->link_up_down = link_up;
}
/* Construct the API message */
- M (SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats);
+ M (SW_INTERFACE_CLEAR_STATS, mp);
if (sw_if_index_set == 1)
mp->sw_if_index = ntohl (sw_if_index);
return -99;
}
- M (SW_INTERFACE_SET_DPDK_HQOS_PIPE, sw_interface_set_dpdk_hqos_pipe);
+ M (SW_INTERFACE_SET_DPDK_HQOS_PIPE, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->subport = ntohl (subport);
return -99;
}
- M (SW_INTERFACE_SET_DPDK_HQOS_SUBPORT, sw_interface_set_dpdk_hqos_subport);
+ M (SW_INTERFACE_SET_DPDK_HQOS_SUBPORT, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->subport = ntohl (subport);
return -99;
}
- M (SW_INTERFACE_SET_DPDK_HQOS_TCTBL, sw_interface_set_dpdk_hqos_tctbl);
+ M (SW_INTERFACE_SET_DPDK_HQOS_TCTBL, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->entry = ntohl (entry);
}
/* Construct the API message */
- M (SW_INTERFACE_ADD_DEL_ADDRESS, sw_interface_add_del_address);
+ M (SW_INTERFACE_ADD_DEL_ADDRESS, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->is_add = is_add;
}
/* Construct the API message */
- M (SW_INTERFACE_SET_MPLS_ENABLE, sw_interface_set_mpls_enable);
+ M (SW_INTERFACE_SET_MPLS_ENABLE, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->enable = enable;
}
/* Construct the API message */
- M (SW_INTERFACE_SET_TABLE, sw_interface_set_table);
+ M (SW_INTERFACE_SET_TABLE, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->is_ipv6 = is_ipv6;
return -99;
}
- M (SW_INTERFACE_GET_TABLE, sw_interface_get_table);
+ M (SW_INTERFACE_GET_TABLE, mp);
mp->sw_if_index = htonl (sw_if_index);
mp->is_ipv6 = is_ipv6;
}
/* Construct the API message */
- M (SW_INTERFACE_SET_VPATH, sw_interface_set_vpath);
+ M (SW_INTERFACE_SET_VPATH, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->enable = is_enable;
f64 timeout;
u32 sw_if_index = 0;
u8 sw_if_index_set = 0;
- u8 is_enable = 0;
+ u8 is_enable = 1;
u8 is_ipv6 = 0;
/* Parse args required to build the message */
}
/* Construct the API message */
- M (SW_INTERFACE_SET_VXLAN_BYPASS, sw_interface_set_vxlan_bypass);
+ M (SW_INTERFACE_SET_VXLAN_BYPASS, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->enable = is_enable;
return -99;
}
- M (SW_INTERFACE_SET_L2_XCONNECT, sw_interface_set_l2_xconnect);
+ 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);
return -99;
}
- M (SW_INTERFACE_SET_L2_BRIDGE, sw_interface_set_l2_bridge);
+ M (SW_INTERFACE_SET_L2_BRIDGE, mp);
mp->rx_sw_if_index = ntohl (rx_sw_if_index);
mp->bd_id = ntohl (bd_id);
break;
}
- M (BRIDGE_DOMAIN_DUMP, bridge_domain_dump);
+ M (BRIDGE_DOMAIN_DUMP, mp);
mp->bd_id = ntohl (bd_id);
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
return -99;
}
- M (BRIDGE_DOMAIN_ADD_DEL, bridge_domain_add_del);
+ M (BRIDGE_DOMAIN_ADD_DEL, mp);
mp->bd_id = ntohl (bd_id);
mp->flood = flood;
for (j = 0; j < count; j++)
{
- M (L2FIB_ADD_DEL, l2fib_add_del);
+ M (L2FIB_ADD_DEL, mp);
mp->mac = mac;
mp->bd_id = ntohl (bd_id);
/* Shut off async mode */
vam->async_mode = 0;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
timeout = vat_time_now (vam) + 1.0;
return -99;
}
- M (L2_FLAGS, l2_flags);
+ M (L2_FLAGS, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->feature_bitmap = ntohl (feature_bitmap);
return -99;
}
- M (BRIDGE_FLAGS, bridge_flags);
+ M (BRIDGE_FLAGS, mp);
mp->bd_id = ntohl (bd_id);
mp->feature_bitmap = ntohl (flags);
return -99;
}
- M (BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del);
+ M (BD_IP_MAC_ADD_DEL, mp);
mp->bd_id = ntohl (bd_id);
mp->is_ipv6 = is_ipv6;
}
/* Construct the API message */
- M (TAP_CONNECT, tap_connect);
+ M (TAP_CONNECT, mp);
mp->use_random_mac = random_mac;
clib_memcpy (mp->mac_address, mac_address, 6);
vec_add1 (tap_name, 0);
/* Construct the API message */
- M (TAP_MODIFY, tap_modify);
+ M (TAP_MODIFY, mp);
mp->use_random_mac = random_mac;
mp->sw_if_index = ntohl (sw_if_index);
}
/* Construct the API message */
- M (TAP_DELETE, tap_delete);
+ M (TAP_DELETE, mp);
mp->sw_if_index = ntohl (sw_if_index);
for (j = 0; j < count; j++)
{
/* Construct the API message */
- M2 (IP_ADD_DEL_ROUTE, ip_add_del_route,
+ M2 (IP_ADD_DEL_ROUTE, mp,
sizeof (mpls_label_t) * vec_len (next_hop_out_label_stack));
mp->next_hop_sw_if_index = ntohl (sw_if_index);
/* Shut off async mode */
vam->async_mode = 0;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
timeout = vat_time_now (vam) + 1.0;
}
/* Construct the API message */
- M (IP_MROUTE_ADD_DEL, ip_mroute_add_del);
+ M (IP_MROUTE_ADD_DEL, mp);
mp->next_hop_sw_if_index = ntohl (sw_if_index);
mp->table_id = ntohl (vrf_id);
S;
/* Wait for a reply... */
W;
-
- /* Return the good/bad news */
- return (vam->retval);
}
static int
for (j = 0; j < count; j++)
{
/* Construct the API message */
- M2 (MPLS_ROUTE_ADD_DEL, mpls_route_add_del,
+ M2 (MPLS_ROUTE_ADD_DEL, mp,
sizeof (mpls_label_t) * vec_len (next_hop_out_label_stack));
mp->mr_next_hop_sw_if_index = ntohl (sw_if_index);
/* Shut off async mode */
vam->async_mode = 0;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
timeout = vat_time_now (vam) + 1.0;
}
/* Construct the API message */
- M (MPLS_IP_BIND_UNBIND, mpls_ip_bind_unbind);
+ M (MPLS_IP_BIND_UNBIND, mp);
mp->mb_create_table_if_needed = create_table_if_needed;
mp->mb_is_bind = is_bind;
return -99;
}
- M (PROXY_ARP_ADD_DEL, proxy_arp_add_del);
+ M (PROXY_ARP_ADD_DEL, mp);
mp->vrf_id = ntohl (vrf_id);
mp->is_add = is_add;
return -99;
}
- M (PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable);
+ M (PROXY_ARP_INTFC_ENABLE_DISABLE, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->enable_disable = enable;
}
}
- M2 (MPLS_TUNNEL_ADD_DEL, mpls_tunnel_add_del,
- sizeof (mpls_label_t) * vec_len (labels));
+ M2 (MPLS_TUNNEL_ADD_DEL, mp, sizeof (mpls_label_t) * vec_len (labels));
mp->mt_next_hop_sw_if_index = ntohl (next_hop_sw_if_index);
mp->mt_sw_if_index = ntohl (sw_if_index);
return -99;
}
- M (SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered);
+ M (SW_INTERFACE_SET_UNNUMBERED, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->unnumbered_sw_if_index = ntohl (unnum_sw_index);
}
/* Construct the API message */
- M (IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del);
+ M (IP_NEIGHBOR_ADD_DEL, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->is_add = is_add;
return -99;
}
- M (RESET_VRF, reset_vrf);
+ M (RESET_VRF, mp);
mp->vrf_id = ntohl (vrf_id);
mp->is_ipv6 = is_ipv6;
errmsg ("missing vlan_id");
return -99;
}
- M (CREATE_VLAN_SUBIF, create_vlan_subif);
+ M (CREATE_VLAN_SUBIF, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->vlan_id = ntohl (vlan_id);
errmsg ("missing sub_id");
return -99;
}
- M (CREATE_SUBIF, create_subif);
+ M (CREATE_SUBIF, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->sub_id = ntohl (sub_id);
return -99;
}
- M (OAM_ADD_DEL, oam_add_del);
+ M (OAM_ADD_DEL, mp);
mp->vrf_id = ntohl (vrf_id);
mp->is_add = is_add;
return -99;
}
- M (RESET_FIB, reset_fib);
+ M (RESET_FIB, mp);
mp->vrf_id = ntohl (vrf_id);
mp->is_ipv6 = is_ipv6;
}
/* Construct the API message */
- M (DHCP_PROXY_CONFIG, dhcp_proxy_config);
+ M (DHCP_PROXY_CONFIG, mp);
mp->insert_circuit_id = insert_cid;
mp->is_add = is_add;
}
/* Construct the API message */
- M (DHCP_PROXY_CONFIG_2, dhcp_proxy_config_2);
+ M (DHCP_PROXY_CONFIG_2, mp);
mp->insert_circuit_id = insert_cid;
mp->is_add = is_add;
return -99;
}
- M (DHCP_PROXY_SET_VSS, dhcp_proxy_set_vss);
+ M (DHCP_PROXY_SET_VSS, mp);
mp->tbl_id = ntohl (tbl_id);
mp->fib_id = ntohl (fib_id);
mp->oui = ntohl (oui);
vec_add1 (hostname, 0);
/* Construct the API message */
- M (DHCP_CLIENT_CONFIG, dhcp_client_config);
+ M (DHCP_CLIENT_CONFIG, mp);
mp->sw_if_index = ntohl (sw_if_index);
clib_memcpy (mp->hostname, hostname, vec_len (hostname));
return -99;
}
- M (SET_IP_FLOW_HASH, set_ip_flow_hash);
+ M (SET_IP_FLOW_HASH, mp);
mp->src = src;
mp->dst = dst;
mp->sport = sport;
return -99;
}
- M (SW_INTERFACE_IP6_ENABLE_DISABLE, sw_interface_ip6_enable_disable);
+ M (SW_INTERFACE_IP6_ENABLE_DISABLE, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->enable = enable;
}
/* Construct the API message */
- M (SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS,
- sw_interface_ip6_set_link_local_address);
+ M (SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS, mp);
mp->sw_if_index = ntohl (sw_if_index);
clib_memcpy (mp->address, &v6address, sizeof (v6address));
}
/* Construct the API message */
- M (SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix);
+ M (SW_INTERFACE_IP6ND_RA_PREFIX, mp);
mp->sw_if_index = ntohl (sw_if_index);
clib_memcpy (mp->address, &v6address, sizeof (v6address));
}
/* Construct the API message */
- M (SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config);
+ M (SW_INTERFACE_IP6ND_RA_CONFIG, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->max_interval = ntohl (max_interval);
return -99;
}
- M (SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit);
+ M (SET_ARP_NEIGHBOR_LIMIT, mp);
mp->arp_neighbor_limit = ntohl (arp_nbr_limit);
mp->is_ipv6 = is_ipv6;
return -99;
}
- M (L2_PATCH_ADD_DEL, l2_patch_add_del);
+ 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);
else
break;
}
- M (IOAM_ENABLE, ioam_enable);
+ M (IOAM_ENABLE, mp);
mp->id = htons (id);
mp->seqno = has_seqno_option;
mp->analyse = has_analyse_option;
vl_api_ioam_disable_t *mp;
f64 timeout;
- M (IOAM_DISABLE, ioam_disable);
+ M (IOAM_DISABLE, mp);
S;
W;
return 0;
return -99;
}
- M2 (SR_TUNNEL_ADD_DEL, sr_tunnel_add_del,
+ M2 (SR_TUNNEL_ADD_DEL, mp,
vec_len (segments) * sizeof (ip6_address_t)
+ vec_len (tags) * sizeof (ip6_address_t));
return -99;
}
- M2 (SR_POLICY_ADD_DEL, sr_policy_add_del, tunnel_names_length);
+ M2 (SR_POLICY_ADD_DEL, mp, tunnel_names_length);
return -99;
}
- M (SR_MULTICAST_MAP_ADD_DEL, sr_multicast_map_add_del);
+ M (SR_MULTICAST_MAP_ADD_DEL, mp);
mp->is_add = !is_del;
memcpy (mp->policy_name, policy_name, vec_len (policy_name));
return -99;
}
- M2 (CLASSIFY_ADD_DEL_TABLE, classify_add_del_table, vec_len (mask));
+ M2 (CLASSIFY_ADD_DEL_TABLE, mp, vec_len (mask));
mp->is_add = is_add;
mp->del_chain = del_chain;
return -99;
}
- M2 (CLASSIFY_ADD_DEL_SESSION, classify_add_del_session, vec_len (match));
+ M2 (CLASSIFY_ADD_DEL_SESSION, mp, vec_len (match));
mp->is_add = is_add;
mp->table_index = ntohl (table_index);
}
- M (CLASSIFY_SET_INTERFACE_IP_TABLE, classify_set_interface_ip_table);
+ M (CLASSIFY_SET_INTERFACE_IP_TABLE, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->table_index = ntohl (table_index);
}
- M (CLASSIFY_SET_INTERFACE_L2_TABLES, classify_set_interface_l2_tables);
+ M (CLASSIFY_SET_INTERFACE_L2_TABLES, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->ip4_table_index = ntohl (ip4_table_index);
return -99;
}
- M (SET_IPFIX_EXPORTER, set_ipfix_exporter);
+ M (SET_IPFIX_EXPORTER, mp);
memcpy (mp->collector_address, collector_address.data,
sizeof (collector_address.data));
}
}
- M (SET_IPFIX_CLASSIFY_STREAM, set_ipfix_classify_stream);
+ M (SET_IPFIX_CLASSIFY_STREAM, mp);
mp->domain_id = htonl (domain_id);
mp->src_port = htons ((u16) src_port);
return -99;
}
- M (IPFIX_CLASSIFY_TABLE_ADD_DEL, ipfix_classify_table_add_del);
+ M (IPFIX_CLASSIFY_TABLE_ADD_DEL, mp);
mp->is_add = is_add;
mp->table_id = htonl (classify_table_index);
return -99;
}
- M (GET_NODE_INDEX, get_node_index);
+ M (GET_NODE_INDEX, mp);
clib_memcpy (mp->node_name, name, vec_len (name));
vec_free (name);
return -99;
}
- M (GET_NEXT_INDEX, get_next_index);
+ 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);
return -99;
}
- M (ADD_NODE_NEXT, add_node_next);
+ 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);
return -99;
}
- M (L2TPV3_CREATE_TUNNEL, l2tpv3_create_tunnel);
+ M (L2TPV3_CREATE_TUNNEL, mp);
clib_memcpy (mp->client_address, client_address.as_u8,
sizeof (mp->client_address));
return -99;
}
- M (L2TPV3_SET_TUNNEL_COOKIES, l2tpv3_set_tunnel_cookies);
+ M (L2TPV3_SET_TUNNEL_COOKIES, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->new_local_cookie = clib_host_to_net_u64 (new_local_cookie);
return -99;
}
- M (L2TPV3_INTERFACE_ENABLE_DISABLE, l2tpv3_interface_enable_disable);
+ M (L2TPV3_INTERFACE_ENABLE_DISABLE, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->enable_disable = enable_disable;
return -99;
}
- M (L2TPV3_SET_LOOKUP_KEY, l2tpv3_set_lookup_key);
+ M (L2TPV3_SET_LOOKUP_KEY, mp);
mp->key = key;
f64 timeout;
/* Get list of l2tpv3-tunnel interfaces */
- M (SW_IF_L2TPV3_TUNNEL_DUMP, sw_if_l2tpv3_tunnel_dump);
+ M (SW_IF_L2TPV3_TUNNEL_DUMP, mp);
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
print (vam->ofp, "\n%-16s %s", "dev_name", "sw_if_index");
/* Get list of tap interfaces */
- M (SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump);
+ M (SW_INTERFACE_TAP_DUMP, mp);
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
return -99;
}
- M (VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel);
+ M (VXLAN_ADD_DEL_TUNNEL, mp);
if (ipv6_set)
{
}
/* Get list of vxlan-tunnel interfaces */
- M (VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump);
+ M (VXLAN_TUNNEL_DUMP, mp);
mp->sw_if_index = htonl (sw_if_index);
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
}
- M (GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel);
+ M (GRE_ADD_DEL_TUNNEL, mp);
clib_memcpy (&mp->src_address, &src4, sizeof (src4));
clib_memcpy (&mp->dst_address, &dst4, sizeof (dst4));
}
/* Get list of gre-tunnel interfaces */
- M (GRE_TUNNEL_DUMP, gre_tunnel_dump);
+ M (GRE_TUNNEL_DUMP, mp);
mp->sw_if_index = htonl (sw_if_index);
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
vl_api_l2_fib_clear_table_t *mp;
f64 timeout;
- M (L2_FIB_CLEAR_TABLE, l2_fib_clear_table);
+ M (L2_FIB_CLEAR_TABLE, mp);
S;
W;
return -99;
}
- M (L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter);
+ M (L2_INTERFACE_EFP_FILTER, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->enable_disable = enable;
return -99;
}
- M (L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite)
- mp->sw_if_index = ntohl (sw_if_index);
+ 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);
}
vec_add1 (file_name, 0);
- M (CREATE_VHOST_USER_IF, create_vhost_user_if);
+ M (CREATE_VHOST_USER_IF, mp);
mp->is_server = is_server;
clib_memcpy (mp->sock_filename, file_name, vec_len (file_name));
}
vec_add1 (file_name, 0);
- M (MODIFY_VHOST_USER_IF, modify_vhost_user_if);
+ M (MODIFY_VHOST_USER_IF, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->is_server = is_server;
}
- M (DELETE_VHOST_USER_IF, delete_vhost_user_if);
+ M (DELETE_VHOST_USER_IF, mp);
mp->sw_if_index = ntohl (sw_if_index);
"Interface name idx hdr_sz features server regions filename");
/* Get list of vhost-user interfaces */
- M (SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump);
+ M (SW_INTERFACE_VHOST_USER_DUMP, mp);
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
vl_api_show_version_t *mp;
f64 timeout;
- M (SHOW_VERSION, show_version);
+ M (SHOW_VERSION, mp);
S;
W;
return -99;
}
- M (VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel);
+ M (VXLAN_GPE_ADD_DEL_TUNNEL, mp);
if (ipv6_set)
}
/* Get list of vxlan-tunnel interfaces */
- M (VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump);
+ M (VXLAN_GPE_TUNNEL_DUMP, mp);
mp->sw_if_index = htonl (sw_if_index);
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
print (vam->ofp, "BD-ID Mac Address sw-ndx Static Filter BVI");
/* Get list of l2 fib entries */
- M (L2_FIB_TABLE_DUMP, l2_fib_table_dump);
+ M (L2_FIB_TABLE_DUMP, mp);
mp->bd_id = ntohl (bd_id);
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
return -99;
}
- M (INTERFACE_NAME_RENUMBER, interface_name_renumber);
+ M (INTERFACE_NAME_RENUMBER, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->new_show_dev_instance = ntohl (new_show_dev_instance);
return -99;
}
- M (WANT_IP4_ARP_EVENTS, want_ip4_arp_events);
+ M (WANT_IP4_ARP_EVENTS, mp);
mp->enable_disable = enable_disable;
mp->pid = getpid ();
mp->address = address.as_u32;
return -99;
}
- M (WANT_IP6_ND_EVENTS, want_ip6_nd_events);
+ M (WANT_IP6_ND_EVENTS, mp);
mp->enable_disable = enable_disable;
mp->pid = getpid ();
clib_memcpy (mp->address, &address, sizeof (ip6_address_t));
return -99;
}
- M (INPUT_ACL_SET_INTERFACE, input_acl_set_interface);
+ M (INPUT_ACL_SET_INTERFACE, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->ip4_table_index = ntohl (ip4_table_index);
vam->current_sw_if_index = sw_if_index;
vam->is_ipv6 = ipv6_set;
- M (IP_ADDRESS_DUMP, ip_address_dump);
+ M (IP_ADDRESS_DUMP, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->is_ipv6 = ipv6_set;
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
}
vec_free (vam->ip_details_by_sw_if_index[is_ipv6]);
- M (IP_DUMP, ip_dump);
+ M (IP_DUMP, mp);
mp->is_ipv6 = ipv6_set;
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
return -99;
}
- M (IPSEC_SPD_ADD_DEL, ipsec_spd_add_del);
+ M (IPSEC_SPD_ADD_DEL, mp);
mp->spd_id = ntohl (spd_id);
mp->is_add = is_add;
return -99;
}
- M (IPSEC_INTERFACE_ADD_DEL_SPD, ipsec_interface_add_del_spd);
+ M (IPSEC_INTERFACE_ADD_DEL_SPD, mp);
mp->spd_id = ntohl (spd_id);
mp->sw_if_index = ntohl (sw_if_index);
}
- M (IPSEC_SPD_ADD_DEL_ENTRY, ipsec_spd_add_del_entry);
+ M (IPSEC_SPD_ADD_DEL_ENTRY, mp);
mp->spd_id = ntohl (spd_id);
mp->priority = ntohl (priority);
if (unformat
(i, "integ_alg %U", unformat_ipsec_integ_alg, &integ_alg))
{
-#if DPDK_CRYPTO==1
- if (integ_alg < IPSEC_INTEG_ALG_NONE ||
-#else
if (integ_alg < IPSEC_INTEG_ALG_SHA1_96 ||
-#endif
integ_alg >= IPSEC_INTEG_N_ALG)
{
clib_warning ("unsupported integ-alg: '%U'",
}
-#if DPDK_CRYPTO==1
- /*Special cases, aes-gcm-128 encryption */
- if (crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
- {
- if (integ_alg != IPSEC_INTEG_ALG_NONE
- && integ_alg != IPSEC_INTEG_ALG_AES_GCM_128)
- {
- clib_warning
- ("unsupported: aes-gcm-128 crypto-alg needs none as integ-alg");
- return -99;
- }
- else /*set integ-alg internally to aes-gcm-128 */
- integ_alg = IPSEC_INTEG_ALG_AES_GCM_128;
- }
- else if (integ_alg == IPSEC_INTEG_ALG_AES_GCM_128)
- {
- clib_warning ("unsupported integ-alg: aes-gcm-128");
- return -99;
- }
- else if (integ_alg == IPSEC_INTEG_ALG_NONE)
- {
- clib_warning ("unsupported integ-alg: none");
- return -99;
- }
-#endif
-
-
- M (IPSEC_SAD_ADD_DEL_ENTRY, ipsec_sad_add_del_entry);
+ M (IPSEC_SAD_ADD_DEL_ENTRY, mp);
mp->sad_id = ntohl (sad_id);
mp->is_add = is_add;
}
}
- M (IPSEC_SA_SET_KEY, ipsec_set_sa_key);
+ M (IPSEC_SA_SET_KEY, mp);
mp->sa_id = ntohl (sa_id);
mp->crypto_key_length = vec_len (ck);
return -99;
}
- M (IKEV2_PROFILE_ADD_DEL, ikev2_profile_add_del);
+ M (IKEV2_PROFILE_ADD_DEL, mp);
clib_memcpy (mp->name, name, vec_len (name));
mp->is_add = is_add;
return -99;
}
- M (IKEV2_PROFILE_SET_AUTH, ikev2_profile_set_auth);
+ M (IKEV2_PROFILE_SET_AUTH, mp);
mp->is_hex = is_hex;
mp->auth_method = (u8) auth_method;
return -99;
}
- M (IKEV2_PROFILE_SET_ID, ikev2_profile_set_id);
+ M (IKEV2_PROFILE_SET_ID, mp);
mp->is_local = is_local;
mp->id_type = (u8) id_type;
return -99;
}
- M (IKEV2_PROFILE_SET_TS, ikev2_profile_set_ts);
+ M (IKEV2_PROFILE_SET_TS, mp);
mp->is_local = is_local;
mp->proto = (u8) proto;
return -99;
}
- M (IKEV2_SET_LOCAL_KEY, ikev2_set_local_key);
+ M (IKEV2_SET_LOCAL_KEY, mp);
clib_memcpy (mp->key_file, file, vec_len (file));
vec_free (file);
}
/* Construct the API message */
- M (MAP_ADD_DOMAIN, map_add_domain);
+ M (MAP_ADD_DOMAIN, mp);
clib_memcpy (mp->ip4_prefix, &ip4_prefix, sizeof (ip4_prefix));
mp->ip4_prefix_len = ip4_prefix_len;
}
/* Construct the API message */
- M (MAP_DEL_DOMAIN, map_del_domain);
+ M (MAP_DEL_DOMAIN, mp);
mp->index = ntohl (index);
}
/* Construct the API message */
- M (MAP_ADD_DEL_RULE, map_add_del_rule);
+ M (MAP_ADD_DEL_RULE, mp);
mp->index = ntohl (index);
mp->is_add = is_add;
f64 timeout;
/* Construct the API message */
- M (MAP_DOMAIN_DUMP, map_domain_dump);
+ M (MAP_DOMAIN_DUMP, mp);
/* send it... */
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
}
/* Construct the API message */
- M (MAP_RULE_DUMP, map_rule_dump);
+ M (MAP_RULE_DUMP, mp);
mp->domain_index = htonl (domain_index);
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
return -99;
}
- M (GET_FIRST_MSG_ID, get_first_msg_id);
+ M (GET_FIRST_MSG_ID, mp);
clib_memcpy (mp->name, name, vec_len (name));
S;
W;
}
/* Construct the API message */
- M (COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable);
+ M (COP_INTERFACE_ENABLE_DISABLE, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->enable_disable = enable_disable;
}
/* Construct the API message */
- M (COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable);
+ M (COP_WHITELIST_ENABLE_DISABLE, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->fib_id = ntohl (fib_id);
mp->ip4 = ip4;
vl_api_get_node_graph_t *mp;
f64 timeout;
- M (GET_NODE_GRAPH, get_node_graph);
+ M (GET_NODE_GRAPH, mp);
/* send it... */
S;
clib_memcpy (dst, eid, lisp_eid_size_vat (type));
}
-/* *INDENT-OFF* */
-/** Used for transferring locators via VPP API */
-typedef CLIB_PACKED(struct
-{
- u32 sw_if_index; /**< locator sw_if_index */
- u8 priority; /**< locator priority */
- u8 weight; /**< locator weight */
-}) ls_locator_t;
-/* *INDENT-ON* */
-
static int
api_lisp_add_del_locator_set (vat_main_t * vam)
{
u8 is_add = 1;
u8 *locator_set_name = NULL;
u8 locator_set_name_set = 0;
- ls_locator_t locator, *locators = 0;
+ vl_api_local_locator_t locator, *locators = 0;
u32 sw_if_index, priority, weight;
u32 data_len = 0;
}
vec_add1 (locator_set_name, 0);
- data_len = sizeof (ls_locator_t) * vec_len (locators);
+ data_len = sizeof (vl_api_local_locator_t) * vec_len (locators);
/* Construct the API message */
- M2 (LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set, data_len);
+ M2 (LISP_ADD_DEL_LOCATOR_SET, mp, data_len);
mp->is_add = is_add;
clib_memcpy (mp->locator_set_name, locator_set_name,
vec_add1 (locator_set_name, 0);
/* Construct the API message */
- M (LISP_ADD_DEL_LOCATOR, lisp_add_del_locator);
+ M (LISP_ADD_DEL_LOCATOR, mp);
mp->is_add = is_add;
mp->sw_if_index = ntohl (sw_if_index);
vec_add1 (locator_set_name, 0);
/* Construct the API message */
- M (LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid);
+ M (LISP_ADD_DEL_LOCAL_EID, mp);
mp->is_add = is_add;
lisp_eid_put_vat (mp->eid, eid->addr, eid->type);
}
/* Construct the API message */
- M2 (LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry,
+ M2 (LISP_GPE_ADD_DEL_FWD_ENTRY, mp,
sizeof (vl_api_lisp_gpe_locator_t) * vec_len (rmt_locs) * 2);
mp->is_add = is_add;
}
/* Construct the API message */
- M (LISP_ADD_DEL_MAP_SERVER, lisp_add_del_map_server);
+ M (LISP_ADD_DEL_MAP_SERVER, mp);
mp->is_add = is_add;
if (ipv6_set)
}
/* Construct the API message */
- M (LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver);
+ M (LISP_ADD_DEL_MAP_RESOLVER, mp);
mp->is_add = is_add;
if (ipv6_set)
}
/* Construct the API message */
- M (LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable);
+ M (LISP_GPE_ENABLE_DISABLE, mp);
mp->is_en = is_en;
}
/* Construct the API message */
- M (LISP_RLOC_PROBE_ENABLE_DISABLE, lisp_rloc_probe_enable_disable);
+ M (LISP_RLOC_PROBE_ENABLE_DISABLE, mp);
mp->is_enabled = is_en;
}
/* Construct the API message */
- M (LISP_MAP_REGISTER_ENABLE_DISABLE, lisp_map_register_enable_disable);
+ M (LISP_MAP_REGISTER_ENABLE_DISABLE, mp);
mp->is_enabled = is_en;
}
/* Construct the API message */
- M (LISP_ENABLE_DISABLE, lisp_enable_disable);
+ M (LISP_ENABLE_DISABLE, mp);
mp->is_en = is_en;
f64 timeout = ~0;
vl_api_show_lisp_map_register_state_t *mp;
- M (SHOW_LISP_MAP_REGISTER_STATE, show_lisp_map_register_state);
+ M (SHOW_LISP_MAP_REGISTER_STATE, mp);
/* send */
S;
f64 timeout = ~0;
vl_api_show_lisp_rloc_probe_state_t *mp;
- M (SHOW_LISP_RLOC_PROBE_STATE, show_lisp_rloc_probe_state);
+ M (SHOW_LISP_RLOC_PROBE_STATE, mp);
/* send */
S;
f64 timeout = ~0;
vl_api_show_lisp_map_request_mode_t *mp;
- M (SHOW_LISP_MAP_REQUEST_MODE, show_lisp_map_request_mode);
+ M (SHOW_LISP_MAP_REQUEST_MODE, mp);
/* send */
S;
}
}
- M (LISP_MAP_REQUEST_MODE, lisp_map_request_mode);
+ M (LISP_MAP_REQUEST_MODE, mp);
mp->mode = mode;
return -99;
}
- M (LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set);
+ M (LISP_PITR_SET_LOCATOR_SET, mp);
mp->is_add = is_add;
clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name));
print (vam->ofp, "%=20s", "lisp status:");
}
- M (SHOW_LISP_PITR, show_lisp_pitr);
+ M (SHOW_LISP_PITR, mp);
/* send it... */
S;
return -99;
}
- M (LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map);
+ M (LISP_EID_TABLE_ADD_DEL_MAP, mp);
mp->is_add = is_add;
mp->vni = htonl (vni);
u32 action = ~0, p, w, data_len;
ip4_address_t rloc4;
ip6_address_t rloc6;
- rloc_t *rlocs = 0, rloc, *curr_rloc = 0;
+ vl_api_remote_locator_t *rlocs = 0, rloc, *curr_rloc = 0;
memset (&rloc, 0, sizeof (rloc));
return -99;
}
- data_len = vec_len (rlocs) * sizeof (rloc_t);
+ data_len = vec_len (rlocs) * sizeof (vl_api_remote_locator_t);
- M2 (LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping, data_len);
+ M2 (LISP_ADD_DEL_REMOTE_MAPPING, mp, data_len);
mp->is_add = is_add;
mp->vni = htonl (vni);
mp->action = (u8) action;
return -99;
}
- M (LISP_ADD_DEL_ADJACENCY, lisp_add_del_adjacency);
+ M (LISP_ADD_DEL_ADJACENCY, mp);
mp->is_add = is_add;
mp->vni = htonl (vni);
mp->leid_len = leid_len;
}
/* Construct the API message */
- M (LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface);
+ M (LISP_GPE_ADD_DEL_IFACE, mp);
mp->is_add = is_add;
mp->dp_table = dp_table;
return -99;
}
- M (LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS, lisp_add_del_map_request_itr_rlocs);
+ M (LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS, mp);
mp->is_add = is_add;
if (is_add)
{
print (vam->ofp, "%=16s%=16s%=16s", "locator", "priority", "weight");
}
- M (LISP_LOCATOR_DUMP, lisp_locator_dump);
+ M (LISP_LOCATOR_DUMP, mp);
mp->is_index_set = is_index_set;
if (is_index_set)
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
/* Wait for a reply... */
print (vam->ofp, "%=10s%=15s", "ls_index", "ls_name");
}
- M (LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump);
+ M (LISP_LOCATOR_SET_DUMP, mp);
mp->filter = filter;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
/* Wait for a reply... */
print (vam->ofp, "%=10s%=10s", "VNI", is_l2 ? "BD" : "VRF");
}
- M (LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump);
+ M (LISP_EID_TABLE_MAP_DUMP, mp);
mp->is_l2 = is_l2;
/* send it... */
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
/* Wait for a reply... */
print (vam->ofp, "VNI");
}
- M (LISP_EID_TABLE_VNI_DUMP, lisp_eid_table_vni_dump);
+ M (LISP_EID_TABLE_VNI_DUMP, mp);
/* send it... */
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
/* Wait for a reply... */
"type", "ls_index", "ttl", "authoritative", "key_id", "key");
}
- M (LISP_EID_TABLE_DUMP, lisp_eid_table_dump);
+ M (LISP_EID_TABLE_DUMP, mp);
mp->filter = filter;
if (eid_set)
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
return 0;
}
+static int
+api_lisp_gpe_fwd_entries_get (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_lisp_gpe_fwd_entries_get_t *mp;
+ f64 timeout = ~0;
+ u8 vni_set = 0;
+ u32 vni = ~0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "vni %d", &vni))
+ {
+ vni_set = 1;
+ }
+ else
+ {
+ errmsg ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (!vni_set)
+ {
+ errmsg ("vni not set!");
+ return -99;
+ }
+
+ if (!vam->json_output)
+ {
+ print (vam->ofp, "%10s %10s %s %40s", "fwd_index", "dp_table",
+ "leid", "reid");
+ }
+
+ M (LISP_GPE_FWD_ENTRIES_GET, mp);
+ mp->vni = clib_host_to_net_u32 (vni);
+
+ /* send it... */
+ S;
+
+ /* Wait for a reply... */
+ W;
+
+ /* NOTREACHED */
+ return 0;
+}
+
+#define vl_api_lisp_gpe_fwd_entries_get_reply_t_endian vl_noop_handler
+#define vl_api_lisp_gpe_fwd_entries_get_reply_t_print vl_noop_handler
+#define vl_api_lisp_gpe_fwd_entry_path_details_t_endian vl_noop_handler
+#define vl_api_lisp_gpe_fwd_entry_path_details_t_print vl_noop_handler
+
static int
api_lisp_adjacencies_get (vat_main_t * vam)
{
print (vam->ofp, "%s %40s", "leid", "reid");
}
- M (LISP_ADJACENCIES_GET, lisp_adjacencies_get);
+ M (LISP_ADJACENCIES_GET, mp);
mp->vni = clib_host_to_net_u32 (vni);
/* send it... */
print (vam->ofp, "%=20s", "Map server");
}
- M (LISP_MAP_SERVER_DUMP, lisp_map_server_dump);
+ M (LISP_MAP_SERVER_DUMP, mp);
/* send it... */
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
/* Wait for a reply... */
print (vam->ofp, "%=20s", "Map resolver");
}
- M (LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump);
+ M (LISP_MAP_RESOLVER_DUMP, mp);
/* send it... */
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
/* Wait for a reply... */
print (vam->ofp, "%-20s%-16s", "lisp status", "locator-set");
}
- M (SHOW_LISP_STATUS, show_lisp_status);
+ M (SHOW_LISP_STATUS, mp);
+ /* send it... */
+ S;
+ /* Wait for a reply... */
+ W;
+
+ /* NOTREACHED */
+ return 0;
+}
+
+static int
+api_lisp_gpe_fwd_entry_path_dump (vat_main_t * vam)
+{
+ vl_api_lisp_gpe_fwd_entry_path_dump_t *mp;
+ f64 timeout = ~0;
+ unformat_input_t *i = vam->input;
+ u32 fwd_entry_index = ~0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "index %d", &fwd_entry_index))
+ ;
+ else
+ break;
+ }
+
+ if (~0 == fwd_entry_index)
+ {
+ errmsg ("no index specified!");
+ return -99;
+ }
+
+ if (!vam->json_output)
+ {
+ print (vam->ofp, "first line");
+ }
+
+ M (LISP_GPE_FWD_ENTRY_PATH_DUMP, mp);
+
/* send it... */
S;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, mp);
+ S;
+ }
/* Wait for a reply... */
W;
print (vam->ofp, "%=20s", "itr-rlocs:");
}
- M (LISP_GET_MAP_REQUEST_ITR_RLOCS, lisp_get_map_request_itr_rlocs);
+ M (LISP_GET_MAP_REQUEST_ITR_RLOCS, mp);
/* send it... */
S;
/* Wait for a reply... */
return -99;
}
- M (AF_PACKET_CREATE, af_packet_create);
+ M (AF_PACKET_CREATE, mp);
clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
clib_memcpy (mp->hw_addr, hw_addr, 6);
return -99;
}
- M (AF_PACKET_DELETE, af_packet_delete);
+ M (AF_PACKET_DELETE, mp);
clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
vec_free (host_if_name);
return -99;
}
- M (POLICER_ADD_DEL, policer_add_del);
+ M (POLICER_ADD_DEL, mp);
clib_memcpy (mp->name, name, vec_len (name));
vec_free (name);
break;
}
- M (POLICER_DUMP, policer_dump);
+ M (POLICER_DUMP, mp);
mp->match_name_valid = match_name_valid;
clib_memcpy (mp->match_name, match_name, vec_len (match_name));
vec_free (match_name);
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
/* Wait for a reply... */
return -99;
}
- M (POLICER_CLASSIFY_SET_INTERFACE, policer_classify_set_interface);
+ M (POLICER_CLASSIFY_SET_INTERFACE, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->ip4_table_index = ntohl (ip4_table_index);
print (vam->ofp, "%10s%20s", "Intfc idx", "Classify table");
}
- M (POLICER_CLASSIFY_DUMP, policer_classify_dump);
+ M (POLICER_CLASSIFY_DUMP, mp);
mp->type = type;
/* send it... */
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
/* Wait for a reply... */
return -99;
}
- M (NETMAP_CREATE, netmap_create);
+ M (NETMAP_CREATE, mp);
clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
clib_memcpy (mp->hw_addr, hw_addr, 6);
return -99;
}
- M (NETMAP_DELETE, netmap_delete);
+ M (NETMAP_DELETE, mp);
clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
vec_free (if_name);
print (vam->ofp, " tunnel_index %d", index);
- M (MPLS_TUNNEL_DUMP, mpls_tunnel_dump);
+ M (MPLS_TUNNEL_DUMP, mp);
mp->tunnel_index = htonl (index);
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
vl_api_mpls_fib_dump_t *mp;
f64 timeout;
- M (MPLS_FIB_DUMP, mpls_fib_dump);
+ M (MPLS_FIB_DUMP, mp);
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
vl_api_ip_fib_dump_t *mp;
f64 timeout;
- M (IP_FIB_DUMP, ip_fib_dump);
+ M (IP_FIB_DUMP, mp);
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
return -99;
}
- M (IP_NEIGHBOR_DUMP, ip_neighbor_dump);
+ M (IP_NEIGHBOR_DUMP, mp);
mp->is_ipv6 = (u8) is_ipv6;
mp->sw_if_index = ntohl (sw_if_index);
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
vl_api_ip6_fib_dump_t *mp;
f64 timeout;
- M (IP6_FIB_DUMP, ip6_fib_dump);
+ M (IP6_FIB_DUMP, mp);
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
f64 timeout;
/* Construct the API message */
- M (CLASSIFY_TABLE_IDS, classify_table_ids);
+ M (CLASSIFY_TABLE_IDS, mp);
mp->context = 0;
S;
}
/* Construct the API message */
- M (CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface);
+ M (CLASSIFY_TABLE_BY_INTERFACE, mp);
mp->context = 0;
mp->sw_if_index = ntohl (sw_if_index);
}
/* Construct the API message */
- M (CLASSIFY_TABLE_INFO, classify_table_info);
+ M (CLASSIFY_TABLE_INFO, mp);
mp->context = 0;
mp->table_id = ntohl (table_id);
}
/* Construct the API message */
- M (CLASSIFY_SESSION_DUMP, classify_session_dump);
+ M (CLASSIFY_SESSION_DUMP, mp);
mp->context = 0;
mp->table_id = ntohl (table_id);
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
f64 timeout;
/* Construct the API message */
- M (IPFIX_EXPORTER_DUMP, ipfix_exporter_dump);
+ M (IPFIX_EXPORTER_DUMP, mp);
mp->context = 0;
S;
f64 timeout;
/* Construct the API message */
- M (IPFIX_CLASSIFY_STREAM_DUMP, ipfix_classify_stream_dump);
+ M (IPFIX_CLASSIFY_STREAM_DUMP, mp);
mp->context = 0;
S;
}
/* Construct the API message */
- M (IPFIX_CLASSIFY_TABLE_DUMP, ipfix_classify_table_dump);
+ M (IPFIX_CLASSIFY_TABLE_DUMP, mp);
/* send it... */
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
break;
}
- M (SW_INTERFACE_SPAN_ENABLE_DISABLE, sw_interface_span_enable_disable);
+ M (SW_INTERFACE_SPAN_ENABLE_DISABLE, mp);
mp->sw_if_index_from = htonl (src_sw_if_index);
mp->sw_if_index_to = htonl (dst_sw_if_index);
vat_json_object_add_uint (node, "src-if-index", sw_if_index_from);
vat_json_object_add_string_copy (node, "src-if-name", sw_if_from_name);
vat_json_object_add_uint (node, "dst-if-index", sw_if_index_to);
- vat_json_object_add_string_copy (node, "dst-if-name", sw_if_to_name);
+ if (0 != sw_if_to_name)
+ {
+ vat_json_object_add_string_copy (node, "dst-if-name", sw_if_to_name);
+ }
vat_json_object_add_uint (node, "state", mp->state);
}
vl_api_sw_interface_span_dump_t *mp;
f64 timeout;
- M (SW_INTERFACE_SPAN_DUMP, sw_interface_span_dump);
+ M (SW_INTERFACE_SPAN_DUMP, mp);
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
}
/* Construct the API message */
- M (PG_CREATE_INTERFACE, pg_create_interface);
+ M (PG_CREATE_INTERFACE, mp);
mp->context = 0;
mp->interface_id = ntohl (if_id);
u32 name_len = vec_len (pcap_file);
/* Construct the API message */
- M (PG_CAPTURE, pg_capture);
+ M (PG_CAPTURE, mp);
mp->context = 0;
mp->interface_id = ntohl (if_id);
mp->is_enabled = enable;
u32 name_len = vec_len (stream_name);
/* Construct the API message */
- M (PG_ENABLE_DISABLE, pg_enable_disable);
+ M (PG_ENABLE_DISABLE, mp);
mp->context = 0;
mp->is_enabled = enable;
if (stream_name_set != 0)
return -99;
}
- M (IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL,
- ip_source_and_port_range_check_add_del);
+ M (IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL, mp);
mp->is_add = is_add;
}
/* Construct the API message */
- M (IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL,
- ip_source_and_port_range_check_interface_add_del);
+ M (IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->is_add = is_add;
}
}
- M (IPSEC_GRE_ADD_DEL_TUNNEL, ipsec_gre_add_del_tunnel);
+ M (IPSEC_GRE_ADD_DEL_TUNNEL, mp);
mp->local_sa_id = ntohl (local_sa_id);
mp->remote_sa_id = ntohl (remote_sa_id);
}
}
- M (PUNT, punt);
+ M (PUNT, mp);
mp->is_add = (u8) is_add;
mp->ipv = (u8) ipv;
}
/* Get list of gre-tunnel interfaces */
- M (IPSEC_GRE_TUNNEL_DUMP, ipsec_gre_tunnel_dump);
+ M (IPSEC_GRE_TUNNEL_DUMP, mp);
mp->sw_if_index = htonl (sw_if_index);
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
}
/* Construct the API message */
- M (DELETE_SUBIF, delete_subif);
+ M (DELETE_SUBIF, mp);
mp->sw_if_index = ntohl (sw_if_index);
S;
return -99;
}
- M (L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite);
+ M (L2_INTERFACE_PBB_TAG_REWRITE, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->vtr_op = ntohl (vtr_op);
mp->outer_tag = ntohs (outer_tag);
return -99;
}
- M (FLOW_CLASSIFY_SET_INTERFACE, flow_classify_set_interface);
+ M (FLOW_CLASSIFY_SET_INTERFACE, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->ip4_table_index = ntohl (ip4_table_index);
print (vam->ofp, "%10s%20s", "Intfc idx", "Classify table");
}
- M (FLOW_CLASSIFY_DUMP, flow_classify_dump);
+ M (FLOW_CLASSIFY_DUMP, mp);
mp->type = type;
/* send it... */
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
/* Wait for a reply... */
}
/* Construct the API message */
- M (FEATURE_ENABLE_DISABLE, feature_enable_disable);
+ M (FEATURE_ENABLE_DISABLE, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->enable = enable;
clib_memcpy (mp->arc_name, arc_name, vec_len (arc_name));
}
/* Construct the API message */
- M (SW_INTERFACE_TAG_ADD_DEL, sw_interface_tag_add_del);
+ M (SW_INTERFACE_TAG_ADD_DEL, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->is_add = enable;
if (enable)
print (vam->ofp, "%15s%15s", "rx_sw_if_index", "tx_sw_if_index");
}
- M (L2_XCONNECT_DUMP, l2_xconnect_dump);
+ M (L2_XCONNECT_DUMP, mp);
S;
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
+ M (CONTROL_PING, mp);
S;
}
W;
}
/* Construct the API message */
- M (SW_INTERFACE_SET_MTU, sw_interface_set_mtu);
+ M (SW_INTERFACE_SET_MTU, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->mtu = ntohs ((u16) mtu);
_(sw_interface_set_vpath, \
"<intfc> | sw_if_index <id> enable | disable") \
_(sw_interface_set_vxlan_bypass, \
- "<intfc> | sw_if_index <id> [ip4 | ip6] enable | disable") \
+ "<intfc> | sw_if_index <id> [ip4 | ip6] [enable | disable]") \
_(sw_interface_set_l2_xconnect, \
"rx <intfc> | rx_sw_if_index <id> tx <intfc> | tx_sw_if_index <id>\n" \
"enable | disable") \
_(lisp_map_resolver_dump, "") \
_(lisp_map_server_dump, "") \
_(lisp_adjacencies_get, "vni <vni>") \
+_(lisp_gpe_fwd_entries_get, "vni <vni>") \
+_(lisp_gpe_fwd_entry_path_dump, "index <fwd_entry_index>") \
_(show_lisp_rloc_probe_state, "") \
_(show_lisp_map_register_state, "") \
_(show_lisp_status, "") \
Code Review / vpp.git / blobdiff