/*
*------------------------------------------------------------------
* 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.
* 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.
*------------------------------------------------------------------
*/
#include <time.h>
#include <fcntl.h>
#include <string.h>
+#include <pwd.h>
+#include <grp.h>
+
#include <vppinfra/clib.h>
#include <vppinfra/vec.h>
#include <vppinfra/hash.h>
#include <vppinfra/format.h>
#include <vppinfra/error.h>
+#include <vnet/api_errno.h> // alagalah TODO : committers please pay note, is this ok?
#include <vnet/vnet.h>
#include <vnet/l2/l2_input.h>
#include <vnet/l2/l2_bd.h>
#include <vnet/classify/input_acl.h>
#include <vnet/l2/l2_classify.h>
#include <vnet/vxlan/vxlan.h>
+#include <vnet/gre/gre.h>
#include <vnet/l2/l2_vtr.h>
-#include <vnet/nsh-gre/nsh_gre.h>
-#include <vnet/nsh-vxlan-gpe/nsh_vxlan_gpe.h>
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
#include <vnet/lisp-gpe/lisp_gpe.h>
#include <vnet/lisp-cp/control.h>
#include <vnet/map/map.h>
#include <vnet/cop/cop.h>
#include <vnet/ip/ip6_hop_by_hop.h>
+#include <vnet/devices/af_packet/af_packet.h>
+#include <vnet/policer/policer.h>
+#include <vnet/devices/netmap/netmap.h>
#undef BIHASH_TYPE
#undef __included_bihash_template_h__
#define f64_print(a,b)
#define vl_typedefs /* define message structures */
-#include <api/vpe_all_api_h.h>
+#include <api/vpe_all_api_h.h>
#undef vl_typedefs
#define vl_endianfun /* define message structures */
-#include <api/vpe_all_api_h.h>
+#include <api/vpe_all_api_h.h>
#undef vl_endianfun
/* instantiate all the print functions we know about */
#define foreach_vpe_api_msg \
_(WANT_INTERFACE_EVENTS, want_interface_events) \
-_(WANT_FROM_NETCONF_SERVER, want_from_netconf_server) \
-_(WANT_TO_NETCONF_SERVER, want_to_netconf_server) \
-_(WANT_FROM_NETCONF_CLIENT, want_from_netconf_client) \
-_(WANT_TO_NETCONF_CLIENT, want_to_netconf_client) \
-_(FROM_NETCONF_SERVER, from_netconf_server) \
-_(TO_NETCONF_SERVER, to_netconf_server) \
-_(FROM_NETCONF_CLIENT, from_netconf_client) \
-_(TO_NETCONF_CLIENT, to_netconf_client) \
_(WANT_OAM_EVENTS, want_oam_events) \
_(OAM_ADD_DEL, oam_add_del) \
_(SW_INTERFACE_DUMP, sw_interface_dump) \
_(SW_IF_L2TPV3_TUNNEL_DUMP, sw_if_l2tpv3_tunnel_dump) \
_(VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel) \
_(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump) \
+_(GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel) \
+_(GRE_TUNNEL_DUMP, gre_tunnel_dump) \
_(L2_FIB_CLEAR_TABLE, l2_fib_clear_table) \
_(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter) \
_(L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite) \
_(IP_DUMP, ip_dump) \
_(SW_INTERFACE_VHOST_USER_DETAILS, sw_interface_vhost_user_details) \
_(SHOW_VERSION, show_version) \
-_(NSH_GRE_ADD_DEL_TUNNEL, nsh_gre_add_del_tunnel) \
_(L2_FIB_TABLE_DUMP, l2_fib_table_dump) \
_(L2_FIB_TABLE_ENTRY, l2_fib_table_entry) \
-_(NSH_VXLAN_GPE_ADD_DEL_TUNNEL, nsh_vxlan_gpe_add_del_tunnel) \
-_(LISP_GPE_ADD_DEL_TUNNEL, lisp_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) \
_(LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid) \
_(LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry) \
_(LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver) \
+_(LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable) \
+_(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_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_MAP_RESOLVER_DUMP, lisp_map_resolver_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)
#define QUOTE_(x) #x
#define QUOTE(x) QUOTE_(x)
/* 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;
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 */
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) {
{
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;
}
{
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;
}
}
pub_sub_handler (interface_events,INTERFACE_EVENTS)
-pub_sub_handler (from_netconf_server,FROM_NETCONF_SERVER)
-pub_sub_handler (to_netconf_server,TO_NETCONF_SERVER)
-pub_sub_handler (from_netconf_client,FROM_NETCONF_CLIENT)
-pub_sub_handler (to_netconf_client,TO_NETCONF_CLIENT)
pub_sub_handler (oam_events,OAM_EVENTS)
#define RESOLUTION_EVENT 1
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)
/* 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));
- memcpy (mp, event, 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) {
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",
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;
/* 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);
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;
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 {
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;
-
- 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 */
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);
pool_get (vam->pending_routes, pr);
pr->resolve_type = RESOLVE_IP4_ADD_DEL_ROUTE;
adr = &pr->r;
- memcpy (adr, mp, sizeof (*adr));
+ clib_memcpy (adr, mp, sizeof (*adr));
/* 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));
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);
}
memset (&a, 0, sizeof (a));
- memcpy (a.dst_address.data, mp->dst_address, sizeof (a.dst_address.data));
+ clib_memcpy (a.dst_address.data, mp->dst_address, sizeof (a.dst_address.data));
a.dst_address_length = mp->dst_address_length;
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)
} 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);
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;
}
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 {
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;
- 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 */
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);
pool_get (vam->pending_routes, pr);
adr = &pr->r;
pr->resolve_type = RESOLVE_IP6_ADD_DEL_ROUTE;
- memcpy (adr, mp, sizeof (*adr));
+ clib_memcpy (adr, mp, sizeof (*adr));
/* 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));
(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);
}
memset (&a, 0, sizeof (a));
- memcpy (a.dst_address.as_u8, mp->dst_address, sizeof (a.dst_address.as_u8));
+ 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) {
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) {
}
} 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);
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);
mp.is_ipv6 = is_ipv6;
mp.next_hop_weight = 1;
- memcpy (&mp.next_hop_address[0], next_hop_addr, 16);
+ clib_memcpy (&mp.next_hop_address[0], next_hop_addr, 16);
if (is_ipv6)
rv = ip6_add_del_route_t_handler (&mp);
}
-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();
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);
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);
}
} 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);
}
}
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;
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);
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;
}
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)
{
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)
{
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)
{
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;
else
disable_flags |= L2_FWD;
- if (mp->arp_term)
+ if (mp->arp_term)
enable_flags |= L2_ARP_TERM;
else
disable_flags |= L2_ARP_TERM;
static void send_bridge_domain_details (unix_shared_memory_queue_t *q,
l2_bridge_domain_t * bd_config,
- u32 n_sw_ifs)
+ u32 n_sw_ifs,
+ u32 context)
{
vl_api_bridge_domain_details_t * mp;
mp->arp_term = bd_feature_arp_term (bd_config);
mp->bvi_sw_if_index = ntohl (bd_config->bvi_sw_if_index);
mp->n_sw_ifs = ntohl (n_sw_ifs);
+ mp->context = context;
vl_msg_api_send_shmem (q, (u8 *)&mp);
}
static void send_bd_sw_if_details (l2input_main_t * l2im,
unix_shared_memory_queue_t *q,
- l2_flood_member_t * member, u32 bd_id)
+ l2_flood_member_t * member, u32 bd_id,
+ u32 context)
{
vl_api_bridge_domain_sw_if_details_t * mp;
l2_input_config_t * input_cfg;
mp->sw_if_index = ntohl (member->sw_if_index);
input_cfg = vec_elt_at_index (l2im->configs, member->sw_if_index);
mp->shg = input_cfg->shg;
+ mp->context = context;
vl_msg_api_send_shmem (q, (u8 *)&mp);
}
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);
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);
-
+ 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);
+ send_bd_sw_if_details (l2im, q, m, bd_config->bd_id, mp->context);
}
}
}
}
-static void
+static void
vl_api_l2fib_add_del_t_handler (
vl_api_l2fib_add_del_t *mp)
{
REPLY_MACRO(VL_API_L2FIB_ADD_DEL_REPLY);
}
-static void
+static void
vl_api_l2_flags_t_handler (
vl_api_l2_flags_t *mp)
{
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)
{
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;
rv = VNET_API_ERROR_NO_SUCH_ENTRY;
goto out;
}
-
+
bd_index = p[0];
bd_set_flags(vm, bd_index, flags, mp->is_set);
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)
{
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);
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;
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;
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;
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;
}
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;
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);
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;
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);
}));
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);
}
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;
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;
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;
pool_get (vam->pending_routes, pr);
pr->resolve_type = RESOLVE_MPLS_ETHERNET_ADD_DEL;
pme = &pr->t;
- memcpy (pme, mp, sizeof (*pme));
+ clib_memcpy (pme, mp, sizeof (*pme));
/* recursion block, "just in case" */
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);
}
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);
}
/* $$$$ 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;
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);
}
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;
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;
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);
}
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),
- mp->mac_address, sizeof (mp->mac_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;
}
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;
}
}
- memcpy (&a.ethernet, mp->mac_address, 6);
- memcpy (&a.ip4, mp->dst_address, 4);
+ 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
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);
}
rmp = vl_msg_api_alloc (sizeof (*rmp));
- memcpy (rmp, mp, sizeof (*rmp));
+ clib_memcpy (rmp, mp, sizeof (*rmp));
sw_if_index = mp->next_hop_sw_if_index;
- memcpy (&addr, mp->address, sizeof (addr));
+ 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) {
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);
static void send_sw_interface_details (vpe_api_main_t * am,
unix_shared_memory_queue_t *q,
vnet_sw_interface_t * swif,
- u8 * interface_name)
+ u8 * interface_name,
+ u32 context)
{
vl_api_sw_interface_details_t * mp;
vnet_hw_interface_t * hi;
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);
mp->link_speed = ((hi->flags & VNET_HW_INTERFACE_FLAG_SPEED_MASK) >>
VNET_HW_INTERFACE_FLAG_SPEED_SHIFT);
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));
- memcpy (mp->l2_address, ei->address, sizeof (ei->address));
+ clib_memcpy (mp->l2_address, ei->address, sizeof (ei->address));
mp->l2_address_length = ntohl(sizeof (ei->address));
} else if (swif->sup_sw_if_index != swif->sw_if_index) {
vnet_sub_interface_t *sub = &swif->sub;
&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);
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));
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,
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);
if (mp->name_filter_valid == 0 ||
strcasestr((char *) name_string, (char *) filter_string)) {
- send_sw_interface_details (am, q, swif, name_string);
- send_sw_interface_flags (am, q, swif);
+ send_sw_interface_details (am, q, swif, name_string, mp->context);
}
_vec_len (name_string) = 0;
}));
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) {
mp = vl_msg_api_alloc (sizeof (*mp));
mp->_vl_msg_id = ntohs (VL_API_OAM_EVENT);
- memcpy (mp->dst_address, &t->dst_address, sizeof (mp->dst_address));
+ clib_memcpy (mp->dst_address, &t->dst_address, sizeof (mp->dst_address));
mp->state = t->state;
vl_msg_api_send_shmem (q, (u8 *)&mp);
}
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;
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);
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) {
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;
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) */
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) {
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);
rv = ip6_reset_fib_t_handler (mp);
else
rv = ip4_reset_fib_t_handler (mp);
-
+
REPLY_MACRO(VL_API_RESET_FIB_REPLY);
}
(u32) ntohl(mp->vrf_id),
(int) mp->insert_circuit_id,
(int) (mp->is_add == 0));
-
+
REPLY_MACRO(VL_API_DHCP_PROXY_CONFIG_REPLY);
}
(u32) ntohl(mp->vrf_id),
(int) mp->insert_circuit_id,
(int) (mp->is_add == 0));
-
+
REPLY_MACRO(VL_API_DHCP_PROXY_CONFIG_REPLY);
}
(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);
}
#else
rv = VNET_API_ERROR_UNIMPLEMENTED;
#endif
-
+
REPLY_MACRO(VL_API_DHCP_PROXY_CONFIG_2_REPLY);
}
{
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),
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)
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)
mp->client_index = client_index;
mp->pid = pid;
mp->is_ipv6 = is_ipv6;
- memcpy (&mp->hostname, hostname, vec_len(hostname));
+ clib_memcpy (&mp->hostname, hostname, vec_len(hostname));
mp->hostname[vec_len(hostname) + 1] = '\n';
- memcpy (&mp->host_address[0], host_address, 16);
- memcpy (&mp->router_address[0], router_address, 16);
- memcpy (&mp->host_mac[0], host_mac, 6);
+ clib_memcpy (&mp->host_address[0], host_address, 16);
+ clib_memcpy (&mp->router_address[0], router_address, 16);
+ clib_memcpy (&mp->host_mac[0], host_mac, 6);
mp->_vl_msg_id = ntohs (VL_API_DHCP_COMPL_EVENT);
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();
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);
}
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;
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);
}
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;
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,
}
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;
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;
}
BAD_SW_IF_INDEX_LABEL;
-
+
REPLY_MACRO(VL_API_SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS_REPLY);
}
int rv = VNET_API_ERROR_UNIMPLEMENTED;
clib_warning ("unimplemented...");
-
+
REPLY_MACRO(VL_API_SET_IP_FLOW_HASH_REPLY);
}
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;
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;
si->flags &= ~(VNET_SW_INTERFACE_FLAG_UNNUMBERED);
si->unnumbered_sw_if_index = (u32)~0;
}
-
+
done:
REPLY_MACRO(VL_API_SW_INTERFACE_SET_UNNUMBERED_REPLY);
}
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,
pthread_mutex_lock (&am->vlib_rp->mutex);
oldheap = svm_push_data_heap (am->vlib_rp);
-
+
vec_validate (shmem_vec, offset + buffer_bytes - 1);
- memcpy (shmem_vec + offset, buffer, buffer_bytes);
+ clib_memcpy (shmem_vec + offset, buffer, buffer_bytes);
svm_pop_heap (oldheap);
pthread_mutex_unlock (&am->vlib_rp->mutex);
}
-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;
rp->_vl_msg_id = ntohs(VL_API_CLI_REPLY);
rp->context = mp->context;
- unformat_init_vector (&input, (u8 *)mp->cmd_in_shmem);
+ 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);
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;
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++) {
vec_add2 (segments, seg, 1);
- memcpy (seg->as_u8, this_address->as_u8, sizeof (*this_address));
+ clib_memcpy (seg->as_u8, this_address->as_u8, sizeof (*this_address));
this_address++;
}
for (i = 0; i < mp->n_tags; i++) {
vec_add2 (tags, tag, 1);
- memcpy (tag->as_u8, this_address->as_u8, sizeof (*this_address));
+ clib_memcpy (tag->as_u8, this_address->as_u8, sizeof (*this_address));
this_address++;
}
#endif
}
+static void vl_api_sr_policy_add_del_t_handler
+(vl_api_sr_policy_add_del_t *mp)
+{
+#if IPV6SR == 0
+ clib_warning ("unimplemented");
+#else
+ ip6_sr_add_del_policy_args_t _a, *a=&_a;
+ int rv = 0;
+ vl_api_sr_policy_add_del_reply_t * rmp;
+ int i;
+
+ 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]))
+ {
+ rv = VNET_API_ERROR_NO_SUCH_NODE2;
+ goto out;
+ }
+
+ // start deserializing tunnel_names
+ int num_tunnels = mp->tunnel_names[0]; //number of tunnels
+ u8 * deser_tun_names = mp->tunnel_names;
+ deser_tun_names += 1; //moving along
+
+ u8 * tun_name = 0;
+ int tun_name_len = 0;
+
+ for (i=0; i < num_tunnels; i++)
+ {
+ tun_name_len= *deser_tun_names;
+ deser_tun_names += 1;
+ vec_resize (tun_name, tun_name_len);
+ memcpy(tun_name, deser_tun_names, tun_name_len);
+ vec_add1 (a->tunnel_names, tun_name);
+ deser_tun_names += tun_name_len;
+ tun_name = 0;
+ }
+
+ rv = ip6_sr_add_del_policy (a);
+
+out:
+
+ REPLY_MACRO(VL_API_SR_POLICY_ADD_DEL_REPLY);
+#endif
+}
+
+static void vl_api_sr_multicast_map_add_del_t_handler
+(vl_api_sr_multicast_map_add_del_t *mp)
+{
+#if IPV6SR == 0
+ clib_warning ("unimplemented");
+#else
+ ip6_sr_add_del_multicastmap_args_t _a, *a=&_a;
+ int rv = 0;
+ vl_api_sr_multicast_map_add_del_reply_t * rmp;
+
+ 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 ;
+ goto out;
+ }
+
+ if (!(a->policy_name))
+ {
+ rv = -2 ;
+ goto out;
+ }
+
+#if DPDK > 0 /* Cannot call replicate without DPDK */
+ rv = ip6_sr_add_del_multicastmap (a);
+#else
+ clib_warning ("multicast replication without DPDK not implemented");
+ rv = VNET_API_ERROR_UNIMPLEMENTED;
+#endif /* DPDK */
+
+out:
+
+ REPLY_MACRO(VL_API_SR_MULTICAST_MAP_ADD_DEL_REPLY);
+#endif
+}
+
#define foreach_classify_add_del_table_field \
_(table_index) \
_(nbuckets) \
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,
({
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();
table_index = ntohl (mp->table_index);
sw_if_index = ntohl (mp->sw_if_index);
-
+
VALIDATE_SW_IF_INDEX(mp);
if (mp->is_ipv6)
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;
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);
}
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;
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;
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;
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);
#if DPDK > 0
static void send_sw_interface_vhost_user_details (vpe_api_main_t * am,
unix_shared_memory_queue_t *q,
- vhost_user_intf_details_t * vui)
+ vhost_user_intf_details_t * vui,
+ u32 context)
{
vl_api_sw_interface_vhost_user_details_t * mp;
mp->is_server = vui->is_server;
mp->num_regions = ntohl(vui->num_regions);
mp->sock_errno = ntohl(vui->sock_errno);
+ mp->context = context;
strncpy ((char *) mp->sock_filename,
(char *) vui->sock_filename, ARRAY_LEN(mp->sock_filename)-1);
return;
vec_foreach (vuid, ifaces) {
- send_sw_interface_vhost_user_details (am, q, vuid);
+ send_sw_interface_vhost_user_details (am, q, vuid, mp->context);
}
vec_free(ifaces);
#endif
static void send_sw_if_l2tpv3_tunnel_details (vpe_api_main_t * am,
unix_shared_memory_queue_t *q,
l2t_session_t *s,
- l2t_main_t * lm)
+ l2t_main_t * lm,
+ u32 context)
{
vl_api_sw_if_l2tpv3_tunnel_details_t * mp;
u8 * if_name = NULL;
mp->local_cookie[0] = s->local_cookie[0];
mp->local_cookie[1] = s->local_cookie[1];
mp->remote_cookie = s->remote_cookie;
- memcpy(mp->client_address, &s->client_address, sizeof(s->client_address));
- memcpy(mp->our_address, &s->our_address, sizeof(s->our_address));
+ clib_memcpy(mp->client_address, &s->client_address, sizeof(s->client_address));
+ clib_memcpy(mp->our_address, &s->our_address, sizeof(s->our_address));
mp->l2_sublayer_present = s->l2_sublayer_present;
+ mp->context = context;
vl_msg_api_send_shmem (q, (u8 *)&mp);
}
unix_shared_memory_queue_t * q,
u8 * ip,
u16 prefix_length,
- u8 is_ipv6)
+ u8 is_ipv6,
+ u32 context)
{
vl_api_ip_address_details_t * mp;
mp->_vl_msg_id = ntohs(VL_API_IP_ADDRESS_DETAILS);
if (is_ipv6) {
- memcpy(&mp->ip, ip, sizeof(mp->ip));
+ clib_memcpy(&mp->ip, ip, sizeof(mp->ip));
} else {
u32 * tp = (u32 *)mp->ip;
*tp = ntohl(*(u32*)ip);
}
mp->prefix_length = prefix_length;
+ mp->context = context;
vl_msg_api_send_shmem (q, (u8 *)&mp);
}
ip_lookup_main_t * lm4 = &im4->lookup_main;
ip_interface_address_t * ia = 0;
u32 sw_if_index = ~0;
+ int rv __attribute__ ((unused)) = 0;
+
+ VALIDATE_SW_IF_INDEX(mp);
sw_if_index = ntohl(mp->sw_if_index);
({
r6 = ip_interface_address_get_address (lm6, ia);
u16 prefix_length = ia->address_length;
- send_ip_address_details(am, q, (u8*)r6, prefix_length, 1);
+ send_ip_address_details(am, q, (u8*)r6, prefix_length, 1, mp->context);
}));
} else {
foreach_ip_interface_address (lm4, ia, sw_if_index,
({
r4 = ip_interface_address_get_address (lm4, ia);
u16 prefix_length = ia->address_length;
- send_ip_address_details(am, q, (u8*)r4, prefix_length, 0);
+ send_ip_address_details(am, q, (u8*)r4, prefix_length, 0, mp->context);
}));
}
+ BAD_SW_IF_INDEX_LABEL;
}
static void send_ip_details (vpe_api_main_t * am,
unix_shared_memory_queue_t *q,
- u32 sw_if_index)
+ u32 sw_if_index,
+ u32 context)
{
vl_api_ip_details_t * mp;
mp->_vl_msg_id = ntohs(VL_API_IP_DETAILS);
mp->sw_if_index = ntohl(sw_if_index);
+ mp->context = context;
vl_msg_api_send_shmem (q, (u8 *)&mp);
}
if (q == 0)
return;
- pool_foreach (session, lm->sessions,
+ pool_foreach (session, lm->sessions,
({
- send_sw_if_l2tpv3_tunnel_details (am, q, session, lm);
+ send_sw_if_l2tpv3_tunnel_details (am, q, session, lm, mp->context);
}));
}
static void send_sw_interface_tap_details (vpe_api_main_t * am,
unix_shared_memory_queue_t *q,
- tapcli_interface_details_t *tap_if)
+ tapcli_interface_details_t *tap_if,
+ u32 context)
{
vl_api_sw_interface_tap_details_t * mp;
mp = vl_msg_api_alloc (sizeof (*mp));
mp->sw_if_index = ntohl(tap_if->sw_if_index);
strncpy((char *)mp->dev_name,
(char *)tap_if->dev_name, ARRAY_LEN(mp->dev_name)-1);
+ mp->context = context;
vl_msg_api_send_shmem (q, (u8 *)&mp);
}
return;
vec_foreach(tap_if, tapifs) {
- send_sw_interface_tap_details(am, q, tap_if);
+ send_sw_interface_tap_details(am, q, tap_if, mp->context);
}
vec_free(tapifs);
continue;
}
sw_if_index = si->sw_if_index;
- send_ip_details(am, q, sw_if_index);
+ send_ip_details(am, q, sw_if_index, mp->context);
}
}
}
static void send_l2fib_table_entry (vpe_api_main_t * am,
unix_shared_memory_queue_t *q,
l2fib_entry_key_t * l2fe_key,
- l2fib_entry_result_t * l2fe_res)
+ l2fib_entry_result_t * l2fe_res,
+ u32 context)
{
vl_api_l2_fib_table_entry_t * mp;
mp->static_mac = l2fe_res->fields.static_mac;
mp->filter_mac = l2fe_res->fields.filter;
mp->bvi_mac = l2fe_res->fields.bvi;
+ mp->context = context;
vl_msg_api_send_shmem (q, (u8 *)&mp);
}
p = hash_get (bdm->bd_index_by_bd_id, bd_id);
if (p == 0)
return;
-
+
bd_index = p[0];
}
vec_foreach_index (ni, l2fe_key) {
send_l2fib_table_entry (am, q, vec_elt_at_index(l2fe_key, ni),
- vec_elt_at_index(l2fe_res, ni));
+ vec_elt_at_index(l2fe_res, ni), mp->context);
}
vec_free(l2fe_key);
vec_free(l2fe_res);
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);
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);
}))
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;
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:
}))
}
-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;
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;
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;
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;
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;
}
encap_fib_index = p[0];
+ /* Check src & dst are different */
+ if ((mp->is_ipv6 && memcmp(mp->src_address, mp->dst_address, 16) == 0) ||
+ (!mp->is_ipv6 && memcmp(mp->src_address, mp->dst_address, 4) == 0)) {
+ rv = VNET_API_ERROR_SAME_SRC_DST;
+ goto out;
+ }
memset (a, 0, sizeof (*a));
a->is_add = mp->is_add;
+ a->is_ip6 = mp->is_ipv6;
/* ip addresses sent in network byte order */
- a->src.as_u32 = mp->src_address;
- a->dst.as_u32 = mp->dst_address;
+ if (a->is_ip6) {
+ memcpy(&(a->src.ip6), mp->src_address, 16);
+ memcpy(&(a->dst.ip6), mp->dst_address, 16);
+ } else {
+ memcpy(&(a->src.ip4), mp->src_address, 4);
+ memcpy(&(a->dst.ip4), mp->dst_address, 4);
+ }
a->encap_fib_index = encap_fib_index;
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,
({
}
static void send_vxlan_tunnel_details
-(vxlan_tunnel_t * t, unix_shared_memory_queue_t * q)
+(vxlan_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
{
vl_api_vxlan_tunnel_details_t * rmp;
- ip4_main_t * im = &ip4_main;
+ ip4_main_t * im4 = &ip4_main;
+ ip6_main_t * im6 = &ip6_main;
+ u8 is_ipv6 = !(t->flags & VXLAN_TUNNEL_IS_IPV4);
rmp = vl_msg_api_alloc (sizeof (*rmp));
memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs(VL_API_VXLAN_TUNNEL_DETAILS);
- rmp->src_address = t->src.data_u32;
- rmp->dst_address = t->dst.data_u32;
- rmp->encap_vrf_id = htonl(im->fibs[t->encap_fib_index].table_id);
+ if (is_ipv6) {
+ memcpy(rmp->src_address, &(t->src.ip6), 16);
+ memcpy(rmp->dst_address, &(t->dst.ip6), 16);
+ rmp->encap_vrf_id = htonl(im6->fibs[t->encap_fib_index].table_id);
+ } else {
+ memcpy(rmp->src_address, &(t->src.ip4), 4);
+ memcpy(rmp->dst_address, &(t->dst.ip4), 4);
+ rmp->encap_vrf_id = htonl(im4->fibs[t->encap_fib_index].table_id);
+ }
rmp->vni = htonl(t->vni);
rmp->decap_next_index = htonl(t->decap_next_index);
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);
}
if (~0 == sw_if_index) {
pool_foreach (t, vxm->tunnels,
({
- send_vxlan_tunnel_details(t, q);
+ send_vxlan_tunnel_details(t, q, mp->context);
}));
} else {
if ((sw_if_index >= vec_len(vxm->tunnel_index_by_sw_if_index)) ||
return;
}
t = &vxm->tunnels[vxm->tunnel_index_by_sw_if_index[sw_if_index]];
- send_vxlan_tunnel_details(t, q);
+ send_vxlan_tunnel_details(t, q, mp->context);
}
}
-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 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),
- (int)(mp->is_add != 0));
-
- BAD_RX_SW_IF_INDEX_LABEL;
- BAD_TX_SW_IF_INDEX_LABEL;
-
- REPLY_MACRO(VL_API_L2_PATCH_ADD_DEL_REPLY);
-}
-
-static void
-vl_api_nsh_gre_add_del_tunnel_t_handler
-(vl_api_nsh_gre_add_del_tunnel_t * mp)
+static void vl_api_gre_add_del_tunnel_t_handler
+(vl_api_gre_add_del_tunnel_t * mp)
{
- vl_api_nsh_gre_add_del_tunnel_reply_t * rmp;
+ vl_api_gre_add_del_tunnel_reply_t * rmp;
int rv = 0;
- vnet_nsh_gre_add_del_tunnel_args_t _a, *a = &_a;
- u32 encap_fib_index, decap_fib_index;
- u32 decap_next_index;
+ vnet_gre_add_del_tunnel_args_t _a, *a = &_a;
+ u32 outer_table_id;
uword * p;
ip4_main_t * im = &ip4_main;
- u32 * tlvs = 0;
u32 sw_if_index = ~0;
- int i;
- p = hash_get (im->fib_index_by_table_id, ntohl(mp->encap_vrf_id));
+ p = hash_get (im->fib_index_by_table_id, ntohl(mp->outer_table_id));
if (! p) {
rv = VNET_API_ERROR_NO_SUCH_FIB;
goto out;
}
- encap_fib_index = p[0];
-
- decap_next_index = ntohl(mp->decap_next_index);
+ outer_table_id = p[0];
- /* Interpret decap_vrf_id as an opaque if sending to other-than-ip4-input */
- if (decap_next_index == NSH_INPUT_NEXT_IP4_INPUT) {
- p = hash_get (im->fib_index_by_table_id, ntohl(mp->decap_vrf_id));
- if (! p) {
- rv = VNET_API_ERROR_NO_SUCH_INNER_FIB;
- goto out;
- }
- decap_fib_index = p[0];
- } else {
- decap_fib_index = ntohl(mp->decap_vrf_id);
+ /* Check src & dst are different */
+ if (memcmp(&mp->src_address, &mp->dst_address, 4) == 0) {
+ rv = VNET_API_ERROR_SAME_SRC_DST;
+ goto out;
}
memset (a, 0, sizeof (*a));
a->is_add = mp->is_add;
+
/* ip addresses sent in network byte order */
- a->src.as_u32 = ntohl(mp->src);
- a->dst.as_u32 = ntohl(mp->dst);
- a->encap_fib_index = encap_fib_index;
- a->decap_fib_index = decap_fib_index;
- a->decap_next_index = decap_next_index;
- a->ver_o_c = mp->ver_o_c;
- a->length = mp->length;
- a->md_type = mp->md_type;
- a->next_protocol = mp->next_protocol;
- a->spi_si = ntohl(mp->spi_si);
- a->c1 = ntohl(mp->c1);
- a->c2 = ntohl(mp->c2);
- a->c3 = ntohl(mp->c3);
- a->c4 = ntohl(mp->c4);
-
- for (i = 0; i < mp->tlv_len_in_words; i++)
- vec_add1 (tlvs, ntohl(mp->tlvs[i]));
-
- a->tlvs = tlvs;
-
- rv = vnet_nsh_gre_add_del_tunnel (a, &sw_if_index);
-
+ a->src.as_u32 = mp->src_address;
+ a->dst.as_u32 = mp->dst_address;
+
+ a->outer_table_id = outer_table_id;
+ rv = vnet_gre_add_del_tunnel (a, &sw_if_index);
+
out:
- REPLY_MACRO2(VL_API_NSH_GRE_ADD_DEL_TUNNEL_REPLY,
+ REPLY_MACRO2(VL_API_GRE_ADD_DEL_TUNNEL_REPLY,
({
rmp->sw_if_index = ntohl (sw_if_index);
}));
}
-static void
-vl_api_nsh_vxlan_gpe_add_del_tunnel_t_handler
-(vl_api_nsh_vxlan_gpe_add_del_tunnel_t * mp)
+static void send_gre_tunnel_details
+(gre_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
{
- vl_api_nsh_vxlan_gpe_add_del_tunnel_reply_t * rmp;
- int rv = 0;
- vnet_nsh_vxlan_gpe_add_del_tunnel_args_t _a, *a = &_a;
- u32 encap_fib_index, decap_fib_index;
- u32 decap_next_index;
- uword * p;
+ vl_api_gre_tunnel_details_t * rmp;
ip4_main_t * im = &ip4_main;
- u32 * tlvs = 0;
- u32 sw_if_index = ~0;
- int i;
- p = hash_get (im->fib_index_by_table_id, ntohl(mp->encap_vrf_id));
- if (! p) {
- rv = VNET_API_ERROR_NO_SUCH_FIB;
- goto out;
+ rmp = vl_msg_api_alloc (sizeof (*rmp));
+ memset (rmp, 0, sizeof (*rmp));
+ rmp->_vl_msg_id = ntohs(VL_API_GRE_TUNNEL_DETAILS);
+ rmp->src_address = t->tunnel_src.data_u32;
+ rmp->dst_address = t->tunnel_dst.data_u32;
+ rmp->outer_table_id = htonl(im->fibs[t->outer_fib_index].table_id);
+ rmp->sw_if_index = htonl(t->sw_if_index);
+ rmp->context = context;
+
+ vl_msg_api_send_shmem (q, (u8 *)&rmp);
+}
+
+static void vl_api_gre_tunnel_dump_t_handler
+(vl_api_gre_tunnel_dump_t * mp)
+{
+ unix_shared_memory_queue_t * q;
+ gre_main_t * gm = &gre_main;
+ gre_tunnel_t * t;
+ u32 sw_if_index;
+
+ q = vl_api_client_index_to_input_queue (mp->client_index);
+ if (q == 0) {
+ return;
}
- encap_fib_index = p[0];
- decap_next_index = ntohl(mp->decap_next_index);
+ sw_if_index = ntohl(mp->sw_if_index);
- /* Interpret decap_vrf_id as an opaque if sending to other-than-ip4-input */
- if (decap_next_index == NSH_INPUT_NEXT_IP4_INPUT) {
- p = hash_get (im->fib_index_by_table_id, ntohl(mp->decap_vrf_id));
- if (! p) {
- rv = VNET_API_ERROR_NO_SUCH_INNER_FIB;
- goto out;
- }
- decap_fib_index = p[0];
+ if (~0 == sw_if_index) {
+ pool_foreach (t, gm->tunnels,
+ ({
+ send_gre_tunnel_details(t, q, mp->context);
+ }));
} else {
- decap_fib_index = ntohl(mp->decap_vrf_id);
+ if ((sw_if_index >= vec_len(gm->tunnel_index_by_sw_if_index)) ||
+ (~0 == gm->tunnel_index_by_sw_if_index[sw_if_index])) {
+ return;
+ }
+ t = &gm->tunnels[gm->tunnel_index_by_sw_if_index[sw_if_index]];
+ send_gre_tunnel_details(t, q, mp->context);
}
+}
- memset (a, 0, sizeof (*a));
+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 is_add);
+ int rv = 0;
- a->is_add = mp->is_add;
- /* ip addresses sent in network byte order */
- a->src.as_u32 = ntohl(mp->src);
- a->dst.as_u32 = ntohl(mp->dst);
- a->encap_fib_index = encap_fib_index;
- a->decap_fib_index = decap_fib_index;
- a->decap_next_index = decap_next_index;
- a->vni = ntohl(mp->vni);
- a->ver_o_c = mp->ver_o_c;
- a->length = mp->length;
- a->md_type = mp->md_type;
- a->next_protocol = mp->next_protocol;
- a->spi_si = ntohl(mp->spi_si);
- a->c1 = ntohl(mp->c1);
- a->c2 = ntohl(mp->c2);
- a->c3 = ntohl(mp->c3);
- a->c4 = ntohl(mp->c4);
-
- for (i = 0; i < mp->tlv_len_in_words; i++)
- vec_add1 (tlvs, ntohl(mp->tlvs[i]));
-
- a->tlvs = tlvs;
-
- rv = vnet_nsh_vxlan_gpe_add_del_tunnel (a, &sw_if_index);
-
-out:
- REPLY_MACRO2(VL_API_NSH_VXLAN_GPE_ADD_DEL_TUNNEL_REPLY,
- ({
- rmp->sw_if_index = ntohl (sw_if_index);
- }));
+ 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),
+ (int)(mp->is_add != 0));
+
+ BAD_RX_SW_IF_INDEX_LABEL;
+ BAD_TX_SW_IF_INDEX_LABEL;
+
+ REPLY_MACRO(VL_API_L2_PATCH_ADD_DEL_REPLY);
}
static void
-vl_api_lisp_gpe_add_del_tunnel_t_handler
-(vl_api_lisp_gpe_add_del_tunnel_t * mp)
+vl_api_vxlan_gpe_add_del_tunnel_t_handler
+(vl_api_vxlan_gpe_add_del_tunnel_t * mp)
{
- vl_api_lisp_gpe_add_del_tunnel_reply_t * rmp;
+ vl_api_vxlan_gpe_add_del_tunnel_reply_t * rmp;
int rv = 0;
- vnet_lisp_gpe_add_del_tunnel_args_t _a, *a = &_a;
+ vnet_vxlan_gpe_add_del_tunnel_args_t _a, *a = &_a;
u32 encap_fib_index, decap_fib_index;
- u32 decap_next_index;
+ u8 protocol;
uword * p;
ip4_main_t * im = &ip4_main;
u32 sw_if_index = ~0;
+
p = hash_get (im->fib_index_by_table_id, ntohl(mp->encap_vrf_id));
if (! p) {
rv = VNET_API_ERROR_NO_SUCH_FIB;
}
encap_fib_index = p[0];
- decap_next_index = ntohl(mp->decap_next_index);
+ protocol = mp->protocol;
/* Interpret decap_vrf_id as an opaque if sending to other-than-ip4-input */
- if (decap_next_index == NSH_INPUT_NEXT_IP4_INPUT) {
+ if (protocol == VXLAN_GPE_INPUT_NEXT_IP4_INPUT) {
p = hash_get (im->fib_index_by_table_id, ntohl(mp->decap_vrf_id));
if (! p) {
rv = VNET_API_ERROR_NO_SUCH_INNER_FIB;
decap_fib_index = ntohl(mp->decap_vrf_id);
}
+ /* Check src & dst are different */
+ 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;
+ }
memset (a, 0, sizeof (*a));
a->is_add = mp->is_add;
+ a->is_ip6 = mp->is_ipv6;
/* ip addresses sent in network byte order */
- a->src.as_u32 = mp->src;
- a->dst.as_u32 = mp->dst;
+ if (a->is_ip6) {
+ clib_memcpy(&(a->local.ip6), mp->local, 16);
+ clib_memcpy(&(a->remote.ip6), mp->remote, 16);
+ } else {
+ clib_memcpy(&(a->local.ip4), mp->local, 4);
+ clib_memcpy(&(a->remote.ip4), mp->remote, 4);
+ }
a->encap_fib_index = encap_fib_index;
a->decap_fib_index = decap_fib_index;
- a->decap_next_index = decap_next_index;
- a->flags = mp->flags;
- a->ver_res = mp->ver_res;
- a->res = mp->res;
- a->next_protocol = mp->next_protocol;
- a->iid = clib_net_to_host_u32 (mp->iid);
-
- rv = vnet_lisp_gpe_add_del_tunnel (a, &sw_if_index);
-
+ a->protocol = protocol;
+ a->vni = ntohl(mp->vni);
+ rv = vnet_vxlan_gpe_add_del_tunnel (a, &sw_if_index);
+
out:
- REPLY_MACRO2(VL_API_LISP_GPE_ADD_DEL_TUNNEL_REPLY,
+ REPLY_MACRO2(VL_API_VXLAN_GPE_ADD_DEL_TUNNEL_REPLY,
({
rmp->sw_if_index = ntohl (sw_if_index);
}));
}
+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)
{
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);
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);
prefp = &gid_address_ippref(&eid);
ip_eid = &ip_prefix_addr(prefp);
- gid_address_type (&eid) = IP_PREFIX;
+ gid_address_type (&eid) = GID_ADDR_IP_PREFIX;
if (mp->is_ipv6) {
- memcpy(&ip_addr_v6(ip_eid), mp->ip_address,
+ clib_memcpy(&ip_addr_v6(ip_eid), mp->ip_address,
sizeof(ip_addr_v6(ip_eid)));
ip_addr_version(ip_eid) = IP6;
} else {
- memcpy(&ip_addr_v4(ip_eid), mp->ip_address,
+ clib_memcpy(&ip_addr_v4(ip_eid), mp->ip_address,
sizeof(ip_addr_v4(ip_eid)));
ip_addr_version(ip_eid) = IP4;
}
a->locator_set_index = locator_set_index;
a->local = 1;
- rv = vnet_lisp_add_del_mapping(a, &map_index);
+ rv = vnet_lisp_add_del_local_mapping(a, &map_index);
out:
vec_free(name);
ip_eid = &ip_prefix_addr(prefp);
if (mp->eid_is_ipv6) {
- memcpy(&ip_addr_v6(ip_eid), mp->eid_ip_address,
+ clib_memcpy(&ip_addr_v6(ip_eid), mp->eid_ip_address,
sizeof(ip_addr_v6(ip_eid)));
ip_addr_version(ip_eid) = IP6;
} else {
- memcpy(&ip_addr_v4(ip_eid), mp->eid_ip_address,
+ clib_memcpy(&ip_addr_v4(ip_eid), mp->eid_ip_address,
sizeof(ip_addr_v4(ip_eid)));
ip_addr_version(ip_eid) = IP4;
}
ip_prefix_len(prefp) = mp->eid_prefix_len;
if (mp->address_is_ipv6) {
- memcpy(&ip_addr_v6(slocator), mp->source_ip_address,
+ clib_memcpy(&ip_addr_v6(slocator), mp->source_ip_address,
sizeof(ip_addr_v6(slocator)));
ip_addr_version(slocator) = IP6;
- memcpy(&ip_addr_v6(dlocator), mp->destination_ip_address,
+ clib_memcpy(&ip_addr_v6(dlocator), mp->destination_ip_address,
sizeof(ip_addr_v6(dlocator)));
ip_addr_version(dlocator) = IP6;
} else {
- memcpy(&ip_addr_v4(slocator), mp->source_ip_address,
+ clib_memcpy(&ip_addr_v4(slocator), mp->source_ip_address,
sizeof(ip_addr_v4(slocator)));
ip_addr_version(slocator) = IP4;
- memcpy(&ip_addr_v4(dlocator), mp->destination_ip_address,
+ clib_memcpy(&ip_addr_v4(dlocator), mp->destination_ip_address,
sizeof(ip_addr_v4(dlocator)));
ip_addr_version(dlocator) = IP4;
}
vl_api_lisp_gpe_add_del_fwd_entry_reply_t *rmp;
int rv = 0;
ip_address_t slocator, dlocator;
- ip_prefix_t * prefp = NULL;
gid_address_t eid;
vnet_lisp_gpe_add_del_fwd_entry_args_t a;
a.deid = eid;
a.slocator = slocator;
a.dlocator = dlocator;
- prefp = &gid_address_ippref(&a.deid);
- a.decap_next_index = (ip_prefix_version(prefp) == IP4) ?
- LISP_GPE_INPUT_NEXT_IP4_INPUT : LISP_GPE_INPUT_NEXT_IP6_INPUT;
rv = vnet_lisp_gpe_add_del_fwd_entry (&a, 0);
REPLY_MACRO(VL_API_LISP_GPE_ADD_DEL_FWD_ENTRY_REPLY);
ip_addr = &a->address;
if (mp->is_ipv6) {
- memcpy(&ip_addr_v6(ip_addr), mp->ip_address,
+ clib_memcpy(&ip_addr_v6(ip_addr), mp->ip_address,
sizeof(ip_addr_v6(ip_addr)));
ip_addr_version(ip_addr) = IP6;
} else {
- memcpy(&ip_addr_v4(ip_addr), mp->ip_address,
+ clib_memcpy(&ip_addr_v4(ip_addr), mp->ip_address,
sizeof(ip_addr_v4(ip_addr)));
ip_addr_version(ip_addr) = IP4;
}
REPLY_MACRO(VL_API_LISP_ADD_DEL_MAP_RESOLVER_REPLY);
}
+static void
+vl_api_lisp_gpe_enable_disable_t_handler(
+ vl_api_lisp_gpe_enable_disable_t *mp)
+{
+ vl_api_lisp_gpe_enable_disable_reply_t *rmp;
+ int rv = 0;
+ vnet_lisp_gpe_enable_disable_args_t _a, * a = &_a;
+
+ a->is_en = mp->is_en;
+ vnet_lisp_gpe_enable_disable (a);
+
+ REPLY_MACRO(VL_API_LISP_GPE_ENABLE_DISABLE_REPLY);
+}
+
+static void
+vl_api_lisp_enable_disable_t_handler(
+ vl_api_lisp_enable_disable_t *mp)
+{
+ vl_api_lisp_enable_disable_reply_t *rmp;
+ int rv = 0;
+
+ vnet_lisp_enable_disable (mp->is_en);
+ REPLY_MACRO(VL_API_LISP_ENABLE_DISABLE_REPLY);
+}
+
static void
vl_api_lisp_gpe_add_del_iface_t_handler(
vl_api_lisp_gpe_add_del_iface_t *mp)
vnet_lisp_gpe_add_del_iface_args_t _a, * a = &_a;
a->is_add = mp->is_add;
- vnet_lisp_gpe_add_del_iface (a, 0);
+ a->table_id = mp->table_id;
+ a->vni = mp->vni;
+ rv = vnet_lisp_gpe_add_del_iface (a, 0);
+
+ REPLY_MACRO(VL_API_LISP_GPE_ADD_DEL_IFACE_REPLY);
+}
+
+static void
+vl_api_lisp_pitr_set_locator_set_t_handler(
+ vl_api_lisp_pitr_set_locator_set_t *mp)
+{
+ vl_api_lisp_pitr_set_locator_set_reply_t *rmp;
+ int rv = 0;
+ u8 * ls_name = 0;
+
+ ls_name = format (0, "%s", mp->ls_name);
+ rv = vnet_lisp_pitr_set_locator_set (ls_name, mp->is_add);
+ vec_free (ls_name);
+
+ 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
+{
+ u8 is_ip4; /**< is locator an IPv4 address */
+ u8 addr[16]; /**< IPv4/IPv6 address */
+}) rloc_t;
+
+static void
+send_lisp_locator_set_details_set_address
+(vl_api_lisp_locator_set_details_t *rmp,
+ gid_address_t *gid_address)
+{
+ ip_prefix_t *ip_addr;
+
+ if (gid_address_type(gid_address) != GID_ADDR_IP_PREFIX) {
+ return;
+ }
+
+ ip_addr = &gid_address_ippref(gid_address);
+ rmp->prefix_len = ip_prefix_len(ip_addr);
+ rmp->is_ipv6 = ip_prefix_version(ip_addr);
+ ip_address_copy_addr(rmp->ip_address, &ip_prefix_addr(ip_addr));
+}
+
+static void
+vl_api_lisp_add_del_remote_mapping_t_handler (
+ vl_api_lisp_add_del_remote_mapping_t *mp)
+{
+ u32 i;
+ ip_address_t rloc, * rlocs = 0;
+ vl_api_lisp_add_del_remote_mapping_reply_t * rmp;
+ int rv = 0;
+ gid_address_t _seid, * seid = &_seid;
+ gid_address_t _deid, * deid = &_deid;
+ ip_prefix_t * seid_pref = &gid_address_ippref(seid);
+ ip_prefix_t * deid_pref = &gid_address_ippref(deid);
+
+ gid_address_type(seid) = GID_ADDR_IP_PREFIX;
+ gid_address_type(deid) = GID_ADDR_IP_PREFIX;
+ ip_address_t * seid_addr = &ip_prefix_addr(seid_pref);
+ 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));
+
+ if (mp->eid_is_ip4) {
+ ip_prefix_version(seid_pref) = IP4;
+ ip_prefix_version(deid_pref) = IP4;
+ clib_memcpy (&ip_addr_v4(seid_addr),
+ mp->seid, sizeof (ip_addr_v4(seid_addr)));
+ clib_memcpy (&ip_addr_v4(deid_addr),
+ mp->deid, sizeof (ip_addr_v4(deid_addr)));
+ } else {
+ ip_prefix_version(seid_pref) = IP6;
+ ip_prefix_version(deid_pref) = IP6;
+ clib_memcpy (&ip_addr_v6(seid_addr),
+ mp->seid, sizeof (ip_addr_v6(seid_addr)));
+ clib_memcpy (&ip_addr_v6(deid_addr),
+ mp->deid, sizeof (ip_addr_v6(deid_addr)));
+ }
+
+ for (i = 0; i < mp->rloc_num; i++) {
+ rloc_t * r = &((rloc_t *) mp->rlocs)[i];
+ if (r->is_ip4) {
+ clib_memcpy (&ip_addr_v4(&rloc), &r->addr, sizeof (rloc_t));
+ ip_addr_version (&rloc) = IP4;
+ } else {
+ clib_memcpy (&ip_addr_v6(&rloc), &r->addr, sizeof (rloc_t));
+ ip_addr_version (&rloc) = IP6;
+ }
+ vec_add1 (rlocs, rloc);
+ }
+
+ 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);
}
static void
send_lisp_locator_set_details (lisp_cp_main_t *lcm,
locator_set_t *lsit,
- unix_shared_memory_queue_t *q)
+ unix_shared_memory_queue_t *q,
+ u32 context,
+ u32 index)
{
vl_api_lisp_locator_set_details_t *rmp;
locator_t *loc = NULL;
u32 * locit = NULL;
+ u8 * str = NULL;
vec_foreach (locit, lsit->locator_indices) {
loc = pool_elt_at_index (lcm->locator_pool, locit[0]);
rmp = vl_msg_api_alloc (sizeof (*rmp));
memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs(VL_API_LISP_LOCATOR_SET_DETAILS);
- strncpy((char *) rmp->locator_set_name,
- (char *) lsit->name, ARRAY_LEN(rmp->locator_set_name) - 1);
- rmp->sw_if_index = htonl(loc->sw_if_index);
+ rmp->local = lsit->local;
+ if (lsit->local) {
+ ASSERT(lsit->name != NULL);
+ strncpy((char *) rmp->locator_set_name,
+ (char *) lsit->name, ARRAY_LEN(rmp->locator_set_name) - 1);
+ rmp->sw_if_index = htonl(loc->sw_if_index);
+ } else {
+ str = format(0, "remote-%d", index);
+ strncpy((char *) rmp->locator_set_name, (char *) str,
+ ARRAY_LEN(rmp->locator_set_name) - 1);
+ send_lisp_locator_set_details_set_address(rmp, &loc->address);
+
+ vec_free(str);
+ }
rmp->priority = loc->priority;
rmp->weight = loc->weight;
+ rmp->context = context;
vl_msg_api_send_shmem (q, (u8 *)&rmp);
}
unix_shared_memory_queue_t * q = NULL;
lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
locator_set_t * lsit = NULL;
+ u32 index;
q = vl_api_client_index_to_input_queue (mp->client_index);
if (q == 0) {
return;
}
+ index = 0;
pool_foreach (lsit, lcm->locator_set_pool,
({
- send_lisp_locator_set_details(lcm, lsit, q);
+ send_lisp_locator_set_details(lcm, lsit, q, mp->context, index++);
}));
}
static void
send_lisp_local_eid_table_details (mapping_t *mapit,
- unix_shared_memory_queue_t *q)
+ unix_shared_memory_queue_t *q,
+ u32 context)
{
vl_api_lisp_local_eid_table_details_t *rmp = NULL;
lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
locator_set_t *ls = NULL;
gid_address_t *gid = NULL;
ip_prefix_t *ip_prefix = NULL;
+ u8 * str = NULL;
u8 type = ~0;
ls = pool_elt_at_index (lcm->locator_set_pool,
gid = &mapit->eid;
type = gid_address_type(gid);
- if (type != IP_PREFIX) {
+ if (type != GID_ADDR_IP_PREFIX) {
return;
}
rmp = vl_msg_api_alloc (sizeof (*rmp));
memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs(VL_API_LISP_LOCAL_EID_TABLE_DETAILS);
- strncpy((char *) rmp->locator_set_name,
- (char *) ls->name, ARRAY_LEN(rmp->locator_set_name) - 1);
+ if (ls->local) {
+ ASSERT(ls->name != NULL);
+ strncpy((char *) rmp->locator_set_name,
+ (char *) ls->name, ARRAY_LEN(rmp->locator_set_name) - 1);
+ } else {
+ str = format(0, "remote-%d", mapit->locator_set_index);
+ strncpy((char *) rmp->locator_set_name, (char *) str,
+ ARRAY_LEN(rmp->locator_set_name) - 1);
+ vec_free(str);
+ }
switch (ip_prefix_version(ip_prefix)) {
case IP4:
rmp->eid_is_ipv6 = 0;
- memcpy(rmp->eid_ip_address, &ip_prefix_v4(ip_prefix),
+ clib_memcpy(rmp->eid_ip_address, &ip_prefix_v4(ip_prefix),
sizeof(ip_prefix_v4(ip_prefix)));
break;
case IP6:
rmp->eid_is_ipv6 = 1;
- memcpy(rmp->eid_ip_address, &ip_prefix_v6(ip_prefix),
+ clib_memcpy(rmp->eid_ip_address, &ip_prefix_v6(ip_prefix),
sizeof(ip_prefix_v6(ip_prefix)));
break;
ASSERT(0);
}
rmp->eid_prefix_len = ip_prefix_len(ip_prefix);
+ rmp->context = context;
vl_msg_api_send_shmem (q, (u8 *)&rmp);
}
pool_foreach (mapit, lcm->mapping_pool,
({
- send_lisp_local_eid_table_details(mapit, q);
+ send_lisp_local_eid_table_details(mapit, q, mp->context);
}));
}
static void
send_lisp_gpe_tunnel_details (lisp_gpe_tunnel_t *tunnel,
- unix_shared_memory_queue_t *q)
+ unix_shared_memory_queue_t *q,
+ u32 context)
{
vl_api_lisp_gpe_tunnel_details_t *rmp;
lisp_gpe_main_t * lgm = &lisp_gpe_main;
- ip4_address_t *ip4 = NULL;
rmp = vl_msg_api_alloc (sizeof (*rmp));
memset (rmp, 0, sizeof (*rmp));
rmp->tunnels = tunnel - lgm->tunnels;
- /*list_gpe_tunnel now support only IPv4*/
- rmp->is_ipv6 = 0;
- ip4 = &tunnel->src;
- memcpy(rmp->source_ip, ip4, sizeof(*ip4));
- ip4 = &tunnel->dst;
- memcpy(rmp->destination_ip, ip4, sizeof(*ip4));
+ rmp->is_ipv6 = ip_addr_version(&tunnel->src) == IP6 ? 1 : 0;
+ ip_address_copy_addr(rmp->source_ip, &tunnel->src);
+ ip_address_copy_addr(rmp->destination_ip, &tunnel->dst);
rmp->encap_fib_id = htonl(tunnel->encap_fib_index);
rmp->decap_fib_id = htonl(tunnel->decap_fib_index);
rmp->flags = tunnel->flags;
rmp->ver_res = tunnel->ver_res;
rmp->res = tunnel->res;
- rmp->iid = htonl(tunnel->iid);
+ rmp->iid = htonl(tunnel->vni);
+ rmp->context = context;
vl_msg_api_send_shmem (q, (u8 *)&rmp);
}
pool_foreach(tunnel, lgm->tunnels,
({
- send_lisp_gpe_tunnel_details(tunnel, q);
+ send_lisp_gpe_tunnel_details(tunnel, q, mp->context);
}));
}
static void
send_lisp_map_resolver_details (ip_address_t *ip,
- unix_shared_memory_queue_t *q)
+ unix_shared_memory_queue_t *q,
+ u32 context)
{
vl_api_lisp_map_resolver_details_t *rmp = NULL;
switch (ip_addr_version(ip)) {
case IP4:
rmp->is_ipv6 = 0;
- memcpy(rmp->ip_address, &ip_addr_v4(ip), sizeof(ip_addr_v4(ip)));
+ clib_memcpy(rmp->ip_address, &ip_addr_v4(ip), sizeof(ip_addr_v4(ip)));
break;
case IP6:
rmp->is_ipv6 = 1;
- memcpy(rmp->ip_address, &ip_addr_v6(ip), sizeof(ip_addr_v6(ip)));
+ clib_memcpy(rmp->ip_address, &ip_addr_v6(ip), sizeof(ip_addr_v6(ip)));
break;
default:
ASSERT(0);
}
+ rmp->context = context;
vl_msg_api_send_shmem (q, (u8 *)&rmp);
}
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();
}
vec_foreach(ip, lcm->map_resolvers) {
- send_lisp_map_resolver_details(ip, q);
+ send_lisp_map_resolver_details(ip, q, mp->context);
}
}
-static void
+static void
+send_lisp_enable_disable_details (unix_shared_memory_queue_t *q,
+ u32 context)
+{
+ vl_api_lisp_enable_disable_status_details_t *rmp = NULL;
+
+ rmp = vl_msg_api_alloc (sizeof (*rmp));
+ memset (rmp, 0, sizeof (*rmp));
+ rmp->_vl_msg_id = ntohs(VL_API_LISP_ENABLE_DISABLE_STATUS_DETAILS);
+
+ rmp->gpe_status = vnet_lisp_gpe_enable_disable_status ();
+ rmp->feature_status = vnet_lisp_enable_disable_status ();
+ rmp->context = context;
+
+ vl_msg_api_send_shmem (q, (u8 *)&rmp);
+}
+
+static void
+vl_api_lisp_enable_disable_status_dump_t_handler
+(vl_api_lisp_enable_disable_status_dump_t *mp)
+{
+ unix_shared_memory_queue_t * q = NULL;
+
+ q = vl_api_client_index_to_input_queue (mp->client_index);
+ if (q == 0) {
+ return;
+ }
+
+ send_lisp_enable_disable_details(q, mp->context);
+}
+
+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;
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;
event = pool_elt_at_index (am->arp_events, pool_index);
if (memcmp (&event->new_mac, new_mac, sizeof (event->new_mac))) {
- memcpy (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;
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;
}
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;
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));
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();
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);
p.is_outbound = mp->is_outbound;
p.is_ipv6 = mp->is_ipv6;
- memcpy(&p.raddr.start, mp->remote_address_start, 16);
- memcpy(&p.raddr.stop, mp->remote_address_stop, 16);
- memcpy(&p.laddr.start, mp->local_address_start, 16);
- memcpy(&p.laddr.stop, mp->local_address_stop, 16);
+ clib_memcpy(&p.raddr.start, mp->remote_address_start, 16);
+ clib_memcpy(&p.raddr.stop, mp->remote_address_stop, 16);
+ clib_memcpy(&p.laddr.start, mp->local_address_start, 16);
+ clib_memcpy(&p.laddr.stop, mp->local_address_stop, 16);
p.protocol = mp->protocol;
p.rport.start = ntohs(mp->remote_port_start);
}
sa.crypto_alg = mp->crypto_algorithm;
sa.crypto_key_len = mp->crypto_key_length;
- memcpy(&sa.crypto_key, mp->crypto_key, sizeof(sa.crypto_key));
+ clib_memcpy(&sa.crypto_key, mp->crypto_key, sizeof(sa.crypto_key));
/* check for unsupported integ-alg */
if (mp->integrity_algorithm < IPSEC_INTEG_ALG_SHA1_96 ||
mp->integrity_algorithm > IPSEC_INTEG_ALG_SHA_512_256) {
}
sa.integ_alg = mp->integrity_algorithm;
sa.integ_key_len = mp->integrity_key_length;
- memcpy(&sa.integ_key, mp->integrity_key, sizeof(sa.integ_key));
+ clib_memcpy(&sa.integ_key, mp->integrity_key, sizeof(sa.integ_key));
sa.use_esn = mp->use_extended_sequence_number;
sa.is_tunnel = mp->is_tunnel;
sa.is_tunnel_ip6 = mp->is_tunnel_ipv6;
- memcpy(&sa.tunnel_src_addr, mp->tunnel_src_address, 16);
- memcpy(&sa.tunnel_dst_addr, mp->tunnel_dst_address, 16);
+ clib_memcpy(&sa.tunnel_src_addr, mp->tunnel_src_address, 16);
+ clib_memcpy(&sa.tunnel_dst_addr, mp->tunnel_dst_address, 16);
rv = ipsec_add_del_sa(vm, &sa, mp->is_add);
#else
vl_api_ikev2_profile_add_del_t_handler
(vl_api_ikev2_profile_add_del_t * mp)
{
- vlib_main_t * vm = vlib_get_main();
vl_api_ikev2_profile_add_del_reply_t * rmp;
int rv = 0;
#if IPSEC > 0
+ vlib_main_t * vm = vlib_get_main();
clib_error_t * error;
u8 * tmp = format(0, "%s", mp->name);
error = ikev2_add_del_profile(vm, tmp, mp->is_add);
vl_api_ikev2_profile_set_auth_t_handler
(vl_api_ikev2_profile_set_auth_t * mp)
{
- vlib_main_t * vm = vlib_get_main();
vl_api_ikev2_profile_set_auth_reply_t * rmp;
int rv = 0;
#if IPSEC > 0
+ vlib_main_t * vm = vlib_get_main();
clib_error_t * error;
u8 * tmp = format(0, "%s", mp->name);
u8 * data = vec_new (u8, mp->data_len);
- memcpy(data, mp->data, mp->data_len);
+ clib_memcpy(data, mp->data, mp->data_len);
error = ikev2_set_profile_auth(vm, tmp, mp->auth_method, data, mp->is_hex);
vec_free (tmp);
vec_free (data);
vl_api_ikev2_profile_set_id_t_handler
(vl_api_ikev2_profile_set_id_t * mp)
{
- vlib_main_t * vm = vlib_get_main();
- vl_api_ikev2_profile_set_id_reply_t * rmp;
+ vl_api_ikev2_profile_add_del_reply_t * rmp;
int rv = 0;
#if IPSEC > 0
+ vlib_main_t * vm = vlib_get_main();
clib_error_t * error;
u8 * tmp = format(0, "%s", mp->name);
u8 * data = vec_new (u8, mp->data_len);
- memcpy(data, mp->data, mp->data_len);
+ clib_memcpy(data, mp->data, mp->data_len);
error = ikev2_set_profile_id(vm, tmp, mp->id_type, data, mp->is_local);
vec_free (tmp);
vec_free (data);
vl_api_ikev2_profile_set_ts_t_handler
(vl_api_ikev2_profile_set_ts_t * mp)
{
- vlib_main_t * vm = vlib_get_main();
vl_api_ikev2_profile_set_ts_reply_t * rmp;
int rv = 0;
#if IPSEC > 0
+ vlib_main_t * vm = vlib_get_main();
clib_error_t * error;
u8 * tmp = format(0, "%s", mp->name);
error = ikev2_set_profile_ts(vm, tmp, mp->proto, mp->start_port,
vl_api_ikev2_set_local_key_t_handler
(vl_api_ikev2_set_local_key_t * mp)
{
- vlib_main_t * vm = vlib_get_main();
- vl_api_ikev2_set_local_key_reply_t * rmp;
+ vl_api_ikev2_profile_set_ts_reply_t * rmp;
int rv = 0;
#if IPSEC > 0
+ vlib_main_t * vm = vlib_get_main();
clib_error_t * error;
error = ikev2_set_local_key(vm, mp->key_file);
}
pool_foreach(d, mm->domains, ({
+ /* Make sure every field is initiated (or don't skip the memset()) */
rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs(VL_API_MAP_DOMAIN_DETAILS);
rmp->domain_index = htonl(d - mm->domains);
rmp->ea_bits_len = d->ea_bits_len;
rmp->psid_offset = d->psid_offset;
rmp->psid_length = d->psid_length;
- memcpy(rmp->ip4_prefix, &d->ip4_prefix, sizeof(rmp->ip4_prefix));
+ clib_memcpy(rmp->ip4_prefix, &d->ip4_prefix, sizeof(rmp->ip4_prefix));
rmp->ip4_prefix_len = d->ip4_prefix_len;
- memcpy(rmp->ip6_prefix, &d->ip6_prefix, sizeof(rmp->ip6_prefix));
+ clib_memcpy(rmp->ip6_prefix, &d->ip6_prefix, sizeof(rmp->ip6_prefix));
rmp->ip6_prefix_len = d->ip6_prefix_len;
- memcpy(rmp->ip6_src, &d->ip6_src, sizeof(rmp->ip6_src));
+ clib_memcpy(rmp->ip6_src, &d->ip6_src, sizeof(rmp->ip6_src));
rmp->ip6_src_len = d->ip6_src_len;
rmp->mtu = htons(d->mtu);
rmp->is_translation = (d->flags & MAP_DOMAIN_TRANSLATION);
+ rmp->context = mp->context;
vl_msg_api_send_shmem (q, (u8 *)&rmp);
}));
memset(rmp, 0, sizeof(*rmp));
rmp->_vl_msg_id = ntohs(VL_API_MAP_RULE_DETAILS);
rmp->psid = htons(i);
- memcpy(rmp->ip6_dst, &dst, sizeof(rmp->ip6_dst));
+ clib_memcpy(rmp->ip6_dst, &dst, sizeof(rmp->ip6_dst));
+ rmp->context = mp->context;
vl_msg_api_send_shmem(q, (u8 *)&rmp);
}
}
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;
map_domain_counter_unlock (mm);
- /* Note: in HOST byte order! */
- rmp->total_pkts[MAP_DOMAIN_COUNTER_RX] = total_pkts[MAP_DOMAIN_COUNTER_RX];
- rmp->total_bytes[MAP_DOMAIN_COUNTER_RX] = total_bytes[MAP_DOMAIN_COUNTER_RX];
- rmp->total_pkts[MAP_DOMAIN_COUNTER_TX] = total_pkts[MAP_DOMAIN_COUNTER_TX];
- rmp->total_bytes[MAP_DOMAIN_COUNTER_TX] = total_bytes[MAP_DOMAIN_COUNTER_TX];
- rmp->total_bindings = pool_elts(mm->domains);
+ /* Note: in network byte order! */
+ rmp->total_pkts[MAP_DOMAIN_COUNTER_RX] = clib_host_to_net_u64(total_pkts[MAP_DOMAIN_COUNTER_RX]);
+ rmp->total_bytes[MAP_DOMAIN_COUNTER_RX] = clib_host_to_net_u64(total_bytes[MAP_DOMAIN_COUNTER_RX]);
+ rmp->total_pkts[MAP_DOMAIN_COUNTER_TX] = clib_host_to_net_u64(total_pkts[MAP_DOMAIN_COUNTER_TX]);
+ rmp->total_bytes[MAP_DOMAIN_COUNTER_TX] = clib_host_to_net_u64(total_bytes[MAP_DOMAIN_COUNTER_TX]);
+ rmp->total_bindings = clib_host_to_net_u64(pool_elts(mm->domains));
rmp->total_ip4_fragments = 0; // Not yet implemented. Should be a simple counter.
- rmp->total_security_check[MAP_DOMAIN_COUNTER_TX] = map_error_counter_get(ip4_map_node.index, MAP_ERROR_ENCAP_SEC_CHECK);
- rmp->total_security_check[MAP_DOMAIN_COUNTER_RX] = map_error_counter_get(ip4_map_node.index, MAP_ERROR_DECAP_SEC_CHECK);
+ rmp->total_security_check[MAP_DOMAIN_COUNTER_TX] = clib_host_to_net_u64(map_error_counter_get(ip4_map_node.index, MAP_ERROR_ENCAP_SEC_CHECK));
+ rmp->total_security_check[MAP_DOMAIN_COUNTER_RX] = clib_host_to_net_u64(map_error_counter_get(ip4_map_node.index, MAP_ERROR_DECAP_SEC_CHECK));
vl_msg_api_send_shmem(q, (u8 *)&rmp);
}
ipsec_sa_t sa;
sa.id = ntohl(mp->sa_id);
sa.crypto_key_len = mp->crypto_key_length;
- memcpy(&sa.crypto_key, mp->crypto_key, sizeof(sa.crypto_key));
+ clib_memcpy(&sa.crypto_key, mp->crypto_key, sizeof(sa.crypto_key));
sa.integ_key_len = mp->integrity_key_length;
- memcpy(&sa.integ_key, mp->integrity_key, sizeof(sa.integ_key));
+ clib_memcpy(&sa.integ_key, mp->integrity_key, sizeof(sa.integ_key));
rv = ipsec_set_sa_key(vm, &sa);
#else
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).
- * The current size of the serialized vector is
- * slightly under 4K.
*/
- vec_validate (vector, 4095);
+ vec_validate (vector, 16384);
vec_reset_length (vector);
- vector = vlib_node_serialize (&vm->node_main, vector);
-
+ /* $$$$ FIXME */
+ 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);
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);
}
{
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);
clib_error_report(error);
rv = clib_error_get_code(error);
}
-
+
REPLY_MACRO(VL_API_TRACE_PROFILE_DEL_REPLY);
}
+static void
+vl_api_af_packet_create_t_handler
+(vl_api_af_packet_create_t *mp)
+{
+ vlib_main_t *vm = vlib_get_main();
+ 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, &sw_if_index);
+
+ vec_free(host_if_name);
+
+ REPLY_MACRO2(VL_API_AF_PACKET_CREATE_REPLY,
+ rmp->sw_if_index = clib_host_to_net_u32(sw_if_index));
+}
+
+static void
+vl_api_af_packet_delete_t_handler
+(vl_api_af_packet_delete_t *mp)
+{
+ vlib_main_t * vm = vlib_get_main();
+ vl_api_af_packet_delete_reply_t *rmp;
+ int rv = 0;
+ u8 *host_if_name = NULL;
+
+ host_if_name = format(0, "%s", mp->host_if_name);
+ vec_add1 (host_if_name, 0);
+
+ rv = af_packet_delete_if(vm, host_if_name);
+
+ vec_free(host_if_name);
+
+ REPLY_MACRO(VL_API_AF_PACKET_DELETE_REPLY);
+}
+
+static void
+vl_api_policer_add_del_t_handler
+(vl_api_policer_add_del_t *mp)
+{
+ vlib_main_t * vm = vlib_get_main();
+ vl_api_policer_add_del_reply_t *rmp;
+ int rv = 0;
+ u8 *name = NULL;
+ sse2_qos_pol_cfg_params_st cfg;
+ clib_error_t * error;
+
+ name = format(0, "%s", mp->name);
+
+ memset (&cfg, 0, sizeof (cfg));
+ cfg.rfc = mp->type;
+ cfg.rnd_type = mp->round_type;
+ cfg.rate_type = mp->rate_type;
+ cfg.rb.kbps.cir_kbps = mp->cir;
+ cfg.rb.kbps.eir_kbps = mp->eir;
+ cfg.rb.kbps.cb_bytes = mp->cb;
+ cfg.rb.kbps.eb_bytes = mp->eb;
+
+ error = policer_add_del(vm, name, &cfg, mp->is_add);
+
+ if (error)
+ rv = VNET_API_ERROR_UNSPECIFIED;
+
+ REPLY_MACRO(VL_API_POLICER_ADD_DEL_REPLY);
+}
+
+static void
+send_policer_details (u8 *name,
+ sse2_qos_pol_cfg_params_st *config,
+ policer_read_response_type_st *templ,
+ unix_shared_memory_queue_t *q,
+ u32 context)
+{
+ vl_api_policer_details_t * mp;
+
+ mp = vl_msg_api_alloc (sizeof (*mp));
+ memset (mp, 0, sizeof (*mp));
+ mp->_vl_msg_id = ntohs (VL_API_POLICER_DETAILS);
+ mp->context = context;
+ mp->cir = htonl(config->rb.kbps.cir_kbps);
+ mp->eir = htonl(config->rb.kbps.eir_kbps);
+ mp->cb = htonl(config->rb.kbps.cb_bytes);
+ mp->eb = htonl(config->rb.kbps.eb_bytes);
+ mp->rate_type = config->rate_type;
+ mp->round_type = config->rnd_type;
+ mp->type = config->rfc;
+ mp->single_rate = templ->single_rate ? 1 : 0;
+ mp->color_aware = templ->color_aware ? 1 : 0;
+ mp->scale = htonl(templ->scale);
+ mp->cir_tokens_per_period = htonl(templ->cir_tokens_per_period);
+ mp->pir_tokens_per_period = htonl(templ->pir_tokens_per_period);
+ mp->current_limit = htonl(templ->current_limit);
+ mp->current_bucket = htonl(templ->current_bucket);
+ mp->extended_limit = htonl(templ->extended_limit);
+ mp->extended_bucket = htonl(templ->extended_bucket);
+ mp->last_update_time = clib_host_to_net_u64(templ->last_update_time);
+
+ strncpy ((char *) mp->name, (char *) name, ARRAY_LEN(mp->name) - 1);
+
+ vl_msg_api_send_shmem (q, (u8 *)&mp);
+}
+
+static void
+vl_api_policer_dump_t_handler
+(vl_api_policer_dump_t *mp)
+{
+ unix_shared_memory_queue_t * q;
+ vnet_policer_main_t * pm = &vnet_policer_main;
+ hash_pair_t * hp;
+ uword * p;
+ u32 pool_index;
+ u8 * match_name = 0;
+ u8 * name;
+ sse2_qos_pol_cfg_params_st *config;
+ policer_read_response_type_st *templ;
+
+ q = vl_api_client_index_to_input_queue (mp->client_index);
+ if (q == 0)
+ return;
+
+ if (mp->match_name_valid) {
+ match_name = format(0, "%s%c", mp->match_name, 0);
+ }
+
+ if (mp->match_name_valid) {
+ p = hash_get_mem (pm->policer_config_by_name, match_name);
+ if (p) {
+ pool_index = p[0];
+ config = pool_elt_at_index (pm->configs, pool_index);
+ templ = pool_elt_at_index (pm->policer_templates, pool_index);
+ send_policer_details(match_name, config, templ, q, mp->context);
+ }
+ } else {
+ hash_foreach_pair (hp, pm->policer_config_by_name,
+ ({
+ name = (u8 *) hp->key;
+ pool_index = hp->value[0];
+ config = pool_elt_at_index (pm->configs, pool_index);
+ templ = pool_elt_at_index (pm->policer_templates, pool_index);
+ send_policer_details(name, config, templ, q, mp->context);
+ }));
+ }
+}
+
+static void
+vl_api_netmap_create_t_handler
+(vl_api_netmap_create_t *mp)
+{
+ vlib_main_t *vm = vlib_get_main();
+ vl_api_netmap_create_reply_t *rmp;
+ int rv = 0;
+ u8 *if_name = NULL;
+
+ if_name = format(0, "%s", mp->netmap_if_name);
+ vec_add1 (if_name, 0);
+
+ rv = netmap_create_if(vm, if_name, mp->use_random_hw_addr ? 0 : mp->hw_addr,
+ mp->is_pipe, mp->is_master, 0);
+
+ vec_free(if_name);
+
+ REPLY_MACRO(VL_API_NETMAP_CREATE_REPLY);
+}
+
+static void
+vl_api_netmap_delete_t_handler
+(vl_api_netmap_delete_t *mp)
+{
+ vlib_main_t * vm = vlib_get_main();
+ vl_api_netmap_delete_reply_t *rmp;
+ int rv = 0;
+ u8 *if_name = NULL;
+
+ if_name = format(0, "%s", mp->netmap_if_name);
+ vec_add1 (if_name, 0);
+
+ rv = netmap_delete_if(vm, if_name);
+
+ vec_free(if_name);
+
+ REPLY_MACRO(VL_API_NETMAP_DELETE_REPLY);
+}
#define BOUNCE_HANDLER(nn) \
static void vl_api_##nn##_t_handler ( \
vl_msg_api_free (mp); \
}
-BOUNCE_HANDLER(to_netconf_server);
-BOUNCE_HANDLER(from_netconf_server);
-BOUNCE_HANDLER(to_netconf_client);
-BOUNCE_HANDLER(from_netconf_client);
-
/*
* 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()
*/
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,
vl_api_sr_tunnel_add_del_t_print,
256, 1);
- am->message_bounce [VL_API_FROM_NETCONF_SERVER] = 1;
- am->message_bounce [VL_API_TO_NETCONF_SERVER] = 1;
- am->message_bounce [VL_API_FROM_NETCONF_CLIENT] = 1;
- am->message_bounce [VL_API_TO_NETCONF_CLIENT] = 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,
+ "sr_policy_add_del",
+ vl_api_sr_policy_add_del_t_handler,
+ vl_noop_handler,
+ vl_api_sr_policy_add_del_t_endian,
+ 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);
+= 5 * sizeof (u32x4);
am->api_trace_cfg [VL_API_VXLAN_ADD_DEL_TUNNEL].size
+= 16 * sizeof (u32);
-
- /*
- * trace space for 4 nsh-gre variable TLV words
- */
- am->api_trace_cfg [VL_API_NSH_GRE_ADD_DEL_TUNNEL].size
- += 4 * sizeof (u32);
- /*
+ /*
* Thread-safe API messages
*/
am->is_mp_safe [VL_API_IP_ADD_DEL_ROUTE] = 1;
+ am->is_mp_safe [VL_API_GET_NODE_GRAPH] = 1;
return 0;
}
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)
{
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)
{
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;
return 0;
}
- pool_foreach (event, am->arp_events,
+ pool_foreach (event, am->arp_events,
({
vlib_cli_output (vm, "%U", format_arp_event, event);
}));