X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vpp%2Fapi%2Fapi.c;h=302b7d4ea509a471ea71802ce727af45d31eb7b1;hb=20c90f765dd0350892421e1dea544752108f4ce9;hp=52d0b2d21ba27ecd122b43764bea8e12da9e8108;hpb=404be66978ff77769953eb96c6db036574288697;p=vpp.git diff --git a/vpp/api/api.c b/vpp/api/api.c index 52d0b2d21ba..302b7d4ea50 100644 --- a/vpp/api/api.c +++ b/vpp/api/api.c @@ -1,7 +1,7 @@ /* *------------------------------------------------------------------ * api.c - message handler registration - * + * * Copyright (c) 2010 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. *------------------------------------------------------------------ */ @@ -30,6 +30,9 @@ #include #include #include +#include +#include + #include #include #include @@ -104,11 +107,11 @@ #define f64_print(a,b) #define vl_typedefs /* define message structures */ -#include +#include #undef vl_typedefs #define vl_endianfun /* define message structures */ -#include +#include #undef vl_endianfun /* instantiate all the print functions we know about */ @@ -291,7 +294,8 @@ _(SW_INTERFACE_VHOST_USER_DETAILS, sw_interface_vhost_user_details) \ _(SHOW_VERSION, show_version) \ _(L2_FIB_TABLE_DUMP, l2_fib_table_dump) \ _(L2_FIB_TABLE_ENTRY, l2_fib_table_entry) \ -_(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel) \ +_(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel) \ +_(VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump) \ _(INTERFACE_NAME_RENUMBER, interface_name_renumber) \ _(WANT_IP4_ARP_EVENTS, want_ip4_arp_events) \ _(INPUT_ACL_SET_INTERFACE, input_acl_set_interface) \ @@ -330,19 +334,37 @@ _(LISP_ENABLE_DISABLE, lisp_enable_disable) \ _(LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface) \ _(LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping) \ _(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set) \ +_(LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map) \ _(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump) \ _(LISP_LOCAL_EID_TABLE_DUMP, lisp_local_eid_table_dump) \ _(LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump) \ _(LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump) \ +_(LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump) \ _(LISP_ENABLE_DISABLE_STATUS_DUMP, \ lisp_enable_disable_status_dump) \ +_(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS, \ + lisp_add_del_map_request_itr_rlocs) \ +_(LISP_GET_MAP_REQUEST_ITR_RLOCS, lisp_get_map_request_itr_rlocs) \ _(SR_MULTICAST_MAP_ADD_DEL, sr_multicast_map_add_del) \ _(AF_PACKET_CREATE, af_packet_create) \ _(AF_PACKET_DELETE, af_packet_delete) \ _(POLICER_ADD_DEL, policer_add_del) \ _(POLICER_DUMP, policer_dump) \ _(NETMAP_CREATE, netmap_create) \ -_(NETMAP_DELETE, netmap_delete) +_(NETMAP_DELETE, netmap_delete) \ +_(MPLS_GRE_TUNNEL_DUMP, mpls_gre_tunnel_dump) \ +_(MPLS_GRE_TUNNEL_DETAILS, mpls_gre_tunnel_details) \ +_(MPLS_ETH_TUNNEL_DUMP, mpls_eth_tunnel_dump) \ +_(MPLS_ETH_TUNNEL_DETAILS, mpls_eth_tunnel_details) \ +_(MPLS_FIB_ENCAP_DUMP, mpls_fib_encap_dump) \ +_(MPLS_FIB_ENCAP_DETAILS, mpls_fib_encap_details) \ +_(MPLS_FIB_DECAP_DUMP, mpls_fib_decap_dump) \ +_(MPLS_FIB_DECAP_DETAILS, mpls_fib_decap_details) \ +_(CLASSIFY_TABLE_IDS,classify_table_ids) \ +_(CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface) \ +_(CLASSIFY_TABLE_INFO,classify_table_info) \ +_(CLASSIFY_SESSION_DUMP,classify_session_dump) \ +_(CLASSIFY_SESSION_DETAILS,classify_session_details) #define QUOTE_(x) #x #define QUOTE(x) QUOTE_(x) @@ -404,7 +426,7 @@ static int arp_change_delete_callback (u32 pool_index, u8 * notused); /* Clean up all registrations belonging to the indicated client */ -int vl_api_memclnt_delete_callback (u32 client_index) +int vl_api_memclnt_delete_callback (u32 client_index) { vpe_api_main_t * vam = &vpe_api_main; vpe_client_registration_t *rp; @@ -457,9 +479,9 @@ link_state_process (vlib_main_t * vm, vlib_process_wait_for_event (vm); /* Unified list of changed link or admin state sw_if_indices */ - vlib_process_get_events_with_type + vlib_process_get_events_with_type (vm, &event_data, API_LINK_STATE_EVENT); - vlib_process_get_events_with_type + vlib_process_get_events_with_type (vm, &event_data, API_ADMIN_UP_DOWN_EVENT); /* Sort, so we can eliminate duplicates */ @@ -473,7 +495,7 @@ link_state_process (vlib_main_t * vm, continue; prev_sw_if_index = event_data[i]; - pool_foreach(reg, vam->interface_events_registrations, + pool_foreach(reg, vam->interface_events_registrations, ({ q = vl_api_client_index_to_input_queue (reg->client_index); if (q) { @@ -512,11 +534,11 @@ link_up_down_function (vnet_main_t *vm, u32 hw_if_index, u32 flags) { vpe_api_main_t * vam = &vpe_api_main; vnet_hw_interface_t *hi = vnet_get_hw_interface (vm, hw_if_index); - + if (vam->link_state_process_up) - vlib_process_signal_event (vam->vlib_main, + vlib_process_signal_event (vam->vlib_main, link_state_process_node.index, - API_LINK_STATE_EVENT, + API_LINK_STATE_EVENT, hi->sw_if_index); return 0; } @@ -526,15 +548,15 @@ admin_up_down_function (vnet_main_t *vm, u32 sw_if_index, u32 flags) { vpe_api_main_t * vam = &vpe_api_main; - /* + /* * Note: it's perfectly fair to set a subif admin up / admin down. * Note the subtle distinction between this routine and the previous * routine. */ if (vam->link_state_process_up) - vlib_process_signal_event (vam->vlib_main, + vlib_process_signal_event (vam->vlib_main, link_state_process_node.index, - API_ADMIN_UP_DOWN_EVENT, + API_ADMIN_UP_DOWN_EVENT, sw_if_index); return 0; } @@ -587,7 +609,7 @@ pub_sub_handler (oam_events,OAM_EVENTS) static int ip4_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp); static int ip6_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp); -static int mpls_ethernet_add_del_tunnel_2_t_handler +static int mpls_ethernet_add_del_tunnel_2_t_handler (vl_api_mpls_ethernet_add_del_tunnel_2_t *mp); void handle_ip4_arp_event (u32 pool_index) @@ -602,27 +624,27 @@ void handle_ip4_arp_event (u32 pool_index) /* Client can cancel, die, etc. */ if (pool_is_free_index (vam->arp_events, pool_index)) return; - + event = pool_elt_at_index (vam->arp_events, pool_index); - + q = vl_api_client_index_to_input_queue (event->client_index); if (!q) { - (void) vnet_add_del_ip4_arp_change_event + (void) vnet_add_del_ip4_arp_change_event (vnm, arp_change_delete_callback, event->pid, &event->address, vpe_resolver_process_node.index, IP4_ARP_EVENT, ~0 /* pool index, notused */, 0 /* is_add */); return; } - + if (q->cursize < q->maxsize) { mp = vl_msg_api_alloc (sizeof (*mp)); clib_memcpy (mp, event, sizeof (*mp)); vl_msg_api_send_shmem (q, (u8 *)&mp); } else { static f64 last_time; - /* - * Throttle syslog msgs. + /* + * Throttle syslog msgs. * It's pretty tempting to just revoke the registration... */ if (vlib_time_now (vm) > last_time + 10.0) { @@ -673,7 +695,7 @@ resolver_process (vlib_main_t * vm, adr = &pr->r; pme = &pr->t; - switch (pr->resolve_type) { + switch (pr->resolve_type) { case RESOLVE_IP4_ADD_DEL_ROUTE: rv = ip4_add_del_route_t_handler (adr); clib_warning ("resolver: add %U/%d via %U %s", @@ -717,7 +739,7 @@ resolver_process (vlib_main_t * vm, break; case ~0: /* timeout, retry pending resolutions */ - pool_foreach (pr, vam->pending_routes, + pool_foreach (pr, vam->pending_routes, ({ int is_adr = 1; adr = &pr->r; @@ -726,25 +748,25 @@ resolver_process (vlib_main_t * vm, /* May fail, e.g. due to interface down */ switch (pr->resolve_type) { case RESOLVE_IP4_ADD_DEL_ROUTE: - e = ip4_probe_neighbor + e = ip4_probe_neighbor (vm, (ip4_address_t *)&(adr->next_hop_address), ntohl(adr->next_hop_sw_if_index)); break; case RESOLVE_IP6_ADD_DEL_ROUTE: - e = ip6_probe_neighbor + e = ip6_probe_neighbor (vm, (ip6_address_t *)&(adr->next_hop_address), ntohl(adr->next_hop_sw_if_index)); break; case RESOLVE_MPLS_ETHERNET_ADD_DEL: is_adr = 0; - e = ip4_probe_neighbor - (vm, + e = ip4_probe_neighbor + (vm, (ip4_address_t *)&(pme->next_hop_ip4_address_in_outer_vrf), pme->resolve_opaque); break; - + default: e = clib_error_return (0, "resolver: BOGUS TYPE %d", pr->resolve_type); @@ -755,23 +777,23 @@ resolver_process (vlib_main_t * vm, adr->resolve_attempts = 1; else pme->resolve_attempts = 1; - + } if (is_adr) { adr->resolve_attempts -= 1; if (adr->resolve_attempts == 0) - vec_add1 (resolution_failures, + vec_add1 (resolution_failures, pr - vam->pending_routes); } else { pme->resolve_attempts -= 1; if (pme->resolve_attempts == 0) - vec_add1 (resolution_failures, + vec_add1 (resolution_failures, pr - vam->pending_routes); } - + })); for (i = 0; i < vec_len (resolution_failures); i++) { - pr = pool_elt_at_index (vam->pending_routes, + pr = pool_elt_at_index (vam->pending_routes, resolution_failures[i]); adr = &pr->r; pme = &pr->t; @@ -845,7 +867,7 @@ static int ip4_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) if (!p) { if (mp->create_vrf_if_needed) { ip4_fib_t * f; - f = find_ip4_fib_by_table_index_or_id (im, ntohl(mp->vrf_id), + f = find_ip4_fib_by_table_index_or_id (im, ntohl(mp->vrf_id), 0 /* flags */); fib_index = f->index; } else { @@ -856,11 +878,11 @@ static int ip4_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) fib_index = p[0]; } - if (pool_is_free_index (vnm->interface_main.sw_interfaces, + if (pool_is_free_index (vnm->interface_main.sw_interfaces, ntohl(mp->next_hop_sw_if_index))) return VNET_API_ERROR_NO_MATCHING_INTERFACE; - - clib_memcpy (next_hop_address.data, mp->next_hop_address, + + clib_memcpy (next_hop_address.data, mp->next_hop_address, sizeof (next_hop_address.data)); /* Arp for the next_hop if necessary */ @@ -868,7 +890,7 @@ static int ip4_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) u32 lookup_result; ip_adjacency_t * adj; - lookup_result = ip4_fib_lookup_with_table + lookup_result = ip4_fib_lookup_with_table (im, fib_index, &next_hop_address, 1 /* disable default route */); adj = ip_get_adjacency (lm, lookup_result); @@ -881,16 +903,16 @@ static int ip4_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) /* recursion block, "just in case" */ adr->resolve_if_needed = 0; adr->resolve_attempts = ntohl(mp->resolve_attempts); - vnet_register_ip4_arp_resolution_event + vnet_register_ip4_arp_resolution_event (vnm, &next_hop_address, vpe_resolver_process_node.index, RESOLUTION_EVENT, pr - vam->pending_routes); - vlib_process_signal_event + vlib_process_signal_event (vm, vpe_resolver_process_node.index, RESOLUTION_PENDING_EVENT, 0 /* data */); /* The interface may be down, etc. */ - e = ip4_probe_neighbor + e = ip4_probe_neighbor (vm, (ip4_address_t *)&(mp->next_hop_address), ntohl(mp->next_hop_sw_if_index)); @@ -914,12 +936,12 @@ static int ip4_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) if (mp->not_last) flags |= IP4_ROUTE_FLAG_NOT_LAST_IN_GROUP; - ip4_add_del_route_next_hop (im, flags, + ip4_add_del_route_next_hop (im, flags, (ip4_address_t *) mp->dst_address, (u32) mp->dst_address_length, (ip4_address_t *) mp->next_hop_address, ntohl(mp->next_hop_sw_if_index), - (u32) mp->next_hop_weight, + (u32) mp->next_hop_weight, ~0 /* adj_index */, fib_index); dsunlock(sm); @@ -960,17 +982,28 @@ static int ip4_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) goto do_add_del; } else { - ai = ip4_fib_lookup_with_table - (im, fib_index, &next_hop_address, + ai = ip4_fib_lookup_with_table + (im, fib_index, &next_hop_address, 1 /* disable default route */); if (ai == lm->miss_adj_index) { dsunlock(sm); return VNET_API_ERROR_NEXT_HOP_NOT_IN_FIB; } } - + nh_adj = ip_get_adjacency (lm, ai); - vec_add1 (add_adj, nh_adj[0]); + if (nh_adj->lookup_next_index == IP_LOOKUP_NEXT_ARP && + nh_adj->arp.next_hop.ip4.as_u32 == 0) { + /* the next-hop resovles via a glean adj. create and use + * a ARP adj for the next-hop */ + a.adj_index = vnet_arp_glean_add(fib_index, &next_hop_address); + a.add_adj = NULL; + a.n_add_adj = 0; + ip4_add_del_route (im, &a); + + goto done; + } + vec_add1 (add_adj, nh_adj[0]); if (mp->lookup_in_vrf) { p = hash_get (im->fib_index_by_table_id, ntohl(mp->lookup_in_vrf)); if (p) @@ -984,13 +1017,13 @@ static int ip4_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) } else { ip_adjacency_t * adj; int disable_default_route = 1; - + /* Trying to delete the default route? */ if (a.dst_address.as_u32 == 0 && a.dst_address_length == 0) disable_default_route = 0; - - ai = ip4_fib_lookup_with_table + + ai = ip4_fib_lookup_with_table (im, fib_index, &a.dst_address, disable_default_route); if (ai == lm->miss_adj_index) { dsunlock(sm); @@ -1003,15 +1036,16 @@ static int ip4_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) return VNET_API_ERROR_ADDRESS_MATCHES_INTERFACE_ADDRESS; } } - + do_add_del: a.adj_index = ~0; a.add_adj = add_adj; a.n_add_adj = vec_len(add_adj); ip4_add_del_route (im, &a); - + vec_free (add_adj); +done: dsunlock (sm); return 0; } @@ -1040,7 +1074,7 @@ static int ip6_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) if (!p) { if (mp->create_vrf_if_needed) { ip6_fib_t * f; - f = find_ip6_fib_by_table_index_or_id (im, ntohl(mp->vrf_id), + f = find_ip6_fib_by_table_index_or_id (im, ntohl(mp->vrf_id), 0 /* flags */); fib_index = f->index; } else { @@ -1051,11 +1085,11 @@ static int ip6_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) fib_index = p[0]; } - if (pool_is_free_index (vnm->interface_main.sw_interfaces, + if (pool_is_free_index (vnm->interface_main.sw_interfaces, ntohl(mp->next_hop_sw_if_index))) return VNET_API_ERROR_NO_MATCHING_INTERFACE; - clib_memcpy (next_hop_address.as_u8, mp->next_hop_address, + clib_memcpy (next_hop_address.as_u8, mp->next_hop_address, sizeof (next_hop_address.as_u8)); /* Arp for the next_hop if necessary */ @@ -1063,7 +1097,7 @@ static int ip6_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) u32 lookup_result; ip_adjacency_t * adj; - lookup_result = ip6_fib_lookup_with_table + lookup_result = ip6_fib_lookup_with_table (im, fib_index, &next_hop_address); adj = ip_get_adjacency (lm, lookup_result); @@ -1076,16 +1110,16 @@ static int ip6_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) /* recursion block, "just in case" */ adr->resolve_if_needed = 0; adr->resolve_attempts = ntohl(mp->resolve_attempts); - vnet_register_ip6_neighbor_resolution_event + vnet_register_ip6_neighbor_resolution_event (vnm, &next_hop_address, vpe_resolver_process_node.index, RESOLUTION_EVENT, pr - vam->pending_routes); - vlib_process_signal_event + vlib_process_signal_event (vm, vpe_resolver_process_node.index, RESOLUTION_PENDING_EVENT, 0 /* data */); /* The interface may be down, etc. */ - e = ip6_probe_neighbor + e = ip6_probe_neighbor (vm, (ip6_address_t *)&(mp->next_hop_address), ntohl(mp->next_hop_sw_if_index)); @@ -1113,7 +1147,7 @@ static int ip6_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) (u32) mp->dst_address_length, (ip6_address_t *)mp->next_hop_address, ntohl(mp->next_hop_sw_if_index), - (u32) mp->next_hop_weight, + (u32) mp->next_hop_weight, ~0 /* adj_index */, fib_index); dsunlock(sm); @@ -1124,16 +1158,16 @@ static int ip6_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) clib_memcpy (a.dst_address.as_u8, mp->dst_address, sizeof (a.dst_address.as_u8)); a.dst_address_length = mp->dst_address_length; - + a.flags = (mp->is_add ? IP6_ROUTE_FLAG_ADD : IP6_ROUTE_FLAG_DEL); a.flags |= IP6_ROUTE_FLAG_FIB_INDEX; a.table_index_or_table_id = fib_index; a.add_adj = 0; a.n_add_adj = 0; - + if (mp->not_last) a.flags |= IP6_ROUTE_FLAG_NOT_LAST_IN_GROUP; - + dslock (sm, 1 /* release hint */, 3 /* tag */); if (mp->is_add) { @@ -1142,14 +1176,14 @@ static int ip6_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) else if (mp->is_local) ai = lm->local_adj_index; else { - ai = ip6_fib_lookup_with_table + ai = ip6_fib_lookup_with_table (im, fib_index, &next_hop_address); if (ai == lm->miss_adj_index) { dsunlock(sm); return VNET_API_ERROR_NEXT_HOP_NOT_IN_FIB; } } - + nh_adj = ip_get_adjacency (lm, ai); vec_add1 (add_adj, nh_adj[0]); if (mp->lookup_in_vrf) { @@ -1164,8 +1198,8 @@ static int ip6_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) } } else { ip_adjacency_t * adj; - - ai = ip6_fib_lookup_with_table + + ai = ip6_fib_lookup_with_table (im, fib_index, &a.dst_address); if (ai == lm->miss_adj_index) { dsunlock(sm); @@ -1177,12 +1211,12 @@ static int ip6_add_del_route_t_handler (vl_api_ip_add_del_route_t *mp) return VNET_API_ERROR_ADDRESS_MATCHES_INTERFACE_ADDRESS; } } - + a.adj_index = ~0; a.add_adj = add_adj; a.n_add_adj = vec_len(add_adj); ip6_add_del_route (im, &a); - + vec_free (add_adj); dsunlock (sm); @@ -1249,8 +1283,8 @@ void api_config_default_ip_route (u8 is_ipv6, u8 is_add, u32 vrf_id, } -static void -vl_api_sw_interface_add_del_address_t_handler +static void +vl_api_sw_interface_add_del_address_t_handler (vl_api_sw_interface_add_del_address_t *mp) { vlib_main_t *vm = vlib_get_main(); @@ -1266,13 +1300,13 @@ vl_api_sw_interface_add_del_address_t_handler ip_del_all_interface_addresses (vm, ntohl(mp->sw_if_index)); else if (mp->is_ipv6) ip6_add_del_interface_address (vm, ntohl(mp->sw_if_index), - (void *)mp->address, + (void *)mp->address, mp->address_length, is_del); - else + else ip4_add_del_interface_address (vm, ntohl(mp->sw_if_index), - (void *) mp->address, + (void *) mp->address, mp->address_length, is_del); - + BAD_SW_IF_INDEX_LABEL; REPLY_MACRO(VL_API_SW_INTERFACE_ADD_DEL_ADDRESS_REPLY); @@ -1293,8 +1327,8 @@ vl_api_sw_interface_set_table_t_handler (vl_api_sw_interface_set_table_t *mp) if (mp->is_ipv6) { ip6_main_t * im = &ip6_main; - ip6_fib_t * fib = - find_ip6_fib_by_table_index_or_id (im, table_id, + ip6_fib_t * fib = + find_ip6_fib_by_table_index_or_id (im, table_id, IP6_ROUTE_FLAG_TABLE_ID); if (fib) { vec_validate (im->fib_index_by_sw_if_index, sw_if_index); @@ -1304,9 +1338,9 @@ vl_api_sw_interface_set_table_t_handler (vl_api_sw_interface_set_table_t *mp) } } else { ip4_main_t * im = &ip4_main; - ip4_fib_t * fib = find_ip4_fib_by_table_index_or_id + ip4_fib_t * fib = find_ip4_fib_by_table_index_or_id (im, table_id, IP4_ROUTE_FLAG_TABLE_ID); - + /* Truthfully this can't fail */ if (fib) { vec_validate (im->fib_index_by_sw_if_index, sw_if_index); @@ -1316,16 +1350,18 @@ vl_api_sw_interface_set_table_t_handler (vl_api_sw_interface_set_table_t *mp) } } dsunlock(sm); - + BAD_SW_IF_INDEX_LABEL; REPLY_MACRO(VL_API_SW_INTERFACE_SET_TABLE_REPLY); } -static void +static void vl_api_sw_interface_set_vpath_t_handler (vl_api_sw_interface_set_vpath_t *mp) { vlib_main_t *vm = vlib_get_main(); + ip4_main_t * im4 = &ip4_main; + ip6_main_t * im6 = &ip6_main; vl_api_sw_interface_set_vpath_reply_t * rmp; int rv = 0; u32 ci; @@ -1336,7 +1372,7 @@ vl_api_sw_interface_set_vpath_t_handler (vl_api_sw_interface_set_vpath_t *mp) ip_lookup_main_t *ip6lm = &ip6m->lookup_main; ip_config_main_t *rx_cm4u = &ip4lm->rx_config_mains[VNET_UNICAST]; ip_config_main_t *rx_cm4m = &ip4lm->rx_config_mains[VNET_MULTICAST]; - ip_config_main_t *rx_cm6u = &ip6lm->rx_config_mains[VNET_UNICAST]; + ip_config_main_t *rx_cm6u = &ip6lm->rx_config_mains[VNET_UNICAST]; ip_config_main_t *rx_cm6m = &ip6lm->rx_config_mains[VNET_MULTICAST]; VALIDATE_SW_IF_INDEX(mp); @@ -1344,37 +1380,53 @@ vl_api_sw_interface_set_vpath_t_handler (vl_api_sw_interface_set_vpath_t *mp) l2input_intf_bitmap_enable(sw_if_index, L2INPUT_FEAT_VPATH, mp->enable); if (mp->enable) { ci = rx_cm4u->config_index_by_sw_if_index[sw_if_index]; //IP4 unicast - ci = vnet_config_add_feature(vm, &rx_cm4u->config_main, - ci, IP4_RX_FEATURE_VPATH, 0, 0); + ci = vnet_config_add_feature(vm, &rx_cm4u->config_main, + ci, + im4->ip4_unicast_rx_feature_vpath, + 0, 0); rx_cm4u->config_index_by_sw_if_index[sw_if_index] = ci; ci = rx_cm4m->config_index_by_sw_if_index[sw_if_index]; //IP4 mcast - ci = vnet_config_add_feature(vm, &rx_cm4m->config_main, - ci, IP4_RX_FEATURE_VPATH, 0, 0); + ci = vnet_config_add_feature(vm, &rx_cm4m->config_main, + ci, + im4->ip4_multicast_rx_feature_vpath, + 0, 0); rx_cm4m->config_index_by_sw_if_index[sw_if_index] = ci; ci = rx_cm6u->config_index_by_sw_if_index[sw_if_index]; //IP6 unicast - ci = vnet_config_add_feature(vm, &rx_cm6u->config_main, - ci, IP6_RX_FEATURE_VPATH, 0, 0); + ci = vnet_config_add_feature(vm, &rx_cm6u->config_main, + ci, + im6->ip6_unicast_rx_feature_vpath, + 0, 0); rx_cm6u->config_index_by_sw_if_index[sw_if_index] = ci; ci = rx_cm6m->config_index_by_sw_if_index[sw_if_index]; //IP6 mcast - ci = vnet_config_add_feature(vm, &rx_cm6m->config_main, - ci, IP6_RX_FEATURE_VPATH, 0, 0); + ci = vnet_config_add_feature(vm, &rx_cm6m->config_main, + ci, + im6->ip6_multicast_rx_feature_vpath, + 0, 0); rx_cm6m->config_index_by_sw_if_index[sw_if_index] = ci; } else { ci = rx_cm4u->config_index_by_sw_if_index[sw_if_index]; //IP4 unicast - ci = vnet_config_del_feature(vm, &rx_cm4u->config_main, - ci, IP4_RX_FEATURE_VPATH, 0, 0); + ci = vnet_config_del_feature(vm, &rx_cm4u->config_main, + ci, + im4->ip4_unicast_rx_feature_vpath, + 0, 0); rx_cm4u->config_index_by_sw_if_index[sw_if_index] = ci; ci = rx_cm4m->config_index_by_sw_if_index[sw_if_index]; //IP4 mcast - ci = vnet_config_del_feature(vm, &rx_cm4m->config_main, - ci, IP4_RX_FEATURE_VPATH, 0, 0); + ci = vnet_config_del_feature(vm, &rx_cm4m->config_main, + ci, + im4->ip4_multicast_rx_feature_vpath, + 0, 0); rx_cm4m->config_index_by_sw_if_index[sw_if_index] = ci; ci = rx_cm6u->config_index_by_sw_if_index[sw_if_index]; //IP6 unicast - ci = vnet_config_del_feature(vm, &rx_cm6u->config_main, - ci, IP6_RX_FEATURE_VPATH, 0, 0); + ci = vnet_config_del_feature(vm, &rx_cm6u->config_main, + ci, + im6->ip6_unicast_rx_feature_vpath, + 0, 0); rx_cm6u->config_index_by_sw_if_index[sw_if_index] = ci; ci = rx_cm6m->config_index_by_sw_if_index[sw_if_index]; //IP6 mcast - ci = vnet_config_del_feature(vm, &rx_cm6m->config_main, - ci, IP6_RX_FEATURE_VPATH, 0, 0); + ci = vnet_config_del_feature(vm, &rx_cm6m->config_main, + ci, + im6->ip6_multicast_rx_feature_vpath, + 0, 0); rx_cm6m->config_index_by_sw_if_index[sw_if_index] = ci; } @@ -1383,7 +1435,7 @@ vl_api_sw_interface_set_vpath_t_handler (vl_api_sw_interface_set_vpath_t *mp) REPLY_MACRO(VL_API_SW_INTERFACE_SET_VPATH_REPLY); } -static void +static void vl_api_sw_interface_set_l2_xconnect_t_handler ( vl_api_sw_interface_set_l2_xconnect_t *mp) { @@ -1398,19 +1450,19 @@ vl_api_sw_interface_set_l2_xconnect_t_handler ( if (mp->enable) { VALIDATE_TX_SW_IF_INDEX(mp); - rv = set_int_l2_mode(vm, vnm, MODE_L2_XC, + rv = set_int_l2_mode(vm, vnm, MODE_L2_XC, rx_sw_if_index, 0, 0, 0, tx_sw_if_index); } else { rv = set_int_l2_mode(vm, vnm, MODE_L3, rx_sw_if_index, 0, 0, 0, 0); } - + BAD_RX_SW_IF_INDEX_LABEL; BAD_TX_SW_IF_INDEX_LABEL; REPLY_MACRO(VL_API_SW_INTERFACE_SET_L2_XCONNECT_REPLY); } -static void +static void vl_api_sw_interface_set_l2_bridge_t_handler ( vl_api_sw_interface_set_l2_bridge_t *mp) { @@ -1431,18 +1483,18 @@ vl_api_sw_interface_set_l2_bridge_t_handler ( if (mp->enable) { //VALIDATE_TX_SW_IF_INDEX(mp); - rv = set_int_l2_mode(vm, vnm, MODE_L2_BRIDGE, + rv = set_int_l2_mode(vm, vnm, MODE_L2_BRIDGE, rx_sw_if_index, bd_index, bvi, shg, 0); } else { rv = set_int_l2_mode(vm, vnm, MODE_L3, rx_sw_if_index, 0, 0, 0, 0); } - + BAD_RX_SW_IF_INDEX_LABEL; REPLY_MACRO(VL_API_SW_INTERFACE_SET_L2_BRIDGE_REPLY); } -static void +static void vl_api_bridge_domain_add_del_t_handler ( vl_api_bridge_domain_add_del_t *mp) { @@ -1457,12 +1509,12 @@ vl_api_bridge_domain_add_del_t_handler ( if (mp->is_add) { bd_index = bd_find_or_add_bd_index (bdm, bd_id); - if (mp->flood) + if (mp->flood) enable_flags |= L2_FLOOD; else disable_flags |= L2_FLOOD; - if (mp->uu_flood) + if (mp->uu_flood) enable_flags |= L2_UU_FLOOD; else disable_flags |= L2_UU_FLOOD; @@ -1472,7 +1524,7 @@ vl_api_bridge_domain_add_del_t_handler ( else disable_flags |= L2_FWD; - if (mp->arp_term) + if (mp->arp_term) enable_flags |= L2_ARP_TERM; else disable_flags |= L2_ARP_TERM; @@ -1563,7 +1615,7 @@ static void vl_api_bridge_domain_dump_t_handler ( if (q == 0) return; - + bd_id = ntohl(mp->bd_id); bd_index = (bd_id == ~0) ? 0 : bd_find_or_add_bd_index (bdm, bd_id); @@ -1574,10 +1626,10 @@ static void vl_api_bridge_domain_dump_t_handler ( if (bd_config && (bd_config->bd_id > 0)) { u32 n_sw_ifs; l2_flood_member_t * m; - + n_sw_ifs = vec_len (bd_config->members); send_bridge_domain_details (q, bd_config, n_sw_ifs, mp->context); - + vec_foreach (m, bd_config->members) { send_bd_sw_if_details (l2im, q, m, bd_config->bd_id, mp->context); } @@ -1585,7 +1637,7 @@ static void vl_api_bridge_domain_dump_t_handler ( } } -static void +static void vl_api_l2fib_add_del_t_handler ( vl_api_l2fib_add_del_t *mp) { @@ -1636,7 +1688,7 @@ vl_api_l2fib_add_del_t_handler ( REPLY_MACRO(VL_API_L2FIB_ADD_DEL_REPLY); } -static void +static void vl_api_l2_flags_t_handler ( vl_api_l2_flags_t *mp) { @@ -1659,7 +1711,7 @@ vl_api_l2_flags_t_handler ( REPLY_MACRO2(VL_API_L2_FLAGS_REPLY, rmp->resulting_feature_bitmap = ntohl(rbm)); } -static void +static void vl_api_bridge_flags_t_handler ( vl_api_bridge_flags_t *mp) { @@ -1668,7 +1720,7 @@ vl_api_bridge_flags_t_handler ( vl_api_bridge_flags_reply_t * rmp; int rv = 0; u32 bd_id = ntohl(mp->bd_id); - u32 bd_index; + u32 bd_index; u32 flags = ntohl(mp->feature_bitmap); uword * p; @@ -1677,7 +1729,7 @@ vl_api_bridge_flags_t_handler ( rv = VNET_API_ERROR_NO_SUCH_ENTRY; goto out; } - + bd_index = p[0]; bd_set_flags(vm, bd_index, flags, mp->is_set); @@ -1687,7 +1739,7 @@ out: rmp->resulting_feature_bitmap = ntohl(flags)); } -static void +static void vl_api_bd_ip_mac_add_del_t_handler ( vl_api_bd_ip_mac_add_del_t *mp) { @@ -1695,7 +1747,7 @@ vl_api_bd_ip_mac_add_del_t_handler ( vl_api_bd_ip_mac_add_del_reply_t * rmp; int rv = 0; u32 bd_id = ntohl(mp->bd_id); - u32 bd_index; + u32 bd_index; uword * p; p = hash_get (bdm->bd_index_by_bd_id, bd_id); @@ -1703,9 +1755,9 @@ vl_api_bd_ip_mac_add_del_t_handler ( rv = VNET_API_ERROR_NO_SUCH_ENTRY; goto out; } - + bd_index = p[0]; - if (bd_add_del_ip_mac(bd_index, mp->ip_address, + if (bd_add_del_ip_mac(bd_index, mp->ip_address, mp->mac_address, mp->is_ipv6, mp->is_add)) rv = VNET_API_ERROR_UNSPECIFIED; @@ -1721,11 +1773,11 @@ vl_api_tap_connect_t_handler (vl_api_tap_connect_t *mp, vlib_main_t *vm) unix_shared_memory_queue_t * q; u32 sw_if_index = (u32)~0; - rv = vnet_tap_connect_renumber (vm, mp->tap_name, + rv = vnet_tap_connect_renumber (vm, mp->tap_name, mp->use_random_mac ? 0 : mp->mac_address, &sw_if_index, mp->renumber, ntohl(mp->custom_dev_instance)); - + q = vl_api_client_index_to_input_queue (mp->client_index); if (!q) return; @@ -1751,7 +1803,7 @@ vl_api_tap_modify_t_handler (vl_api_tap_modify_t *mp, vlib_main_t *vm) mp->use_random_mac ? 0 : mp->mac_address, &sw_if_index, mp->renumber, ntohl(mp->custom_dev_instance)); - + q = vl_api_client_index_to_input_queue (mp->client_index); if (!q) return; @@ -1818,18 +1870,18 @@ vl_api_create_vlan_subif_t_handler (vl_api_create_vlan_subif_t * mp) rv = VNET_API_ERROR_INVALID_VLAN; goto out; } - + sup_and_sub_key = ((u64)(hi->sw_if_index) << 32) | (u64) id; - + p = hash_get_mem (im->sw_if_index_by_sup_and_sub, &sup_and_sub_key); if (p) { rv = VNET_API_ERROR_VLAN_ALREADY_EXISTS; goto out; } - + kp = clib_mem_alloc (sizeof (*kp)); *kp = sup_and_sub_key; - + memset (&template, 0, sizeof (template)); template.type = VNET_SW_INTERFACE_TYPE_SUB; template.sup_sw_if_index = hi->sw_if_index; @@ -1847,14 +1899,14 @@ vl_api_create_vlan_subif_t_handler (vl_api_create_vlan_subif_t * mp) } hash_set (hi->sub_interface_sw_if_index_by_id, id, sw_if_index); hash_set_mem (im->sw_if_index_by_sup_and_sub, kp, sw_if_index); - + BAD_SW_IF_INDEX_LABEL; out: q = vl_api_client_index_to_input_queue (mp->client_index); if (!q) return; - + rmp = vl_msg_api_alloc (sizeof (*rmp)); rmp->_vl_msg_id = ntohs(VL_API_CREATE_VLAN_SUBIF_REPLY); rmp->context = mp->context; @@ -1892,7 +1944,7 @@ vl_api_create_subif_t_handler (vl_api_create_subif_t * mp) sw_if_index = si->sw_if_index; sub_id = ntohl(mp->sub_id); - + sup_and_sub_key = ((u64)(sw_if_index) << 32) | (u64) sub_id; p = hash_get_mem (im->sw_if_index_by_sup_and_sub, &sup_and_sub_key); @@ -1906,7 +1958,7 @@ vl_api_create_subif_t_handler (vl_api_create_subif_t * mp) kp = clib_mem_alloc (sizeof (*kp)); *kp = sup_and_sub_key; - + memset (&template, 0, sizeof (template)); template.type = VNET_SW_INTERFACE_TYPE_SUB; template.sup_sw_if_index = sw_if_index; @@ -1921,22 +1973,22 @@ vl_api_create_subif_t_handler (vl_api_create_subif_t * mp) template.sub.eth.flags.inner_vlan_id_any = mp->inner_vlan_id_any; template.sub.eth.outer_vlan_id = ntohs(mp->outer_vlan_id); template.sub.eth.inner_vlan_id = ntohs(mp->inner_vlan_id); - + error = vnet_create_sw_interface (vnm, &template, &sw_if_index); if (error) { clib_error_report (error); rv = VNET_API_ERROR_SUBIF_CREATE_FAILED; goto out; } - + hash_set (hi->sub_interface_sw_if_index_by_id, sub_id, sw_if_index); hash_set_mem (im->sw_if_index_by_sup_and_sub, kp, sw_if_index); - + BAD_SW_IF_INDEX_LABEL; - + out: - - REPLY_MACRO2(VL_API_CREATE_SUBIF_REPLY, + + REPLY_MACRO2(VL_API_CREATE_SUBIF_REPLY, ({ rmp->sw_if_index = ntohl(sw_if_index); })); @@ -1962,7 +2014,7 @@ vl_api_mpls_gre_add_del_tunnel_t_handler (vl_api_mpls_gre_add_del_tunnel_t *mp) mp->l2_only, mp->is_add); dsunlock (sm); - + REPLY_MACRO2(VL_API_MPLS_GRE_ADD_DEL_TUNNEL_REPLY, ({ rmp->tunnel_sw_if_index = ntohl(tunnel_sw_if_index); @@ -1970,7 +2022,7 @@ vl_api_mpls_gre_add_del_tunnel_t_handler (vl_api_mpls_gre_add_del_tunnel_t *mp) } static void -vl_api_mpls_ethernet_add_del_tunnel_t_handler +vl_api_mpls_ethernet_add_del_tunnel_t_handler (vl_api_mpls_ethernet_add_del_tunnel_t *mp) { vl_api_mpls_ethernet_add_del_tunnel_reply_t * rmp; @@ -1980,27 +2032,27 @@ vl_api_mpls_ethernet_add_del_tunnel_t_handler dslock (sm, 1 /* release hint */, 5 /* tag */); - rv = vnet_mpls_ethernet_add_del_tunnel + rv = vnet_mpls_ethernet_add_del_tunnel (mp->dst_mac_address, (ip4_address_t *)(mp->adj_address), - (u32)(mp->adj_address_length), ntohl(mp->vrf_id), + (u32)(mp->adj_address_length), ntohl(mp->vrf_id), ntohl(mp->tx_sw_if_index), &tunnel_sw_if_index, mp->l2_only, mp->is_add); dsunlock (sm); - + REPLY_MACRO2(VL_API_MPLS_ETHERNET_ADD_DEL_TUNNEL_REPLY, ({ rmp->tunnel_sw_if_index = ntohl(tunnel_sw_if_index); })); } -/* +/* * This piece of misery brought to you because the control-plane * can't figure out the tx interface + dst-mac address all by itself */ -static int mpls_ethernet_add_del_tunnel_2_t_handler +static int mpls_ethernet_add_del_tunnel_2_t_handler (vl_api_mpls_ethernet_add_del_tunnel_2_t *mp) { pending_route_t * pr; @@ -2020,28 +2072,28 @@ static int mpls_ethernet_add_del_tunnel_2_t_handler uword * p; int rv; u32 tunnel_sw_if_index; - + p = hash_get (im->fib_index_by_table_id, ntohl(mp->outer_vrf_id)); - if (!p) + if (!p) return VNET_API_ERROR_NO_SUCH_FIB; - else + else outer_fib_index = p[0]; - - + + p = hash_get (im->fib_index_by_table_id, ntohl(mp->inner_vrf_id)); - if (!p) + if (!p) return VNET_API_ERROR_NO_SUCH_INNER_FIB; - else + else inner_fib_index = p[0]; - + if (inner_fib_index == outer_fib_index) return VNET_API_ERROR_INVALID_VALUE; - lookup_result = ip4_fib_lookup_with_table - (im, outer_fib_index, - (ip4_address_t *)mp->next_hop_ip4_address_in_outer_vrf, + lookup_result = ip4_fib_lookup_with_table + (im, outer_fib_index, + (ip4_address_t *)mp->next_hop_ip4_address_in_outer_vrf, 1 /* disable default route */); - + adj = ip_get_adjacency (lm, lookup_result); tx_sw_if_index = adj->rewrite_header.sw_if_index; @@ -2055,40 +2107,40 @@ static int mpls_ethernet_add_del_tunnel_2_t_handler pme->resolve_if_needed = 0; pme->resolve_attempts = ntohl(mp->resolve_attempts); pme->resolve_opaque = tx_sw_if_index; - vnet_register_ip4_arp_resolution_event - (vnm, + vnet_register_ip4_arp_resolution_event + (vnm, (ip4_address_t *)&(pme->next_hop_ip4_address_in_outer_vrf), vpe_resolver_process_node.index, RESOLUTION_EVENT, pr - vam->pending_routes); - vlib_process_signal_event + vlib_process_signal_event (vm, vpe_resolver_process_node.index, RESOLUTION_PENDING_EVENT, 0 /* data */); /* The interface may be down, etc. */ - e = ip4_probe_neighbor + e = ip4_probe_neighbor (vm, (ip4_address_t *)&(mp->next_hop_ip4_address_in_outer_vrf), tx_sw_if_index); if (e) clib_error_report(e); - + return VNET_API_ERROR_IN_PROGRESS; } } - + if (adj->lookup_next_index != IP_LOOKUP_NEXT_REWRITE) return VNET_API_ERROR_NEXT_HOP_NOT_IN_FIB; - - dst_mac_address = + + dst_mac_address = vnet_rewrite_get_data_internal (&adj->rewrite_header, sizeof (adj->rewrite_data)); - + dslock (sm, 1 /* release hint */, 10 /* tag */); - rv = vnet_mpls_ethernet_add_del_tunnel + rv = vnet_mpls_ethernet_add_del_tunnel (dst_mac_address, (ip4_address_t *)(mp->adj_address), - (u32)(mp->adj_address_length), ntohl(mp->inner_vrf_id), + (u32)(mp->adj_address_length), ntohl(mp->inner_vrf_id), tx_sw_if_index, &tunnel_sw_if_index, mp->l2_only, mp->is_add); dsunlock (sm); @@ -2097,14 +2149,14 @@ static int mpls_ethernet_add_del_tunnel_2_t_handler } static void -vl_api_mpls_ethernet_add_del_tunnel_2_t_handler +vl_api_mpls_ethernet_add_del_tunnel_2_t_handler (vl_api_mpls_ethernet_add_del_tunnel_2_t *mp) { vl_api_mpls_ethernet_add_del_tunnel_reply_t * rmp; int rv = 0; rv = mpls_ethernet_add_del_tunnel_2_t_handler (mp); - + REPLY_MACRO(VL_API_MPLS_ETHERNET_ADD_DEL_TUNNEL_2_REPLY); } @@ -2124,17 +2176,17 @@ vl_api_mpls_add_del_encap_t_handler (vl_api_mpls_add_del_encap_t *mp) /* $$$$ fixme */ rv = vnet_mpls_add_del_encap ((ip4_address_t *)mp->dst_address, - ntohl(mp->vrf_id), labels, + ntohl(mp->vrf_id), labels, ~0 /* policy_tunnel_index */, - 0 /* no_dst_hash */, - 0 /* indexp */, + 0 /* no_dst_hash */, + 0 /* indexp */, mp->is_add); - + REPLY_MACRO(VL_API_MPLS_ADD_DEL_ENCAP_REPLY); } static void -vl_api_mpls_add_del_decap_t_handler +vl_api_mpls_add_del_decap_t_handler (vl_api_mpls_add_del_decap_t *mp) { vl_api_mpls_add_del_decap_reply_t * rmp; @@ -2143,7 +2195,7 @@ vl_api_mpls_add_del_decap_t_handler rv = vnet_mpls_add_del_decap (ntohl(mp->rx_vrf_id), ntohl(mp->tx_vrf_id), ntohl(mp->label), ntohl(mp->next_index), mp->s_bit, mp->is_add); - + REPLY_MACRO(VL_API_MPLS_ADD_DEL_DECAP_REPLY); } @@ -2174,14 +2226,14 @@ vl_api_proxy_arp_add_del_t_handler (vl_api_proxy_arp_add_del_t *mp) rv = vnet_proxy_arp_add_del ((ip4_address_t *)mp->low_address, (ip4_address_t *)mp->hi_address, fib_index, mp->is_add == 0); - + out: dsunlock (sm); REPLY_MACRO(VL_API_PROXY_ARP_ADD_DEL_REPLY); } static void -vl_api_proxy_arp_intfc_enable_disable_t_handler +vl_api_proxy_arp_intfc_enable_disable_t_handler (vl_api_proxy_arp_intfc_enable_disable_t *mp) { int rv = 0; @@ -2189,12 +2241,12 @@ vl_api_proxy_arp_intfc_enable_disable_t_handler vl_api_proxy_arp_intfc_enable_disable_reply_t *rmp; vnet_sw_interface_t * si; u32 sw_if_index; - + VALIDATE_SW_IF_INDEX(mp); sw_if_index = ntohl(mp->sw_if_index); - if (pool_is_free_index (vnm->interface_main.sw_interfaces, + if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index)) { rv = VNET_API_ERROR_INVALID_SW_IF_INDEX; goto out; @@ -2206,12 +2258,12 @@ vl_api_proxy_arp_intfc_enable_disable_t_handler if (mp->enable_disable) si->flags |= VNET_SW_INTERFACE_FLAG_PROXY_ARP; - else + else si->flags &= ~VNET_SW_INTERFACE_FLAG_PROXY_ARP; BAD_SW_IF_INDEX_LABEL; - out: + out: REPLY_MACRO(VL_API_PROXY_ARP_INTFC_ENABLE_DISABLE_REPLY); } @@ -2230,14 +2282,14 @@ vl_api_ip_neighbor_add_del_t_handler (vl_api_ip_neighbor_add_del_t *mp, vlib_mai if (mp->is_ipv6) { if (mp->is_add) - rv = vnet_set_ip6_ethernet_neighbor + rv = vnet_set_ip6_ethernet_neighbor (vm, ntohl(mp->sw_if_index), - (ip6_address_t *)(mp->dst_address), + (ip6_address_t *)(mp->dst_address), mp->mac_address, sizeof (mp->mac_address), mp->is_static); else - rv = vnet_unset_ip6_ethernet_neighbor + rv = vnet_unset_ip6_ethernet_neighbor (vm, ntohl(mp->sw_if_index), - (ip6_address_t *)(mp->dst_address), + (ip6_address_t *)(mp->dst_address), mp->mac_address, sizeof(mp->mac_address)); } else { ip4_main_t * im = &ip4_main; @@ -2253,21 +2305,21 @@ vl_api_ip_neighbor_add_del_t_handler (vl_api_ip_neighbor_add_del_t *mp, vlib_mai } fib_index = p[0]; - /* + /* * Unfortunately, folks have a penchant for * adding interface addresses to the ARP cache, and * wondering why the forwarder eventually ASSERTs... */ - ai = ip4_fib_lookup_with_table - (im, fib_index, (ip4_address_t *)(mp->dst_address), + ai = ip4_fib_lookup_with_table + (im, fib_index, (ip4_address_t *)(mp->dst_address), 1 /* disable default route */); - + if (ai != 0) { nh_adj = ip_get_adjacency (lm, ai); /* Never allow manipulation of a local adj! */ if (nh_adj->lookup_next_index == IP_LOOKUP_NEXT_LOCAL) { clib_warning("%U matches local adj", - format_ip4_address, + format_ip4_address, (ip4_address_t *)(mp->dst_address)); rv = VNET_API_ERROR_ADDRESS_MATCHES_INTERFACE_ADDRESS; goto out; @@ -2277,21 +2329,21 @@ vl_api_ip_neighbor_add_del_t_handler (vl_api_ip_neighbor_add_del_t *mp, vlib_mai clib_memcpy (&a.ethernet, mp->mac_address, 6); clib_memcpy (&a.ip4, mp->dst_address, 4); - if (mp->is_add) - rv = vnet_arp_set_ip4_over_ethernet (vnm, ntohl(mp->sw_if_index), + if (mp->is_add) + rv = vnet_arp_set_ip4_over_ethernet (vnm, ntohl(mp->sw_if_index), fib_index, &a, mp->is_static); else - rv = vnet_arp_unset_ip4_over_ethernet (vnm, ntohl(mp->sw_if_index), + rv = vnet_arp_unset_ip4_over_ethernet (vnm, ntohl(mp->sw_if_index), fib_index, &a); } - + BAD_SW_IF_INDEX_LABEL; out: dsunlock (sm); REPLY_MACRO(VL_API_IP_NEIGHBOR_ADD_DEL_REPLY); } -static void +static void vl_api_is_address_reachable_t_handler (vl_api_is_address_reachable_t *mp) { #if 0 @@ -2307,7 +2359,7 @@ vl_api_is_address_reachable_t_handler (vl_api_is_address_reachable_t *mp) vl_api_is_address_reachable_t *rmp; ip_adjacency_t * adj; unix_shared_memory_queue_t *q; - + q = vl_api_client_index_to_input_queue (mp->client_index); if (!q) { increment_missing_api_client_counter (rm->vlib_main); @@ -2321,11 +2373,11 @@ vl_api_is_address_reachable_t_handler (vl_api_is_address_reachable_t *mp) clib_memcpy (&addr, mp->address, sizeof (addr)); if (mp->is_ipv6) { lm = &im6->lookup_main; - adj_index = + adj_index = ip6_fib_lookup (im6, sw_if_index, &addr.ip6); } else { lm = &im4->lookup_main; - adj_index = + adj_index = ip4_fib_lookup (im4, sw_if_index, &addr.ip4); } if (adj_index == ~0) { @@ -2375,9 +2427,9 @@ static void vl_api_sw_interface_set_flags_t_handler ( flags = mp->admin_up_down ? VNET_SW_INTERFACE_FLAG_ADMIN_UP : 0; - error = vnet_sw_interface_set_flags (vnm, + error = vnet_sw_interface_set_flags (vnm, ntohl(mp->sw_if_index), - flags); + flags); if (error) { rv = -1; clib_error_report (error); @@ -2463,7 +2515,7 @@ static void send_sw_interface_details (vpe_api_main_t * am, mp->sup_sw_if_index = ntohl(swif->sup_sw_if_index); mp->admin_up_down = (swif->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? 1 : 0; - mp->link_up_down = (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? + mp->link_up_down = (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? 1 : 0; mp->link_duplex = ((hi->flags & VNET_HW_INTERFACE_FLAG_DUPLEX_MASK) >> VNET_HW_INTERFACE_FLAG_DUPLEX_SHIFT); @@ -2472,15 +2524,15 @@ static void send_sw_interface_details (vpe_api_main_t * am, mp->link_mtu = ntohs(hi->max_packet_bytes); mp->context = context; - strncpy ((char *) mp->interface_name, + strncpy ((char *) mp->interface_name, (char *) interface_name, ARRAY_LEN(mp->interface_name)-1); - + /* Send the L2 address for ethernet physical intfcs */ if (swif->sup_sw_if_index == swif->sw_if_index && hi->hw_class_index == ethernet_hw_interface_class.index) { ethernet_main_t *em = ethernet_get_main (am->vlib_main); ethernet_interface_t *ei; - + ei = pool_elt_at_index (em->interfaces, hi->hw_instance); ASSERT (sizeof (mp->l2_address) >= sizeof (ei->address)); clib_memcpy (mp->l2_address, ei->address, sizeof (ei->address)); @@ -2505,7 +2557,7 @@ static void send_sw_interface_details (vpe_api_main_t * am, &vtr_op, &vtr_push_dot1q, &vtr_tag1, &vtr_tag2) != 0) { // error - default to disabled mp->vtr_op = ntohl(L2_VTR_DISABLED); - clib_warning("cannot get vlan tag rewrite for sw_if_index %d", + clib_warning("cannot get vlan tag rewrite for sw_if_index %d", swif->sw_if_index); } else { mp->vtr_op = ntohl(vtr_op); @@ -2525,7 +2577,7 @@ static void send_sw_interface_flags (vpe_api_main_t * am, vl_api_sw_interface_set_flags_t *mp; vnet_main_t * vnm = am->vnet_main; - vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, + vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, swif->sw_if_index); mp = vl_msg_api_alloc (sizeof (*mp)); memset (mp, 0, sizeof (*mp)); @@ -2534,14 +2586,14 @@ static void send_sw_interface_flags (vpe_api_main_t * am, mp->admin_up_down = (swif->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? 1 : 0; - mp->link_up_down = (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? + mp->link_up_down = (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? 1 : 0; vl_msg_api_send_shmem (q, (u8 *)&mp); } static void send_sw_interface_flags_deleted (vpe_api_main_t * am, unix_shared_memory_queue_t *q, - u32 sw_if_index) + u32 sw_if_index) __attribute__((unused)); static void send_sw_interface_flags_deleted (vpe_api_main_t * am, @@ -2575,15 +2627,15 @@ static void vl_api_sw_interface_dump_t_handler ( if (q == 0) return; - + if (mp->name_filter_valid) { mp->name_filter [ARRAY_LEN(mp->name_filter)-1] = 0; filter_string = format (0, "%s%c", mp->name_filter, 0); } - pool_foreach (swif, im->sw_interfaces, + pool_foreach (swif, im->sw_interfaces, ({ - name_string = format (name_string, "%U%c", + name_string = format (name_string, "%U%c", format_vnet_sw_interface_name, am->vnet_main, swif, 0); @@ -2591,7 +2643,6 @@ static void vl_api_sw_interface_dump_t_handler ( strcasestr((char *) name_string, (char *) filter_string)) { send_sw_interface_details (am, q, swif, name_string, mp->context); - send_sw_interface_flags (am, q, swif); } _vec_len (name_string) = 0; })); @@ -2607,7 +2658,7 @@ void send_oam_event (oam_target_t * t) vpe_client_registration_t *reg; vl_api_oam_event_t * mp; - pool_foreach(reg, vam->oam_events_registrations, + pool_foreach(reg, vam->oam_events_registrations, ({ q = vl_api_client_index_to_input_queue (reg->client_index); if (q) { @@ -2649,10 +2700,10 @@ vl_api_vnet_get_summary_stats_t_handler ( unix_shared_memory_queue_t * q = vl_api_client_index_to_input_queue (mp->client_index); - + if (!q) return; - + rmp = vl_msg_api_alloc (sizeof (*rmp)); rmp->_vl_msg_id = ntohs(VL_API_VNET_SUMMARY_STATS_REPLY); rmp->context = mp->context; @@ -2714,7 +2765,7 @@ static int ip4_reset_fib_t_handler (vl_api_reset_fib_t *mp) if (fib->table_id != target_fib_id) continue; - + /* remove any mpls/gre tunnels in this fib */ vnet_mpls_gre_delete_fib_tunnels (fib->table_id); @@ -2739,7 +2790,7 @@ static int ip4_reset_fib_t_handler (vl_api_reset_fib_t *mp) fib - im4->fibs)) vec_add1 (sw_if_indices_to_shut, si->sw_if_index); })); - + for (i = 0; i < vec_len (sw_if_indices_to_shut); i++) { sw_if_index = sw_if_indices_to_shut[i]; // vec_foreach (sw_if_index, sw_if_indices_to_shut) { @@ -2758,13 +2809,13 @@ static int ip4_reset_fib_t_handler (vl_api_reset_fib_t *mp) x.address_length = i; - hash_foreach_pair (p, hash, + hash_foreach_pair (p, hash, ({ x.address.data_u32 = p->key; vec_add1 (routes, x); })); } - + vec_foreach (r, routes) { ip4_add_del_route_args_t a; @@ -2776,9 +2827,9 @@ static int ip4_reset_fib_t_handler (vl_api_reset_fib_t *mp) a.adj_index = ~0; ip4_add_del_route (im4, &a); - ip4_maybe_remap_adjacencies (im4, fib - im4->fibs, + ip4_maybe_remap_adjacencies (im4, fib - im4->fibs, IP4_ROUTE_FLAG_FIB_INDEX); - } + } rv = 0; break; } /* vec_foreach (fib) */ @@ -2848,7 +2899,7 @@ static int ip6_reset_fib_t_handler (vl_api_reset_fib_t *mp) fib - im6->fibs) vec_add1 (sw_if_indices_to_shut, si->sw_if_index); })); - + for (i = 0; i < vec_len (sw_if_indices_to_shut); i++) { sw_if_index = sw_if_indices_to_shut[i]; // vec_foreach (sw_if_index, sw_if_indices_to_shut) { @@ -2876,9 +2927,9 @@ static int ip6_reset_fib_t_handler (vl_api_reset_fib_t *mp) a.adj_index = ~0; ip6_add_del_route (im6, &a); - ip6_maybe_remap_adjacencies (im6, fib - im6->fibs, + ip6_maybe_remap_adjacencies (im6, fib - im6->fibs, IP6_ROUTE_FLAG_FIB_INDEX); - } + } rv = 0; /* Reinstall the neighbor / router discovery routes */ vnet_ip6_fib_init (im6, fib - im6->fibs); @@ -2898,7 +2949,7 @@ static void vl_api_reset_fib_t_handler (vl_api_reset_fib_t *mp) rv = ip6_reset_fib_t_handler (mp); else rv = ip4_reset_fib_t_handler (mp); - + REPLY_MACRO(VL_API_RESET_FIB_REPLY); } @@ -2914,7 +2965,7 @@ dhcpv4_proxy_config (vl_api_dhcp_proxy_config_t *mp) (u32) ntohl(mp->vrf_id), (int) mp->insert_circuit_id, (int) (mp->is_add == 0)); - + REPLY_MACRO(VL_API_DHCP_PROXY_CONFIG_REPLY); } @@ -2930,7 +2981,7 @@ dhcpv6_proxy_config (vl_api_dhcp_proxy_config_t *mp) (u32) ntohl(mp->vrf_id), (int) mp->insert_circuit_id, (int) (mp->is_add == 0)); - + REPLY_MACRO(VL_API_DHCP_PROXY_CONFIG_REPLY); } @@ -2946,7 +2997,7 @@ dhcpv4_proxy_config_2 (vl_api_dhcp_proxy_config_2_t *mp) (u32) ntohl(mp->server_vrf_id), (int) mp->insert_circuit_id, (int) (mp->is_add == 0)); - + REPLY_MACRO(VL_API_DHCP_PROXY_CONFIG_2_REPLY); } @@ -2967,7 +3018,7 @@ dhcpv6_proxy_config_2 (vl_api_dhcp_proxy_config_2_t *mp) #else rv = VNET_API_ERROR_UNIMPLEMENTED; #endif - + REPLY_MACRO(VL_API_DHCP_PROXY_CONFIG_2_REPLY); } @@ -2977,7 +3028,7 @@ vl_api_dhcp_proxy_set_vss_t_handler (vl_api_dhcp_proxy_set_vss_t *mp) { vl_api_dhcp_proxy_set_vss_reply_t *rmp; int rv; - if (!mp->is_ipv6) + if (!mp->is_ipv6) rv = dhcp_proxy_set_option82_vss(ntohl(mp->tbl_id), ntohl(mp->oui), ntohl(mp->fib_id), @@ -2987,12 +3038,12 @@ vl_api_dhcp_proxy_set_vss_t_handler (vl_api_dhcp_proxy_set_vss_t *mp) ntohl(mp->oui), ntohl(mp->fib_id), (int)mp->is_add == 0); - + REPLY_MACRO(VL_API_DHCP_PROXY_SET_VSS_REPLY); } -static void vl_api_dhcp_proxy_config_t_handler +static void vl_api_dhcp_proxy_config_t_handler (vl_api_dhcp_proxy_config_t *mp) { if (mp->is_ipv6 == 0) @@ -3001,7 +3052,7 @@ static void vl_api_dhcp_proxy_config_t_handler dhcpv6_proxy_config (mp); } -static void vl_api_dhcp_proxy_config_2_t_handler +static void vl_api_dhcp_proxy_config_2_t_handler (vl_api_dhcp_proxy_config_2_t *mp) { if (mp->is_ipv6 == 0) @@ -3035,7 +3086,7 @@ void dhcp_compl_event_callback (u32 client_index, u32 pid, u8 * hostname, vl_msg_api_send_shmem (q, (u8 *)&mp); } -static void vl_api_dhcp_client_config_t_handler +static void vl_api_dhcp_client_config_t_handler (vl_api_dhcp_client_config_t *mp) { vlib_main_t *vm = vlib_get_main(); @@ -3044,7 +3095,7 @@ static void vl_api_dhcp_client_config_t_handler VALIDATE_SW_IF_INDEX(mp); - rv = dhcp_client_config(vm, ntohl(mp->sw_if_index), + rv = dhcp_client_config(vm, ntohl(mp->sw_if_index), mp->hostname, mp->is_add, mp->client_index, mp->want_dhcp_event ? dhcp_compl_event_callback : NULL, mp->pid); @@ -3055,13 +3106,13 @@ static void vl_api_dhcp_client_config_t_handler } static void -vl_api_sw_interface_ip6nd_ra_config_t_handler +vl_api_sw_interface_ip6nd_ra_config_t_handler (vl_api_sw_interface_ip6nd_ra_config_t *mp, vlib_main_t *vm) { vl_api_sw_interface_ip6nd_ra_config_reply_t * rmp; int rv = 0; u8 is_no, surpress, managed, other, ll_option, send_unicast, cease, default_router; - + is_no = mp->is_no == 1; surpress = mp->surpress == 1; managed = mp->managed == 1; @@ -3073,11 +3124,11 @@ vl_api_sw_interface_ip6nd_ra_config_t_handler VALIDATE_SW_IF_INDEX(mp); - rv = ip6_neighbor_ra_config(vm, ntohl(mp->sw_if_index), + rv = ip6_neighbor_ra_config(vm, ntohl(mp->sw_if_index), surpress, managed, other, - ll_option, send_unicast, cease, + ll_option, send_unicast, cease, default_router, ntohl (mp->lifetime), - ntohl(mp->initial_count), ntohl(mp->initial_interval), + ntohl(mp->initial_count), ntohl(mp->initial_interval), ntohl(mp->max_interval), ntohl( mp->min_interval), is_no); @@ -3087,13 +3138,13 @@ vl_api_sw_interface_ip6nd_ra_config_t_handler } static void -vl_api_sw_interface_ip6nd_ra_prefix_t_handler +vl_api_sw_interface_ip6nd_ra_prefix_t_handler (vl_api_sw_interface_ip6nd_ra_prefix_t *mp, vlib_main_t *vm) { vl_api_sw_interface_ip6nd_ra_prefix_reply_t * rmp; int rv = 0; u8 is_no, use_default, no_advertise, off_link, no_autoconfig, no_onlink; - + VALIDATE_SW_IF_INDEX(mp); is_no = mp->is_no == 1; @@ -3102,8 +3153,8 @@ vl_api_sw_interface_ip6nd_ra_prefix_t_handler off_link = mp->off_link == 1; no_autoconfig = mp->no_autoconfig == 1; no_onlink = mp->no_onlink == 1; - - rv = ip6_neighbor_ra_prefix(vm, ntohl(mp->sw_if_index), + + rv = ip6_neighbor_ra_prefix(vm, ntohl(mp->sw_if_index), (ip6_address_t *)mp->address, mp->address_length, use_default, ntohl(mp->val_lifetime), ntohl(mp->pref_lifetime), no_advertise, off_link, no_autoconfig, no_onlink, @@ -3114,7 +3165,7 @@ vl_api_sw_interface_ip6nd_ra_prefix_t_handler } static void -vl_api_sw_interface_ip6_enable_disable_t_handler +vl_api_sw_interface_ip6_enable_disable_t_handler (vl_api_sw_interface_ip6_enable_disable_t *mp, vlib_main_t *vm) { vl_api_sw_interface_ip6_enable_disable_reply_t * rmp; @@ -3128,21 +3179,21 @@ vl_api_sw_interface_ip6_enable_disable_t_handler error = ( mp->enable == 1) ? enable_ip6_interface(vm,ntohl(mp->sw_if_index)) : disable_ip6_interface(vm,ntohl(mp->sw_if_index)); - + if (error) { clib_error_report(error); rv = VNET_API_ERROR_UNSPECIFIED; } else { rv = vnm->api_errno; } - + BAD_SW_IF_INDEX_LABEL; REPLY_MACRO(VL_API_SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY); } static void -vl_api_sw_interface_ip6_set_link_local_address_t_handler +vl_api_sw_interface_ip6_set_link_local_address_t_handler (vl_api_sw_interface_ip6_set_link_local_address_t *mp, vlib_main_t *vm) { vl_api_sw_interface_ip6_set_link_local_address_reply_t * rmp; @@ -3166,7 +3217,7 @@ vl_api_sw_interface_ip6_set_link_local_address_t_handler } BAD_SW_IF_INDEX_LABEL; - + REPLY_MACRO(VL_API_SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS_REPLY); } @@ -3176,7 +3227,7 @@ static void set_ip6_flow_hash (vl_api_set_ip_flow_hash_t *mp) int rv = VNET_API_ERROR_UNIMPLEMENTED; clib_warning ("unimplemented..."); - + REPLY_MACRO(VL_API_SET_IP_FLOW_HASH_REPLY); } @@ -3208,7 +3259,7 @@ static void vl_api_set_ip_flow_hash_t_handler set_ip6_flow_hash (mp); } -static void vl_api_sw_interface_set_unnumbered_t_handler +static void vl_api_sw_interface_set_unnumbered_t_handler (vl_api_sw_interface_set_unnumbered_t *mp) { vl_api_sw_interface_set_unnumbered_reply_t * rmp; @@ -3221,18 +3272,18 @@ static void vl_api_sw_interface_set_unnumbered_t_handler unnumbered_sw_if_index = ntohl(mp->unnumbered_sw_if_index); /* - * The API message field names are backwards from + * The API message field names are backwards from * the underlying data structure names. * It's not worth changing them now. */ - if (pool_is_free_index (vnm->interface_main.sw_interfaces, + if (pool_is_free_index (vnm->interface_main.sw_interfaces, unnumbered_sw_if_index)) { rv = VNET_API_ERROR_INVALID_SW_IF_INDEX; goto done; } - + /* Only check the "use loop0" field when setting the binding */ - if (mp->is_add && + if (mp->is_add && pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index)) { rv = VNET_API_ERROR_INVALID_SW_IF_INDEX_2; goto done; @@ -3247,7 +3298,7 @@ static void vl_api_sw_interface_set_unnumbered_t_handler si->flags &= ~(VNET_SW_INTERFACE_FLAG_UNNUMBERED); si->unnumbered_sw_if_index = (u32)~0; } - + done: REPLY_MACRO(VL_API_SW_INTERFACE_SET_UNNUMBERED_REPLY); } @@ -3258,7 +3309,7 @@ static void vl_api_create_loopback_t_handler vl_api_create_loopback_reply_t * rmp; u32 sw_if_index; int rv; - + rv = vnet_create_loopback_interface (&sw_if_index, mp->mac_address); REPLY_MACRO2(VL_API_CREATE_LOOPBACK_REPLY, @@ -3306,7 +3357,7 @@ static void shmem_cli_output (uword arg, u8 * buffer, uword buffer_bytes) pthread_mutex_lock (&am->vlib_rp->mutex); oldheap = svm_push_data_heap (am->vlib_rp); - + vec_validate (shmem_vec, offset + buffer_bytes - 1); clib_memcpy (shmem_vec + offset, buffer, buffer_bytes); @@ -3318,7 +3369,7 @@ static void shmem_cli_output (uword arg, u8 * buffer, uword buffer_bytes) } -static void vl_api_cli_request_t_handler +static void vl_api_cli_request_t_handler (vl_api_cli_request_t *mp) { vl_api_cli_reply_t *rp; @@ -3339,12 +3390,12 @@ static void vl_api_cli_request_t_handler unformat_init_vector (&input, (u8 *)(uword)mp->cmd_in_shmem); - vlib_cli_input (vm, &input, shmem_cli_output, + vlib_cli_input (vm, &input, shmem_cli_output, (uword)&shmem_vec); pthread_mutex_lock (&am->vlib_rp->mutex); oldheap = svm_push_data_heap (am->vlib_rp); - + vec_add1(shmem_vec, 0); svm_pop_heap (oldheap); @@ -3368,7 +3419,7 @@ static void vl_api_set_arp_neighbor_limit_t_handler (vl_api_set_arp_neighbor_lim error = ip6_set_neighbor_limit (ntohl(mp->arp_neighbor_limit)); else error = ip4_set_arp_limit (ntohl(mp->arp_neighbor_limit)); - + if (error) { clib_error_report(error); rv = VNET_API_ERROR_UNSPECIFIED; @@ -3406,15 +3457,15 @@ static void vl_api_sr_tunnel_add_del_t_handler a->is_del = (mp->is_add == 0); a->rx_table_id = ntohl(mp->outer_vrf_id); a->tx_table_id = ntohl(mp->inner_vrf_id); - + a->name = format(0, "%s", mp->name); if (!(vec_len(a->name))) a->name = 0; - + a->policy_name = format(0, "%s", mp->policy_name); if (!(vec_len(a->policy_name))) a->policy_name = 0; - + /* Yank segments and tags out of the API message */ this_address = (ip6_address_t *)mp->segs_and_tags; for (i = 0; i < mp->n_segments; i++) { @@ -3452,13 +3503,13 @@ static void vl_api_sr_policy_add_del_t_handler memset (a, 0, sizeof (*a)); a->is_del = (mp->is_add == 0); - + a->name = format(0, "%s", mp->name); if (!(vec_len(a->name))) { rv = VNET_API_ERROR_NO_SUCH_NODE2; goto out; - } + } if (!(mp->tunnel_names[0])) { @@ -3484,7 +3535,7 @@ static void vl_api_sr_policy_add_del_t_handler deser_tun_names += tun_name_len; tun_name = 0; } - + rv = ip6_sr_add_del_policy (a); out: @@ -3505,19 +3556,19 @@ static void vl_api_sr_multicast_map_add_del_t_handler memset (a, 0, sizeof (*a)); a->is_del = (mp->is_add == 0); - + a->multicast_address = (ip6_address_t *)&mp->multicast_address; a->policy_name = format(0, "%s", mp->policy_name); if (a->multicast_address == 0) { - rv = -1 ; + rv = -1 ; goto out; - } + } if (!(a->policy_name)) { - rv = -2 ; + rv = -2 ; goto out; } @@ -3555,23 +3606,23 @@ static void vl_api_classify_add_del_table_t_handler foreach_classify_add_del_table_field; #undef _ -#define _(a) a = ntohl(mp->a); +#define _(a) a = ntohl(mp->a); foreach_classify_add_del_table_field; #undef _ /* The underlying API fails silently, on purpose, so check here */ - if (mp->is_add == 0) + if (mp->is_add == 0) if (pool_is_free_index (cm->tables, table_index)) { rv = VNET_API_ERROR_NO_SUCH_TABLE; goto out; } - rv = vnet_classify_add_del_table - (cm, mp->mask, nbuckets, memory_size, - skip_n_vectors, match_n_vectors, + rv = vnet_classify_add_del_table + (cm, mp->mask, nbuckets, memory_size, + skip_n_vectors, match_n_vectors, next_table_index, miss_next_index, &table_index, mp->is_add); - + out: REPLY_MACRO2(VL_API_CLASSIFY_ADD_DEL_TABLE_REPLY, ({ @@ -3601,15 +3652,15 @@ static void vl_api_classify_add_del_session_t_handler hit_next_index = ntohl (mp->hit_next_index); opaque_index = ntohl (mp->opaque_index); advance = ntohl (mp->advance); - - rv = vnet_classify_add_del_session + + rv = vnet_classify_add_del_session (cm, table_index, mp->match, hit_next_index, opaque_index, advance, mp->is_add); REPLY_MACRO(VL_API_CLASSIFY_ADD_DEL_SESSION_REPLY); } -static void vl_api_classify_set_interface_ip_table_t_handler +static void vl_api_classify_set_interface_ip_table_t_handler (vl_api_classify_set_interface_ip_table_t * mp) { vlib_main_t * vm = vlib_get_main(); @@ -3619,7 +3670,7 @@ static void vl_api_classify_set_interface_ip_table_t_handler table_index = ntohl (mp->table_index); sw_if_index = ntohl (mp->sw_if_index); - + VALIDATE_SW_IF_INDEX(mp); if (mp->is_ipv6) @@ -3632,7 +3683,7 @@ static void vl_api_classify_set_interface_ip_table_t_handler REPLY_MACRO(VL_API_CLASSIFY_SET_INTERFACE_IP_TABLE_REPLY); } -static void vl_api_classify_set_interface_l2_tables_t_handler +static void vl_api_classify_set_interface_l2_tables_t_handler (vl_api_classify_set_interface_l2_tables_t * mp) { vl_api_classify_set_interface_l2_tables_reply_t * rmp; @@ -3647,16 +3698,16 @@ static void vl_api_classify_set_interface_l2_tables_t_handler VALIDATE_SW_IF_INDEX(mp); - rv = vnet_l2_classify_set_tables (sw_if_index, ip4_table_index, + rv = vnet_l2_classify_set_tables (sw_if_index, ip4_table_index, ip6_table_index, other_table_index); if (rv == 0) { - if (ip4_table_index != ~0 || ip6_table_index != ~0 + if (ip4_table_index != ~0 || ip6_table_index != ~0 || other_table_index != ~0) enable = 1; else enable = 0; - + vnet_l2_classify_enable_disable (sw_if_index, enable); } @@ -3665,7 +3716,7 @@ static void vl_api_classify_set_interface_l2_tables_t_handler REPLY_MACRO(VL_API_CLASSIFY_SET_INTERFACE_L2_TABLES_REPLY); } -static void +static void vl_api_l2_fib_clear_table_t_handler (vl_api_l2_fib_clear_table_t *mp) { int rv = 0; @@ -3684,7 +3735,7 @@ extern void l2_efp_filter_configure(vnet_main_t * vnet_main, u32 sw_if_index, u32 enable); -static void +static void vl_api_l2_interface_efp_filter_t_handler (vl_api_l2_interface_efp_filter_t *mp) { int rv; @@ -3698,7 +3749,7 @@ vl_api_l2_interface_efp_filter_t_handler (vl_api_l2_interface_efp_filter_t *mp) REPLY_MACRO(VL_API_L2_INTERFACE_EFP_FILTER_REPLY); } -static void +static void vl_api_l2_interface_vlan_tag_rewrite_t_handler (vl_api_l2_interface_vlan_tag_rewrite_t *mp) { int rv = 0; @@ -3729,10 +3780,10 @@ vl_api_l2_interface_vlan_tag_rewrite_t_handler (vl_api_l2_interface_vlan_tag_rew goto bad_sw_if_index; } - rv = l2vtr_configure (vm, vnm, ntohl(mp->sw_if_index), vtr_op, - ntohl(mp->push_dot1q), ntohl(mp->tag1), + rv = l2vtr_configure (vm, vnm, ntohl(mp->sw_if_index), vtr_op, + ntohl(mp->push_dot1q), ntohl(mp->tag1), ntohl(mp->tag2)); - + BAD_SW_IF_INDEX_LABEL; REPLY_MACRO(VL_API_L2_INTERFACE_VLAN_TAG_REWRITE_REPLY); @@ -4001,7 +4052,7 @@ vl_api_sw_if_l2tpv3_tunnel_dump_t_handler ( if (q == 0) return; - pool_foreach (session, lm->sessions, + pool_foreach (session, lm->sessions, ({ send_sw_if_l2tpv3_tunnel_details (am, q, session, lm, mp->context); })); @@ -4135,7 +4186,7 @@ vl_api_l2_fib_table_dump_t_handler (vl_api_l2_fib_table_dump_t *mp) p = hash_get (bdm->bd_index_by_bd_id, bd_id); if (p == 0) return; - + bd_index = p[0]; } @@ -4160,10 +4211,10 @@ vl_api_show_version_t_handler (vl_api_show_version_t *mp) unix_shared_memory_queue_t * q = vl_api_client_index_to_input_queue (mp->client_index); - + if (!q) return; - + REPLY_MACRO2(VL_API_SHOW_VERSION_REPLY, ({ strncpy ((char *) rmp->program, "vpe", ARRAY_LEN(rmp->program)-1); @@ -4192,7 +4243,7 @@ static void vl_api_get_node_index_t_handler else node_index = n->index; - REPLY_MACRO2(VL_API_GET_NODE_INDEX_REPLY, + REPLY_MACRO2(VL_API_GET_NODE_INDEX_REPLY, ({ rmp->node_index = ntohl(node_index); })) @@ -4216,26 +4267,26 @@ static void vl_api_add_node_next_t_handler next = vlib_get_node_by_name (vm, mp->next_name); - if (next == 0) + if (next == 0) rv = VNET_API_ERROR_NO_SUCH_NODE2; - else + else next_index = vlib_node_add_next (vm, n->index, next->index); out: - REPLY_MACRO2(VL_API_GET_NODE_INDEX_REPLY, + REPLY_MACRO2(VL_API_GET_NODE_INDEX_REPLY, ({ rmp->next_index = ntohl(next_index); })) } -static void vl_api_l2tpv3_create_tunnel_t_handler +static void vl_api_l2tpv3_create_tunnel_t_handler (vl_api_l2tpv3_create_tunnel_t *mp) { vl_api_l2tpv3_create_tunnel_reply_t * rmp; l2t_main_t *lm = &l2t_main; u32 sw_if_index = (u32)~0; int rv; - + if (mp->is_ipv6 != 1) { rv = VNET_API_ERROR_UNIMPLEMENTED; goto out; @@ -4248,7 +4299,7 @@ static void vl_api_l2tpv3_create_tunnel_t_handler ntohl(mp->remote_session_id), clib_net_to_host_u64(mp->local_cookie), clib_net_to_host_u64(mp->remote_cookie), - mp->l2_sublayer_present, + mp->l2_sublayer_present, &sw_if_index); out: @@ -4258,7 +4309,7 @@ out: })) } -static void vl_api_l2tpv3_set_tunnel_cookies_t_handler +static void vl_api_l2tpv3_set_tunnel_cookies_t_handler (vl_api_l2tpv3_set_tunnel_cookies_t *mp) { vl_api_l2tpv3_set_tunnel_cookies_reply_t * rmp; @@ -4272,11 +4323,11 @@ static void vl_api_l2tpv3_set_tunnel_cookies_t_handler clib_net_to_host_u64(mp->new_remote_cookie)); BAD_SW_IF_INDEX_LABEL; - + REPLY_MACRO (VL_API_L2TPV3_SET_TUNNEL_COOKIES_REPLY); } -static void vl_api_l2tpv3_interface_enable_disable_t_handler +static void vl_api_l2tpv3_interface_enable_disable_t_handler (vl_api_l2tpv3_interface_enable_disable_t * mp) { int rv; @@ -4285,7 +4336,7 @@ static void vl_api_l2tpv3_interface_enable_disable_t_handler VALIDATE_SW_IF_INDEX(mp); - rv = l2tpv3_interface_enable_disable + rv = l2tpv3_interface_enable_disable (vnm, ntohl(mp->sw_if_index), mp->enable_disable); BAD_SW_IF_INDEX_LABEL; @@ -4293,7 +4344,7 @@ static void vl_api_l2tpv3_interface_enable_disable_t_handler REPLY_MACRO (VL_API_L2TPV3_INTERFACE_ENABLE_DISABLE_REPLY); } -static void vl_api_l2tpv3_set_lookup_key_t_handler +static void vl_api_l2tpv3_set_lookup_key_t_handler (vl_api_l2tpv3_set_lookup_key_t * mp) { int rv = 0; @@ -4304,14 +4355,14 @@ static void vl_api_l2tpv3_set_lookup_key_t_handler rv = VNET_API_ERROR_INVALID_VALUE; goto out; } - + lm->lookup_type = mp->key; out: REPLY_MACRO (VL_API_L2TPV3_SET_LOOKUP_KEY_REPLY); } -static void vl_api_vxlan_add_del_tunnel_t_handler +static void vl_api_vxlan_add_del_tunnel_t_handler (vl_api_vxlan_add_del_tunnel_t * mp) { vl_api_vxlan_add_del_tunnel_reply_t * rmp; @@ -4353,7 +4404,7 @@ static void vl_api_vxlan_add_del_tunnel_t_handler a->decap_next_index = ntohl(mp->decap_next_index); a->vni = ntohl(mp->vni); rv = vnet_vxlan_add_del_tunnel (a, &sw_if_index); - + out: REPLY_MACRO2(VL_API_VXLAN_ADD_DEL_TUNNEL_REPLY, ({ @@ -4510,23 +4561,23 @@ static void vl_api_gre_tunnel_dump_t_handler } } -static void +static void vl_api_l2_patch_add_del_t_handler (vl_api_l2_patch_add_del_t *mp) { extern int vnet_l2_patch_add_del (u32 rx_sw_if_index, u32 tx_sw_if_index, int is_add); vl_api_l2_patch_add_del_reply_t * rmp; - int vnet_l2_patch_add_del (u32 rx_sw_if_index, u32 tx_sw_if_index, + int vnet_l2_patch_add_del (u32 rx_sw_if_index, u32 tx_sw_if_index, int is_add); int rv = 0; VALIDATE_RX_SW_IF_INDEX(mp); VALIDATE_TX_SW_IF_INDEX(mp); - rv = vnet_l2_patch_add_del (ntohl(mp->rx_sw_if_index), - ntohl(mp->tx_sw_if_index), + rv = vnet_l2_patch_add_del (ntohl(mp->rx_sw_if_index), + ntohl(mp->tx_sw_if_index), (int)(mp->is_add != 0)); - + BAD_RX_SW_IF_INDEX_LABEL; BAD_TX_SW_IF_INDEX_LABEL; @@ -4534,7 +4585,7 @@ vl_api_l2_patch_add_del_t_handler (vl_api_l2_patch_add_del_t *mp) } static void -vl_api_vxlan_gpe_add_del_tunnel_t_handler +vl_api_vxlan_gpe_add_del_tunnel_t_handler (vl_api_vxlan_gpe_add_del_tunnel_t * mp) { vl_api_vxlan_gpe_add_del_tunnel_reply_t * rmp; @@ -4554,7 +4605,7 @@ vl_api_vxlan_gpe_add_del_tunnel_t_handler } encap_fib_index = p[0]; - protocol = ntohl(mp->protocol); + protocol = mp->protocol; /* Interpret decap_vrf_id as an opaque if sending to other-than-ip4-input */ if (protocol == VXLAN_GPE_INPUT_NEXT_IP4_INPUT) { @@ -4569,8 +4620,8 @@ vl_api_vxlan_gpe_add_del_tunnel_t_handler } /* Check src & dst are different */ - if ((a->is_ip6 && memcmp(mp->local, mp->remote, 16) == 0) || - (!a->is_ip6 && memcmp(mp->local, mp->remote, 4) == 0)) { + if ((mp->is_ipv6 && memcmp(mp->local, mp->remote, 16) == 0) || + (!mp->is_ipv6 && memcmp(mp->local, mp->remote, 4) == 0)) { rv = VNET_API_ERROR_SAME_SRC_DST; goto out; } @@ -4591,7 +4642,7 @@ vl_api_vxlan_gpe_add_del_tunnel_t_handler a->protocol = protocol; a->vni = ntohl(mp->vni); rv = vnet_vxlan_gpe_add_del_tunnel (a, &sw_if_index); - + out: REPLY_MACRO2(VL_API_VXLAN_GPE_ADD_DEL_TUNNEL_REPLY, ({ @@ -4599,6 +4650,67 @@ out: })); } +static void send_vxlan_gpe_tunnel_details +(vxlan_gpe_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context) +{ + vl_api_vxlan_gpe_tunnel_details_t * rmp; + ip4_main_t * im4 = &ip4_main; + ip6_main_t * im6 = &ip6_main; + u8 is_ipv6 = !(t->flags & VXLAN_GPE_TUNNEL_IS_IPV4); + + rmp = vl_msg_api_alloc (sizeof (*rmp)); + memset (rmp, 0, sizeof (*rmp)); + rmp->_vl_msg_id = ntohs(VL_API_VXLAN_GPE_TUNNEL_DETAILS); + if (is_ipv6) { + memcpy(rmp->local, &(t->local.ip6), 16); + memcpy(rmp->remote, &(t->remote.ip6), 16); + rmp->encap_vrf_id = htonl(im6->fibs[t->encap_fib_index].table_id); + rmp->decap_vrf_id = htonl(im6->fibs[t->decap_fib_index].table_id); + } else { + memcpy(rmp->local, &(t->local.ip4), 4); + memcpy(rmp->remote, &(t->remote.ip4), 4); + rmp->encap_vrf_id = htonl(im4->fibs[t->encap_fib_index].table_id); + rmp->decap_vrf_id = htonl(im4->fibs[t->decap_fib_index].table_id); + } + rmp->vni = htonl(t->vni); + rmp->protocol = t->protocol; + rmp->sw_if_index = htonl(t->sw_if_index); + rmp->is_ipv6 = is_ipv6; + rmp->context = context; + + vl_msg_api_send_shmem (q, (u8 *)&rmp); +} + +static void vl_api_vxlan_gpe_tunnel_dump_t_handler +(vl_api_vxlan_gpe_tunnel_dump_t * mp) +{ + unix_shared_memory_queue_t * q; + vxlan_gpe_main_t * vgm = &vxlan_gpe_main; + vxlan_gpe_tunnel_t * t; + u32 sw_if_index; + + q = vl_api_client_index_to_input_queue (mp->client_index); + if (q == 0) { + return; + } + + sw_if_index = ntohl(mp->sw_if_index); + + if (~0 == sw_if_index) { + pool_foreach (t, vgm->tunnels, + ({ + send_vxlan_gpe_tunnel_details(t, q, mp->context); + })); + } else { + if ((sw_if_index >= vec_len(vgm->tunnel_index_by_sw_if_index)) || + (~0 == vgm->tunnel_index_by_sw_if_index[sw_if_index])) { + return; + } + t = &vgm->tunnels[vgm->tunnel_index_by_sw_if_index[sw_if_index]]; + send_vxlan_gpe_tunnel_details(t, q, mp->context); + } +} + static void vl_api_lisp_add_del_locator_set_t_handler(vl_api_lisp_add_del_locator_set_t *mp) { @@ -4617,7 +4729,7 @@ vl_api_lisp_add_del_locator_set_t_handler(vl_api_lisp_add_del_locator_set_t *mp) a->is_add = mp->is_add; a->local = 1; - rv = vnet_lisp_add_del_locator_set_name(a, &ls_index); + rv = vnet_lisp_add_del_locator_set(a, &ls_index); vec_free(locator_name); @@ -4651,7 +4763,7 @@ vl_api_lisp_add_del_locator_t_handler( a->is_add = mp->is_add; a->local = 1; - rv = vnet_lisp_add_del_locator(a, &ls_index); + rv = vnet_lisp_add_del_locator(a, NULL, &ls_index); vec_free(locators); vec_free(locator_name); @@ -4673,6 +4785,7 @@ vl_api_lisp_add_del_local_eid_t_handler( u32 locator_set_index = ~0, map_index = ~0; vnet_lisp_add_del_mapping_args_t _a, *a = &_a; u8 *name = NULL; + memset (a, 0, sizeof (a[0])); prefp = &gid_address_ippref(&eid); ip_eid = &ip_prefix_addr(prefp); @@ -4699,18 +4812,30 @@ vl_api_lisp_add_del_local_eid_t_handler( /* XXX treat batch configuration */ a->is_add = mp->is_add; + gid_address_vni (&eid) = clib_net_to_host_u32 (mp->vni); a->deid = eid; a->locator_set_index = locator_set_index; a->local = 1; - rv = vnet_lisp_add_del_local_mapping(a, &map_index); out: vec_free(name); + gid_address_free (&a->deid); REPLY_MACRO(VL_API_LISP_ADD_DEL_LOCAL_EID_REPLY); } +static void +vl_api_lisp_eid_table_add_del_map_t_handler( + vl_api_lisp_eid_table_add_del_map_t *mp) +{ + vl_api_lisp_eid_table_add_del_map_reply_t *rmp; + int rv = 0; + rv = vnet_lisp_eid_table_map (clib_net_to_host_u32 (mp->vni), + clib_net_to_host_u32 (mp->vrf), mp->is_add); + REPLY_MACRO(VL_API_LISP_EID_TABLE_ADD_DEL_MAP_REPLY) +} + static void lisp_gpe_add_del_fwd_entry_set_address( vl_api_lisp_gpe_add_del_fwd_entry_t *mp, @@ -4838,7 +4963,7 @@ vl_api_lisp_gpe_add_del_iface_t_handler( a->is_add = mp->is_add; a->table_id = mp->table_id; a->vni = mp->vni; - vnet_lisp_gpe_add_del_iface (a, 0); + rv = vnet_lisp_gpe_add_del_iface (a, 0); REPLY_MACRO(VL_API_LISP_GPE_ADD_DEL_IFACE_REPLY); } @@ -4858,6 +4983,27 @@ vl_api_lisp_pitr_set_locator_set_t_handler( REPLY_MACRO(VL_API_LISP_PITR_SET_LOCATOR_SET_REPLY); } +static void +vl_api_lisp_add_del_map_request_itr_rlocs_t_handler +(vl_api_lisp_add_del_map_request_itr_rlocs_t *mp) +{ + vl_api_lisp_add_del_map_request_itr_rlocs_reply_t *rmp; + int rv = 0; + u8 * locator_set_name = NULL; + vnet_lisp_add_del_mreq_itr_rloc_args_t _a, * a = &_a; + + locator_set_name = format (0, "%s", mp->locator_set_name); + + a->is_add = mp->is_add; + a->locator_set_name = locator_set_name; + + rv = vnet_lisp_add_del_mreq_itr_rlocs(a); + + vec_free(locator_set_name); + + REPLY_MACRO(VL_API_LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS_REPLY); +} + /** Used for transferring locators via VPP API */ typedef CLIB_PACKED(struct { @@ -4901,8 +5047,8 @@ vl_api_lisp_add_del_remote_mapping_t_handler ( ip_address_t * deid_addr = &ip_prefix_addr(deid_pref); ip_prefix_len(seid_pref) = mp->seid_len; ip_prefix_len(deid_pref) = mp->deid_len; - gid_address_set_vni (seid, ntohl (mp->vni)); - gid_address_set_vni (deid, ntohl (mp->vni)); + gid_address_vni (seid) = ntohl (mp->vni); + gid_address_vni (deid) = ntohl (mp->vni); if (mp->eid_is_ip4) { ip_prefix_version(seid_pref) = IP4; @@ -4932,8 +5078,8 @@ vl_api_lisp_add_del_remote_mapping_t_handler ( vec_add1 (rlocs, rloc); } - rv = vnet_lisp_add_del_remote_mapping (deid, seid, rlocs, - mp->action, mp->is_add); + rv = vnet_lisp_add_del_remote_mapping (deid, seid, rlocs, mp->action, + mp->is_add, mp->del_all); vec_free (rlocs); REPLY_MACRO(VL_API_LISP_GPE_ADD_DEL_IFACE_REPLY); } @@ -5054,7 +5200,7 @@ send_lisp_local_eid_table_details (mapping_t *mapit, } rmp->eid_prefix_len = ip_prefix_len(ip_prefix); rmp->context = context; - + rmp->vni = clib_host_to_net_u32 (gid_address_vni (gid)); vl_msg_api_send_shmem (q, (u8 *)&rmp); } @@ -5111,7 +5257,7 @@ send_lisp_gpe_tunnel_details (lisp_gpe_tunnel_t *tunnel, static void vl_api_lisp_gpe_tunnel_dump_t_handler ( - vl_api_lisp_local_eid_table_dump_t *mp) + vl_api_lisp_gpe_tunnel_dump_t *mp) { unix_shared_memory_queue_t * q = NULL; lisp_gpe_main_t * lgm = &lisp_gpe_main; @@ -5164,7 +5310,7 @@ send_lisp_map_resolver_details (ip_address_t *ip, static void vl_api_lisp_map_resolver_dump_t_handler ( - vl_api_lisp_local_eid_table_dump_t *mp) + vl_api_lisp_map_resolver_dump_t *mp) { unix_shared_memory_queue_t * q = NULL; lisp_cp_main_t * lcm = vnet_lisp_cp_get_main(); @@ -5181,6 +5327,28 @@ vl_api_lisp_map_resolver_dump_t_handler ( } +static void +vl_api_lisp_eid_table_map_dump_t_handler ( + vl_api_lisp_eid_table_map_dump_t *mp) +{ + unix_shared_memory_queue_t * q = NULL; + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main(); + hash_pair_t * p; + + q = vl_api_client_index_to_input_queue (mp->client_index); + if (q == 0) { + return; + } + hash_foreach_pair (p, lcm->table_id_by_vni, { + vl_api_lisp_eid_table_map_details_t * rmp = NULL; + memset (rmp, 0, sizeof (*rmp)); + rmp->_vl_msg_id = ntohs(VL_API_LISP_EID_TABLE_MAP_DETAILS); + rmp->vni = p->key; + rmp->vrf = p->value[0]; + rmp->context = mp->context; + }); +} + static void send_lisp_enable_disable_details (unix_shared_memory_queue_t *q, u32 context) @@ -5212,7 +5380,39 @@ vl_api_lisp_enable_disable_status_dump_t_handler send_lisp_enable_disable_details(q, mp->context); } -static void +static void +vl_api_lisp_get_map_request_itr_rlocs_t_handler ( + vl_api_lisp_get_map_request_itr_rlocs_t *mp) +{ + unix_shared_memory_queue_t * q = NULL; + vl_api_lisp_get_map_request_itr_rlocs_reply_t *rmp = NULL; + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main(); + locator_set_t * loc_set = 0; + u8 * tmp_str = 0; + int rv = 0; + + q = vl_api_client_index_to_input_queue (mp->client_index); + if (q == 0) { + return; + } + + if (~0 == lcm->mreq_itr_rlocs) { + tmp_str = format(0, " "); + } else { + loc_set = pool_elt_at_index (lcm->locator_set_pool, lcm->mreq_itr_rlocs); + tmp_str = format(0, "%s", loc_set->name); + } + + REPLY_MACRO2(VL_API_LISP_GET_MAP_REQUEST_ITR_RLOCS_REPLY, + ({ + strncpy((char *) rmp->locator_set_name, (char *) tmp_str, + ARRAY_LEN(rmp->locator_set_name) - 1); + })); + + vec_free(tmp_str); +} + +static void vl_api_interface_name_renumber_t_handler (vl_api_interface_name_renumber_t *mp) { vl_api_interface_name_renumber_reply_t * rmp; @@ -5220,15 +5420,15 @@ vl_api_interface_name_renumber_t_handler (vl_api_interface_name_renumber_t *mp) VALIDATE_SW_IF_INDEX(mp); - rv = vnet_interface_name_renumber + rv = vnet_interface_name_renumber (ntohl(mp->sw_if_index), ntohl(mp->new_show_dev_instance)); - + BAD_SW_IF_INDEX_LABEL; REPLY_MACRO(VL_API_INTERFACE_NAME_RENUMBER_REPLY); } -static int arp_change_data_callback (u32 pool_index, u8 * new_mac, +static int arp_change_data_callback (u32 pool_index, u8 * new_mac, u32 sw_if_index, u32 address) { vpe_api_main_t * am = &vpe_api_main; @@ -5244,14 +5444,14 @@ static int arp_change_data_callback (u32 pool_index, u8 * new_mac, if (memcmp (&event->new_mac, new_mac, sizeof (event->new_mac))) { clib_memcpy (event->new_mac, new_mac, sizeof(event->new_mac)); } else { /* same mac */ - if ((sw_if_index == event->sw_if_index) && - ((address == 0) || + if ((sw_if_index == event->sw_if_index) && + ((address == 0) || /* for BD case, also check IP address with 10 sec timeout */ - ((address == event->address) && + ((address == event->address) && ((now - arp_event_last_time) < 10.0)))) return 1; } - + arp_event_last_time = now; event->sw_if_index = sw_if_index; if (address) event->address = address; @@ -5261,7 +5461,7 @@ static int arp_change_data_callback (u32 pool_index, u8 * new_mac, static int arp_change_delete_callback (u32 pool_index, u8 * notused) { vpe_api_main_t * am = &vpe_api_main; - + if (pool_is_free_index (am->arp_events, pool_index)) return 1; @@ -5270,7 +5470,7 @@ static int arp_change_delete_callback (u32 pool_index, u8 * notused) } static void -vl_api_want_ip4_arp_events_t_handler +vl_api_want_ip4_arp_events_t_handler (vl_api_want_ip4_arp_events_t * mp) { vpe_api_main_t * am = &vpe_api_main; @@ -5278,7 +5478,7 @@ vl_api_want_ip4_arp_events_t_handler vl_api_want_ip4_arp_events_reply_t *rmp; vl_api_ip4_arp_event_t * event; int rv; - + if (mp->enable_disable) { pool_get (am->arp_events, event); memset (event, 0, sizeof (*event)); @@ -5289,24 +5489,24 @@ vl_api_want_ip4_arp_events_t_handler event->address = mp->address; event->pid = mp->pid; - rv = vnet_add_del_ip4_arp_change_event + rv = vnet_add_del_ip4_arp_change_event (vnm, arp_change_data_callback, mp->pid, - &mp->address /* addr, in net byte order */, + &mp->address /* addr, in net byte order */, vpe_resolver_process_node.index, IP4_ARP_EVENT, event - am->arp_events, 1 /* is_add */); } else { - rv = vnet_add_del_ip4_arp_change_event + rv = vnet_add_del_ip4_arp_change_event (vnm, arp_change_delete_callback, mp->pid, - &mp->address /* addr, in net byte order */, + &mp->address /* addr, in net byte order */, vpe_resolver_process_node.index, IP4_ARP_EVENT, ~0 /* pool index */, 0 /* is_add */); } REPLY_MACRO(VL_API_WANT_IP4_ARP_EVENTS_REPLY); } -static void vl_api_input_acl_set_interface_t_handler +static void vl_api_input_acl_set_interface_t_handler (vl_api_input_acl_set_interface_t * mp) { vlib_main_t *vm = vlib_get_main(); @@ -5321,7 +5521,7 @@ static void vl_api_input_acl_set_interface_t_handler VALIDATE_SW_IF_INDEX(mp); - rv = vnet_set_input_acl_intfc (vm, sw_if_index, ip4_table_index, + rv = vnet_set_input_acl_intfc (vm, sw_if_index, ip4_table_index, ip6_table_index, l2_table_index, mp->is_add); @@ -5742,7 +5942,7 @@ vl_api_map_summary_stats_t_handler ( if (!q) return; - + rmp = vl_msg_api_alloc (sizeof (*rmp)); rmp->_vl_msg_id = ntohs(VL_API_MAP_SUMMARY_STATS_REPLY); rmp->context = mp->context; @@ -5850,22 +6050,22 @@ static void vl_api_get_node_graph_t_handler vlib_main_t * vm = vlib_get_main(); void * oldheap; vl_api_get_node_graph_reply_t * rmp; - + pthread_mutex_lock (&am->vlib_rp->mutex); oldheap = svm_push_data_heap (am->vlib_rp); - - /* + + /* * Keep the number of memcpy ops to a minimum (e.g. 1). */ vec_validate (vector, 16384); vec_reset_length (vector); /* $$$$ FIXME */ - vector = vlib_node_serialize (&vm->node_main, vector, + vector = vlib_node_serialize (&vm->node_main, vector, (u32)~0 /* all threads */, 1 /* include nexts */, 1 /* include stats */); - + svm_pop_heap (oldheap); pthread_mutex_unlock (&am->vlib_rp->mutex); @@ -5880,17 +6080,17 @@ static void vl_api_trace_profile_add_t_handler vl_api_trace_profile_add_reply_t * rmp; clib_error_t *error; - /* Ignoring the profile id as currently a single profile + /* Ignoring the profile id as currently a single profile * is supported */ - error = ip6_ioam_trace_profile_set(mp->trace_num_elt, mp->trace_type, - ntohl(mp->node_id), ntohl(mp->trace_app_data), - mp->pow_enable, mp->trace_tsp, + error = ip6_ioam_trace_profile_set(mp->trace_num_elt, mp->trace_type, + ntohl(mp->node_id), ntohl(mp->trace_app_data), + mp->pow_enable, mp->trace_tsp, mp->trace_ppc); if (error) { clib_error_report(error); rv = clib_error_get_code(error); } - + REPLY_MACRO(VL_API_TRACE_PROFILE_ADD_REPLY); } @@ -5899,11 +6099,11 @@ static void vl_api_trace_profile_apply_t_handler { int rv = 0; vl_api_trace_profile_apply_reply_t * rmp; - + if (mp->enable != 0) { rv = ip6_ioam_set_destination ((ip6_address_t *)(&mp->dest_ipv6), ntohl(mp->prefix_length), - ntohl(mp->vrf_id), + ntohl(mp->vrf_id), mp->trace_op == IOAM_HBYH_ADD, mp->trace_op == IOAM_HBYH_POP, mp->trace_op == IOAM_HBYH_MOD); @@ -5925,7 +6125,7 @@ static void vl_api_trace_profile_del_t_handler clib_error_report(error); rv = clib_error_get_code(error); } - + REPLY_MACRO(VL_API_TRACE_PROFILE_DEL_REPLY); } @@ -5937,16 +6137,18 @@ vl_api_af_packet_create_t_handler vl_api_af_packet_create_reply_t *rmp; int rv = 0; u8 *host_if_name = NULL; + u32 sw_if_index; host_if_name = format(0, "%s", mp->host_if_name); vec_add1 (host_if_name, 0); rv = af_packet_create_if(vm, host_if_name, - mp->use_random_hw_addr ? 0 : mp->hw_addr, 0); + mp->use_random_hw_addr ? 0 : mp->hw_addr, &sw_if_index); vec_free(host_if_name); - REPLY_MACRO(VL_API_AF_PACKET_CREATE_REPLY); + REPLY_MACRO2(VL_API_AF_PACKET_CREATE_REPLY, + rmp->sw_if_index = clib_host_to_net_u32(sw_if_index)); } static void @@ -6115,7 +6317,545 @@ vl_api_netmap_delete_t_handler REPLY_MACRO(VL_API_NETMAP_DELETE_REPLY); } -#define BOUNCE_HANDLER(nn) \ +static void vl_api_mpls_gre_tunnel_details_t_handler ( + vl_api_mpls_gre_tunnel_details_t * mp) +{ + clib_warning ("BUG"); +} + +static void send_mpls_gre_tunnel_entry (vpe_api_main_t * am, + unix_shared_memory_queue_t *q, + mpls_gre_tunnel_t * gt, + u32 index, + u32 context) +{ + vl_api_mpls_gre_tunnel_details_t * mp; + + mp = vl_msg_api_alloc (sizeof (*mp)); + memset (mp, 0, sizeof (*mp)); + mp->_vl_msg_id = ntohs(VL_API_MPLS_GRE_TUNNEL_DETAILS); + mp->context = context; + + if (gt != NULL) { + mp->tunnel_index = htonl(index); + mp->tunnel_src = gt->tunnel_src.as_u32; + mp->tunnel_dst = gt->tunnel_dst.as_u32; + mp->intfc_address = gt->intfc_address.as_u32; + mp->mask_width = htonl(gt->mask_width); + mp->inner_fib_index = htonl(gt->inner_fib_index); + mp->outer_fib_index = htonl(gt->outer_fib_index); + mp->encap_index = htonl(gt->encap_index); + mp->hw_if_index = htonl(gt->hw_if_index); + mp->l2_only = htonl(gt->l2_only); + } + + mpls_main_t * mm = &mpls_main; + mpls_encap_t * e; + int i; + u32 len = 0; + + e = pool_elt_at_index (mm->encaps, gt->encap_index); + len = vec_len (e->labels); + mp->nlabels = htonl(len); + + for (i = 0; i < len; i++) { + mp->labels[i] = htonl(vnet_mpls_uc_get_label( + clib_host_to_net_u32(e->labels[i].label_exp_s_ttl))); + } + + vl_msg_api_send_shmem (q, (u8 *)&mp); +} + +static void +vl_api_mpls_gre_tunnel_dump_t_handler (vl_api_mpls_gre_tunnel_dump_t *mp) +{ + vpe_api_main_t * am = &vpe_api_main; + unix_shared_memory_queue_t * q; + vlib_main_t * vm = &vlib_global_main; + mpls_main_t * mm = &mpls_main; + mpls_gre_tunnel_t * gt; + u32 index = ntohl(mp->tunnel_index); + + q = vl_api_client_index_to_input_queue (mp->client_index); + if (q == 0) + return; + + if (pool_elts (mm->gre_tunnels)) { + if(mp->tunnel_index >= 0) { + vlib_cli_output (vm, "MPLS-GRE tunnel %u", index); + gt = pool_elt_at_index (mm->gre_tunnels, index); + send_mpls_gre_tunnel_entry (am, q, gt, gt - mm->gre_tunnels, mp->context); + } else { + vlib_cli_output (vm, "MPLS-GRE tunnels"); + pool_foreach (gt, mm->gre_tunnels, + ({ + send_mpls_gre_tunnel_entry (am, q, gt, gt - mm->gre_tunnels, mp->context); + })); + } + } else { + vlib_cli_output (vm, "No MPLS-GRE tunnels"); + } +} + +static void vl_api_mpls_eth_tunnel_details_t_handler ( + vl_api_mpls_eth_tunnel_details_t * mp) +{ + clib_warning ("BUG"); +} + +static void send_mpls_eth_tunnel_entry (vpe_api_main_t * am, + unix_shared_memory_queue_t *q, + mpls_eth_tunnel_t * et, + u32 index, + u32 context) +{ + vl_api_mpls_eth_tunnel_details_t * mp; + + mp = vl_msg_api_alloc (sizeof (*mp)); + memset (mp, 0, sizeof (*mp)); + mp->_vl_msg_id = ntohs(VL_API_MPLS_ETH_TUNNEL_DETAILS); + mp->context = context; + + if (et != NULL) { + mp->tunnel_index = htonl(index); + memcpy(mp->tunnel_dst_mac, et->tunnel_dst, 6); + mp->intfc_address = et->intfc_address.as_u32; + mp->tx_sw_if_index = htonl(et->tx_sw_if_index); + mp->inner_fib_index = htonl(et->inner_fib_index); + mp->mask_width = htonl(et->mask_width); + mp->encap_index = htonl(et->encap_index); + mp->hw_if_index = htonl(et->hw_if_index); + mp->l2_only = htonl(et->l2_only); + } + + mpls_main_t * mm = &mpls_main; + mpls_encap_t * e; + int i; + u32 len = 0; + + e = pool_elt_at_index (mm->encaps, et->encap_index); + len = vec_len (e->labels); + mp->nlabels = htonl(len); + + for (i = 0; i < len; i++) { + mp->labels[i] = htonl(vnet_mpls_uc_get_label( + clib_host_to_net_u32(e->labels[i].label_exp_s_ttl))); + } + + vl_msg_api_send_shmem (q, (u8 *)&mp); +} + +static void +vl_api_mpls_eth_tunnel_dump_t_handler (vl_api_mpls_eth_tunnel_dump_t *mp) +{ + vpe_api_main_t * am = &vpe_api_main; + unix_shared_memory_queue_t * q; + vlib_main_t * vm = &vlib_global_main; + mpls_main_t * mm = &mpls_main; + mpls_eth_tunnel_t * et; + u32 index = ntohl(mp->tunnel_index); + + q = vl_api_client_index_to_input_queue (mp->client_index); + if (q == 0) + return; + + clib_warning("Received mpls_eth_tunnel_dump"); + clib_warning("Received tunnel index: %u from client %u", index, mp->client_index); + + if (pool_elts (mm->eth_tunnels)) { + if(mp->tunnel_index >= 0) { + vlib_cli_output (vm, "MPLS-Ethernet tunnel %u", index); + et = pool_elt_at_index (mm->eth_tunnels, index); + send_mpls_eth_tunnel_entry (am, q, et, et - mm->eth_tunnels, mp->context); + } else { + clib_warning("MPLS-Ethernet tunnels"); + pool_foreach (et, mm->eth_tunnels, + ({ + send_mpls_eth_tunnel_entry (am, q, et, et - mm->eth_tunnels, mp->context); + })); + } + } else { + clib_warning("No MPLS-Ethernet tunnels"); + } +} + +static void vl_api_mpls_fib_encap_details_t_handler ( + vl_api_mpls_fib_encap_details_t * mp) +{ + clib_warning ("BUG"); +} + +static void send_mpls_fib_encap_details (vpe_api_main_t * am, + unix_shared_memory_queue_t *q, + show_mpls_fib_t *s, + u32 context) +{ + vl_api_mpls_fib_encap_details_t * mp; + + mp = vl_msg_api_alloc (sizeof (*mp)); + memset (mp, 0, sizeof (*mp)); + mp->_vl_msg_id = ntohs(VL_API_MPLS_FIB_ENCAP_DETAILS); + mp->context = context; + + mp->fib_index = htonl(s->fib_index); + mp->entry_index = htonl(s->entry_index); + mp->dest = s->dest; + mp->s_bit = htonl(s->s_bit); + + mpls_main_t * mm = &mpls_main; + mpls_encap_t * e; + int i; + u32 len = 0; + + e = pool_elt_at_index (mm->encaps, s->entry_index); + len = vec_len (e->labels); + mp->nlabels = htonl(len); + + for (i = 0; i < len; i++) { + mp->labels[i] = htonl(vnet_mpls_uc_get_label( + clib_host_to_net_u32(e->labels[i].label_exp_s_ttl))); + } + + vl_msg_api_send_shmem (q, (u8 *)&mp); +} + +static void +vl_api_mpls_fib_encap_dump_t_handler (vl_api_mpls_fib_encap_dump_t *mp) +{ + vpe_api_main_t * am = &vpe_api_main; + unix_shared_memory_queue_t * q; + vlib_main_t * vm = &vlib_global_main; + u64 key; + u32 value; + show_mpls_fib_t *records = 0; + show_mpls_fib_t *s; + mpls_main_t * mm = &mpls_main; + ip4_main_t * im = &ip4_main; + ip4_fib_t * rx_fib; + + q = vl_api_client_index_to_input_queue (mp->client_index); + if (q == 0) + return; + + hash_foreach (key, value, mm->mpls_encap_by_fib_and_dest, + ({ + vec_add2 (records, s, 1); + s->fib_index = (u32)(key>>32); + s->dest = (u32)(key & 0xFFFFFFFF); + s->entry_index = (u32) value; + })); + + if (0 == vec_len(records)) { + vlib_cli_output(vm, "MPLS encap table empty"); + goto out; + } + + /* sort output by dst address within fib */ + vec_sort_with_function(records, mpls_dest_cmp); + vec_sort_with_function(records, mpls_fib_index_cmp); + vlib_cli_output(vm, "MPLS encap table"); + vlib_cli_output(vm, "%=6s%=16s%=16s", "Table", "Dest address", "Labels"); + vec_foreach (s, records) + { + rx_fib = vec_elt_at_index(im->fibs, s->fib_index); + vlib_cli_output(vm, "%=6d%=16U%=16U", rx_fib->table_id, + format_ip4_address, &s->dest, format_mpls_encap_index, mm, + s->entry_index); + send_mpls_fib_encap_details (am, q, s, mp->context); + } + +out: + vec_free(records); +} + +static void vl_api_mpls_fib_decap_details_t_handler ( + vl_api_mpls_fib_decap_details_t * mp) +{ + clib_warning ("BUG"); +} + +static void send_mpls_fib_decap_details (vpe_api_main_t * am, + unix_shared_memory_queue_t *q, + show_mpls_fib_t *s, + u32 rx_table_id, + u32 tx_table_id, + char *swif_tag, + u32 context) +{ + vl_api_mpls_fib_decap_details_t * mp; + + mp = vl_msg_api_alloc (sizeof (*mp)); + memset (mp, 0, sizeof (*mp)); + mp->_vl_msg_id = ntohs(VL_API_MPLS_FIB_DECAP_DETAILS); + mp->context = context; + + mp->fib_index = htonl(s->fib_index); + mp->entry_index = htonl(s->entry_index); + mp->dest = s->dest; + mp->s_bit = htonl(s->s_bit); + mp->label = htonl(s->label); + mp->rx_table_id = htonl(rx_table_id); + mp->tx_table_id = htonl(tx_table_id); + strncpy ((char *) mp->swif_tag, + (char *) swif_tag, ARRAY_LEN(mp->swif_tag)-1); + + vl_msg_api_send_shmem (q, (u8 *)&mp); +} + +static void +vl_api_mpls_fib_decap_dump_t_handler (vl_api_mpls_fib_decap_dump_t *mp) +{ + vpe_api_main_t * am = &vpe_api_main; + unix_shared_memory_queue_t * q; + vlib_main_t * vm = &vlib_global_main; + u64 key; + u32 value; + show_mpls_fib_t *records = 0; + show_mpls_fib_t *s; + mpls_main_t * mm = &mpls_main; + ip4_main_t * im = &ip4_main; + ip4_fib_t * rx_fib; + ip4_fib_t *tx_fib; + u32 tx_table_id; + char *swif_tag; + + q = vl_api_client_index_to_input_queue (mp->client_index); + if (q == 0) + return; + + hash_foreach (key, value, mm->mpls_decap_by_rx_fib_and_label, + ({ + vec_add2 (records, s, 1); + s->fib_index = (u32)(key>>32); + s->entry_index = (u32) value; + s->label = ((u32) key)>>12; + s->s_bit = (key & (1<<8)) != 0; + })); + + if (!vec_len(records)) { + vlib_cli_output(vm, "MPLS decap table empty"); + goto out; + } + + vec_sort_with_function(records, mpls_label_cmp); + vlib_cli_output(vm, "MPLS decap table"); + vlib_cli_output(vm, "%=10s%=15s%=6s%=6s", "RX Table", "TX Table/Intfc", + "Label", "S-bit"); + vec_foreach (s, records) + { + mpls_decap_t * d; + d = pool_elt_at_index(mm->decaps, s->entry_index); + if (d->next_index == MPLS_INPUT_NEXT_IP4_INPUT) { + tx_fib = vec_elt_at_index(im->fibs, d->tx_fib_index); + tx_table_id = tx_fib->table_id; + swif_tag = " "; + } else { + tx_table_id = d->tx_fib_index; + swif_tag = "(i) "; + } + rx_fib = vec_elt_at_index(im->fibs, s->fib_index); + + vlib_cli_output(vm, "%=10d%=10d%=5s%=6d%=6d", rx_fib->table_id, + tx_table_id, swif_tag, s->label, s->s_bit); + + send_mpls_fib_decap_details (am, q, s, rx_fib->table_id, + tx_table_id, swif_tag, mp->context); + } + +out: + vec_free(records); +} + +static void vl_api_classify_table_ids_t_handler (vl_api_classify_table_ids_t *mp) +{ + unix_shared_memory_queue_t * q; + + q = vl_api_client_index_to_input_queue (mp->client_index); + if (q == 0) + return; + + vnet_classify_main_t * cm = &vnet_classify_main; + vnet_classify_table_t * t; + u32 * table_ids = 0; + u32 count; + + pool_foreach (t, cm->tables, + ({ + vec_add1 (table_ids, ntohl(t - cm->tables)); + })); + count = vec_len(table_ids); + + vl_api_classify_table_ids_reply_t *rmp; + rmp = vl_msg_api_alloc_as_if_client(sizeof (*rmp) + count); + rmp->_vl_msg_id = ntohs (VL_API_CLASSIFY_TABLE_IDS_REPLY); + rmp->context = mp->context; + rmp->count = ntohl(count); + clib_memcpy(rmp->ids, table_ids, count * sizeof(u32)); + rmp->retval = 0; + + vl_msg_api_send_shmem (q, (u8 *)&rmp); + + vec_free (table_ids); +} + +static void vl_api_classify_table_by_interface_t_handler (vl_api_classify_table_by_interface_t *mp) +{ + vl_api_classify_table_by_interface_reply_t *rmp; + int rv = 0; + + u32 sw_if_index = ntohl(mp->sw_if_index); + u32 * acl = 0; + + vec_validate (acl, INPUT_ACL_N_TABLES - 1); + vec_set (acl, ~0); + + VALIDATE_SW_IF_INDEX(mp); + + input_acl_main_t * am = &input_acl_main; + + int if_idx; + u32 type; + + for (type = 0; type < INPUT_ACL_N_TABLES; type++) + { + u32 * vec_tbl = am->classify_table_index_by_sw_if_index[type]; + if (vec_len(vec_tbl)) { + for (if_idx = 0; if_idx < vec_len (vec_tbl); if_idx++) + { + if (vec_elt(vec_tbl, if_idx) == ~0 || sw_if_index != if_idx) { + continue; + } + acl[type] = vec_elt(vec_tbl, if_idx); + } + } + } + + BAD_SW_IF_INDEX_LABEL; + + REPLY_MACRO2(VL_API_CLASSIFY_TABLE_BY_INTERFACE_REPLY, + ({ + rmp->sw_if_index = ntohl(sw_if_index); + rmp->l2_table_id = ntohl(acl[INPUT_ACL_TABLE_L2]); + rmp->ip4_table_id = ntohl(acl[INPUT_ACL_TABLE_IP4]); + rmp->ip6_table_id = ntohl(acl[INPUT_ACL_TABLE_IP6]); + })); + vec_free(acl); +} + +static void vl_api_classify_table_info_t_handler (vl_api_classify_table_info_t *mp) +{ + unix_shared_memory_queue_t * q; + + q = vl_api_client_index_to_input_queue (mp->client_index); + if (q == 0) + return; + + vl_api_classify_table_info_reply_t *rmp = 0; + + vnet_classify_main_t * cm = &vnet_classify_main; + u32 table_id = ntohl(mp->table_id); + vnet_classify_table_t * t; + + pool_foreach (t, cm->tables, + ({ + if (table_id == t - cm->tables) { + rmp = vl_msg_api_alloc_as_if_client(sizeof (*rmp) + t->match_n_vectors * sizeof (u32x4)); + rmp->_vl_msg_id = ntohs (VL_API_CLASSIFY_TABLE_INFO_REPLY); + rmp->context = mp->context; + rmp->table_id = ntohl(table_id); + rmp->nbuckets = ntohl(t->nbuckets); + rmp->match_n_vectors = ntohl(t->match_n_vectors); + rmp->skip_n_vectors = ntohl(t->skip_n_vectors); + rmp->active_sessions = ntohl(t->active_elements); + rmp->next_table_index = ntohl(t->next_table_index); + rmp->miss_next_index = ntohl(t->miss_next_index); + rmp->mask_length = ntohl(t->match_n_vectors * sizeof (u32x4)); + clib_memcpy(rmp->mask, t->mask, t->match_n_vectors * sizeof(u32x4)); + rmp->retval = 0; + break; + } + })); + + if (rmp == 0) { + rmp = vl_msg_api_alloc (sizeof (*rmp)); + rmp->_vl_msg_id = ntohs((VL_API_CLASSIFY_TABLE_INFO_REPLY)); + rmp->context = mp->context; + rmp->retval = ntohl(VNET_API_ERROR_CLASSIFY_TABLE_NOT_FOUND); + } + + vl_msg_api_send_shmem (q, (u8 *)&rmp); +} + +static void vl_api_classify_session_details_t_handler (vl_api_classify_session_details_t * mp) +{ + clib_warning ("BUG"); +} + +static void send_classify_session_details (unix_shared_memory_queue_t * q, + u32 table_id, + u32 match_length, + vnet_classify_entry_t * e, + u32 context) +{ + vl_api_classify_session_details_t *rmp; + + rmp = vl_msg_api_alloc (sizeof (*rmp)); + memset (rmp, 0, sizeof (*rmp)); + rmp->_vl_msg_id = ntohs(VL_API_CLASSIFY_SESSION_DETAILS); + rmp->context = context; + rmp->table_id = ntohl(table_id); + rmp->hit_next_index = ntohl(e->next_index); + rmp->advance = ntohl(e->advance); + rmp->opaque_index = ntohl(e->opaque_index); + rmp->match_length = ntohl(match_length); + clib_memcpy(rmp->match, e->key, match_length); + + vl_msg_api_send_shmem (q, (u8 *)&rmp); +} + +static void vl_api_classify_session_dump_t_handler (vl_api_classify_session_dump_t *mp) +{ + vnet_classify_main_t * cm = &vnet_classify_main; + unix_shared_memory_queue_t * q; + + u32 table_id = ntohl(mp->table_id); + vnet_classify_table_t * t; + + q = vl_api_client_index_to_input_queue (mp->client_index); + + pool_foreach (t, cm->tables, + ({ + if (table_id == t - cm->tables) { + vnet_classify_bucket_t * b; + vnet_classify_entry_t * v, * save_v; + int i, j, k; + + for (i = 0; i < t->nbuckets; i++) + { + b = &t->buckets [i]; + if (b->offset == 0) + continue; + + save_v = vnet_classify_get_entry (t, b->offset); + for (j = 0; j < (1<log2_pages); j++) + { + for (k = 0; k < t->entries_per_page; k++) + { + v = vnet_classify_entry_at_index (t, save_v, j*t->entries_per_page + k); + if (vnet_classify_entry_is_free (v)) + continue; + + send_classify_session_details(q, table_id, + t->match_n_vectors * sizeof (u32x4), v, mp->context); + } + } + } + break; + } + })); +} + +#define BOUNCE_HANDLER(nn) \ static void vl_api_##nn##_t_handler ( \ vl_api_##nn##_t *mp) \ { \ @@ -6149,7 +6889,7 @@ static void vl_api_##nn##_t_handler ( \ * vpe_api_hookup * Add vpe's API message handlers to the table. * vlib has alread mapped shared memory and - * added the client registration handlers. + * added the client registration handlers. * See .../open-repo/vlib/memclnt_vlib.c:memclnt_process() */ @@ -6164,15 +6904,15 @@ vpe_api_hookup (vlib_main_t *vm) vl_noop_handler, \ vl_api_##n##_t_endian, \ vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); + sizeof(vl_api_##n##_t), 1); foreach_vpe_api_msg; #undef _ - /* + /* * Manually register the sr tunnel add del msg, so we trace * enough bytes to capture a typical segment list */ - vl_msg_api_set_handlers (VL_API_SR_TUNNEL_ADD_DEL, + vl_msg_api_set_handlers (VL_API_SR_TUNNEL_ADD_DEL, "sr_tunnel_add_del", vl_api_sr_tunnel_add_del_t_handler, vl_noop_handler, @@ -6181,11 +6921,11 @@ vpe_api_hookup (vlib_main_t *vm) 256, 1); - /* + /* * Manually register the sr policy add del msg, so we trace * enough bytes to capture a typical tunnel name list */ - vl_msg_api_set_handlers (VL_API_SR_POLICY_ADD_DEL, + vl_msg_api_set_handlers (VL_API_SR_POLICY_ADD_DEL, "sr_policy_add_del", vl_api_sr_policy_add_del_t_handler, vl_noop_handler, @@ -6193,7 +6933,7 @@ vpe_api_hookup (vlib_main_t *vm) vl_api_sr_policy_add_del_t_print, 256, 1); - /* + /* * Trace space for 8 MPLS encap labels, classifier mask+match */ am->api_trace_cfg [VL_API_MPLS_ADD_DEL_ENCAP].size += 8 * sizeof(u32); @@ -6203,8 +6943,8 @@ vpe_api_hookup (vlib_main_t *vm) += 5 * sizeof (u32x4); am->api_trace_cfg [VL_API_VXLAN_ADD_DEL_TUNNEL].size += 16 * sizeof (u32); - - /* + + /* * Thread-safe API messages */ am->is_mp_safe [VL_API_IP_ADD_DEL_ROUTE] = 1; @@ -6238,10 +6978,16 @@ vpe_api_init (vlib_main_t *vm) VLIB_INIT_FUNCTION(vpe_api_init); + static clib_error_t * -chroot_config (vlib_main_t * vm, unformat_input_t * input) +api_segment_config (vlib_main_t * vm, unformat_input_t * input) { u8 * chroot_path; + int uid, gid, rv; + char *s, buf[128]; + struct passwd _pw, *pw; + struct group _grp, *grp; + clib_error_t *e; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { @@ -6250,13 +6996,61 @@ chroot_config (vlib_main_t * vm, unformat_input_t * input) vec_add1 (chroot_path, 0); vl_set_memory_root_path ((char *)chroot_path); } + else if (unformat (input, "uid %d", &uid)) + vl_set_memory_uid (uid); + else if (unformat (input, "gid %d", &gid)) + vl_set_memory_gid (gid); + else if (unformat (input, "uid %s", &s)) + { + /* lookup the username */ + pw = NULL; + rv = getpwnam_r(s, &_pw, buf, sizeof(buf), &pw); + if (rv < 0) + { + e = clib_error_return_code(0, rv, + CLIB_ERROR_ERRNO_VALID | CLIB_ERROR_FATAL, + "cannot fetch username %s", s); + vec_free (s); + return e; + } + if (pw == NULL) + { + e = clib_error_return_fatal(0, "username %s does not exist", s); + vec_free (s); + return e; + } + vec_free (s); + vl_set_memory_uid (pw->pw_uid); + } + else if (unformat (input, "gid %s", &s)) + { + /* lookup the group name */ + grp = NULL; + rv = getgrnam_r(s, &_grp, buf, sizeof(buf), &grp); + if (rv != 0) + { + e = clib_error_return_code(0, rv, + CLIB_ERROR_ERRNO_VALID | CLIB_ERROR_FATAL, + "cannot fetch group %s", s); + vec_free (s); + return e; + } + if (grp == NULL) + { + e = clib_error_return_fatal(0, "group %s does not exist", s); + vec_free (s); + return e; + } + vec_free (s); + vl_set_memory_gid (grp->gr_gid); + } else - return clib_error_return (0, "unknown input `%U'", - format_unformat_error, input); + return clib_error_return (0, "unknown input `%U'", + format_unformat_error, input); } return 0; } -VLIB_EARLY_CONFIG_FUNCTION (chroot_config, "chroot"); +VLIB_EARLY_CONFIG_FUNCTION (api_segment_config, "api-segment"); void * get_unformat_vnet_sw_interface (void) { @@ -6288,9 +7082,9 @@ static u8 * format_arp_event (u8 * s, va_list * args) return s; } -static clib_error_t * +static clib_error_t * show_ip4_arp_events_fn (vlib_main_t * vm, - unformat_input_t * input, + unformat_input_t * input, vlib_cli_command_t * cmd) { vpe_api_main_t * am = &vpe_api_main; @@ -6301,7 +7095,7 @@ show_ip4_arp_events_fn (vlib_main_t * vm, return 0; } - pool_foreach (event, am->arp_events, + pool_foreach (event, am->arp_events, ({ vlib_cli_output (vm, "%U", format_arp_event, event); }));