#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>
#undef BIHASH_TYPE
#undef __included_bihash_template_h__
_(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) \
_(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_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) \
+_(SR_MULTICAST_MAP_ADD_DEL, sr_multicast_map_add_del) \
+_(AF_PACKET_CREATE, af_packet_create) \
+_(AF_PACKET_DELETE, af_packet_delete)
#define QUOTE_(x) #x
#define QUOTE(x) QUOTE_(x)
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;
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 */
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);
}
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;
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 */
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);
}
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;
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 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);
}
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);
}
}
}
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);
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));
+ mp->mac_address, sizeof (mp->mac_address), mp->is_static);
else
rv = vnet_unset_ip6_ethernet_neighbor
(vm, ntohl(mp->sw_if_index),
}
}
- 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),
}
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 =
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->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,
(char *) interface_name, ARRAY_LEN(mp->interface_name)-1);
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;
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_details (am, q, swif, name_string, mp->context);
send_sw_interface_flags (am, q, swif);
}
_vec_len (name_string) = 0;
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);
}
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);
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);
a->is_del = (mp->is_add == 0);
a->rx_table_id = ntohl(mp->outer_vrf_id);
a->tx_table_id = ntohl(mp->inner_vrf_id);
-
+
+ a->name = format(0, "%s", mp->name);
+ if (!(vec_len(a->name)))
+ a->name = 0;
+
+ a->policy_name = format(0, "%s", mp->policy_name);
+ if (!(vec_len(a->policy_name)))
+ a->policy_name = 0;
+
/* Yank segments and tags out of the API message */
this_address = (ip6_address_t *)mp->segs_and_tags;
for (i = 0; i < mp->n_segments; i++) {
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) \
#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);
}
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);
}
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);
}
encap_fib_index = p[0];
+ /* Check src & dst are different */
+ if ((a->is_ip6 && memcmp(mp->src_address, mp->dst_address, 16) == 0) ||
+ (!a->is_ip6 && 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);
}
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)
+static void vl_api_gre_add_del_tunnel_t_handler
+(vl_api_gre_add_del_tunnel_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);
+ vl_api_gre_add_del_tunnel_reply_t * rmp;
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)
-{
- vl_api_nsh_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];
+ outer_table_id = p[0];
- decap_next_index = ntohl(mp->decap_next_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];
- } 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);
+ 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));
-out:
- REPLY_MACRO2(VL_API_NSH_VXLAN_GPE_ADD_DEL_TUNNEL_REPLY,
- ({
- rmp->sw_if_index = ntohl (sw_if_index);
- }));
+ 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 = ntohl(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;
a->is_add = mp->is_add;
/* ip addresses sent in network byte order */
- a->src.as_u32 = mp->src;
- a->dst.as_u32 = mp->dst;
+ a->local.as_u32 = ntohl(mp->local);
+ a->remote.as_u32 = ntohl(mp->remote);
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);
}));
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;
+ a->table_id = mp->table_id;
+ a->vni = mp->vni;
vnet_lisp_gpe_add_del_iface (a, 0);
REPLY_MACRO(VL_API_LISP_GPE_ADD_DEL_IFACE_REPLY);
}
+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
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);
}
}
vec_foreach(ip, lcm->map_resolvers) {
- send_lisp_map_resolver_details(ip, q);
+ send_lisp_map_resolver_details(ip, q, mp->context);
+ }
+
+}
+
+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
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) ||
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
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);
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);
}
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);
}
}
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
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;
+
+ 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);
+
+ vec_free(host_if_name);
+
+ REPLY_MACRO(VL_API_AF_PACKET_CREATE_REPLY);
+}
+
+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);
+}
#define BOUNCE_HANDLER(nn) \
static void vl_api_##nn##_t_handler ( \
vl_api_sr_tunnel_add_del_t_print,
256, 1);
+
+ /*
+ * Manually register the sr policy add del msg, so we trace
+ * enough bytes to capture a typical tunnel name list
+ */
+ vl_msg_api_set_handlers (VL_API_SR_POLICY_ADD_DEL,
+ "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_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
*/
Code Review / vpp.git / blobdiff