API refactoring : lisp-gpe
[vpp.git] / vpp / vpp-api / api.c
index 2c0256c..0102260 100644 (file)
 #include <vnet/vnet.h>
 #include <vnet/l2/l2_input.h>
 #include <vnet/l2/l2_bd.h>
-#include <vnet/l2tp/l2tp.h>
 #include <vnet/ip/ip.h>
 #include <vnet/ip/ip6.h>
-#include <vnet/unix/tuntap.h>
-#include <vnet/unix/tapcli.h>
+#include <vnet/ip/ip6_neighbor.h>
 #include <vnet/mpls/mpls.h>
+#include <vnet/mpls/mpls_tunnel.h>
 #include <vnet/dhcp/proxy.h>
 #include <vnet/dhcp/client.h>
 #if IPV6SR > 0
 #include <vnet/classify/flow_classify.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/vxlan-gpe/vxlan_gpe.h>
-#include <vnet/lisp-gpe/lisp_gpe.h>
-#include <vnet/lisp-gpe/lisp_gpe_fwd_entry.h>
-#include <vnet/lisp-gpe/lisp_gpe_tenant.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/ip/ip_source_and_port_range_check.h>
-#include <vnet/devices/af_packet/af_packet.h>
 #include <vnet/policer/policer.h>
-#include <vnet/devices/netmap/netmap.h>
 #include <vnet/flow/flow_report.h>
-#include <vnet/ipsec-gre/ipsec_gre.h>
 #include <vnet/flow/flow_report_classify.h>
 #include <vnet/ip/punt.h>
 #include <vnet/feature/feature.h>
 #include <vnet/devices/dpdk/dpdk.h>
 #endif
 
-#if IPSEC > 0
-#include <vnet/ipsec/ipsec.h>
-#include <vnet/ipsec/ikev2.h>
-#endif /* IPSEC */
-#include <vnet/devices/virtio/vhost-user.h>
-
 #include <stats/stats.h>
 #include <oam/oam.h>
-
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/ethernet/arp_packet.h>
 #include <vnet/interface.h>
-
 #include <vnet/l2/l2_fib.h>
 #include <vnet/l2/l2_bd.h>
 #include <vpp-api/vpe_msg_enum.h>
 #include <vnet/span/span.h>
-
 #include <vnet/fib/ip6_fib.h>
 #include <vnet/fib/ip4_fib.h>
+#include <vnet/fib/fib_api.h>
 #include <vnet/dpo/drop_dpo.h>
 #include <vnet/dpo/receive_dpo.h>
 #include <vnet/dpo/lookup_dpo.h>
 #include <vnet/dpo/classify_dpo.h>
 #include <vnet/dpo/ip_null_dpo.h>
-
 #define vl_typedefs            /* define message structures */
 #include <vpp-api/vpe_all_api_h.h>
 #undef vl_typedefs
-
 #define vl_endianfun           /* define message structures */
 #include <vpp-api/vpe_all_api_h.h>
 #undef vl_endianfun
-
 /* instantiate all the print functions we know about */
 #define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
 #define vl_printfun
 #include <vpp-api/vpe_all_api_h.h>
 #undef vl_printfun
-
 #include <vlibapi/api_helper_macros.h>
-
 #define foreach_vpe_api_msg                                             \
-_(WANT_INTERFACE_EVENTS, want_interface_events)                         \
 _(WANT_OAM_EVENTS, want_oam_events)                                     \
 _(OAM_ADD_DEL, oam_add_del)                                             \
-_(SW_INTERFACE_DUMP, sw_interface_dump)                                 \
-_(SW_INTERFACE_DETAILS, sw_interface_details)                           \
-_(IP_ADD_DEL_ROUTE, ip_add_del_route)                                   \
 _(MPLS_ROUTE_ADD_DEL, mpls_route_add_del)                               \
 _(MPLS_IP_BIND_UNBIND, mpls_ip_bind_unbind)                             \
 _(IS_ADDRESS_REACHABLE, is_address_reachable)                           \
-_(SW_INTERFACE_ADD_DEL_ADDRESS, sw_interface_add_del_address)           \
-_(SW_INTERFACE_SET_TABLE, sw_interface_set_table)                       \
 _(SW_INTERFACE_SET_MPLS_ENABLE, sw_interface_set_mpls_enable)           \
 _(SW_INTERFACE_SET_VPATH, sw_interface_set_vpath)                       \
 _(SW_INTERFACE_SET_VXLAN_BYPASS, sw_interface_set_vxlan_bypass)         \
@@ -168,31 +140,17 @@ _(BRIDGE_DOMAIN_SW_IF_DETAILS, bridge_domain_sw_if_details)             \
 _(L2FIB_ADD_DEL, l2fib_add_del)                                         \
 _(L2_FLAGS, l2_flags)                                                   \
 _(BRIDGE_FLAGS, bridge_flags)                                           \
-_(TAP_CONNECT, tap_connect)                                             \
-_(TAP_MODIFY, tap_modify)                                               \
-_(TAP_DELETE, tap_delete)                                               \
-_(SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump)                         \
 _(CREATE_VLAN_SUBIF, create_vlan_subif)                                 \
 _(CREATE_SUBIF, create_subif)                                           \
-_(MPLS_ETHERNET_ADD_DEL_TUNNEL, mpls_ethernet_add_del_tunnel)           \
-_(MPLS_ETHERNET_ADD_DEL_TUNNEL_2, mpls_ethernet_add_del_tunnel_2)       \
-_(MPLS_ADD_DEL_ENCAP, mpls_add_del_encap)                               \
+_(MPLS_TUNNEL_ADD_DEL, mpls_tunnel_add_del)                            \
 _(PROXY_ARP_ADD_DEL, proxy_arp_add_del)                                 \
 _(PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable)       \
-_(IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del)                             \
 _(VNET_GET_SUMMARY_STATS, vnet_get_summary_stats)                      \
 _(RESET_FIB, reset_fib)                                                        \
 _(DHCP_PROXY_CONFIG,dhcp_proxy_config)                                 \
 _(DHCP_PROXY_CONFIG_2,dhcp_proxy_config_2)                             \
 _(DHCP_PROXY_SET_VSS,dhcp_proxy_set_vss)                                \
 _(DHCP_CLIENT_CONFIG, dhcp_client_config)                              \
-_(SET_IP_FLOW_HASH,set_ip_flow_hash)                                    \
-_(SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config)           \
-_(SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix)           \
-_(SW_INTERFACE_IP6_ENABLE_DISABLE, sw_interface_ip6_enable_disable )    \
-_(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS,                             \
-  sw_interface_ip6_set_link_local_address)                              \
-_(SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered)            \
 _(CREATE_LOOPBACK, create_loopback)                                    \
 _(CONTROL_PING, control_ping)                                           \
 _(CLI_REQUEST, cli_request)                                             \
@@ -205,25 +163,11 @@ _(CLASSIFY_SET_INTERFACE_IP_TABLE, classify_set_interface_ip_table)     \
 _(CLASSIFY_SET_INTERFACE_L2_TABLES, classify_set_interface_l2_tables)   \
 _(GET_NODE_INDEX, get_node_index)                                       \
 _(ADD_NODE_NEXT, add_node_next)                                                \
-_(L2TPV3_CREATE_TUNNEL, l2tpv3_create_tunnel)                           \
-_(L2TPV3_SET_TUNNEL_COOKIES, l2tpv3_set_tunnel_cookies)                 \
-_(L2TPV3_INTERFACE_ENABLE_DISABLE, l2tpv3_interface_enable_disable)     \
-_(L2TPV3_SET_LOOKUP_KEY, l2tpv3_set_lookup_key)                         \
-_(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)         \
-_(CREATE_VHOST_USER_IF, create_vhost_user_if)                           \
-_(MODIFY_VHOST_USER_IF, modify_vhost_user_if)                           \
-_(DELETE_VHOST_USER_IF, delete_vhost_user_if)                           \
-_(SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump)           \
-_(IP_ADDRESS_DUMP, ip_address_dump)                                     \
-_(IP_DUMP, ip_dump)                                                     \
-_(SW_INTERFACE_VHOST_USER_DETAILS, sw_interface_vhost_user_details)    \
 _(SHOW_VERSION, show_version)                                          \
 _(L2_FIB_TABLE_DUMP, l2_fib_table_dump)                                        \
 _(L2_FIB_TABLE_ENTRY, l2_fib_table_entry)                               \
@@ -233,70 +177,20 @@ _(INTERFACE_NAME_RENUMBER, interface_name_renumber)                       \
 _(WANT_IP4_ARP_EVENTS, want_ip4_arp_events)                             \
 _(WANT_IP6_ND_EVENTS, want_ip6_nd_events)                               \
 _(INPUT_ACL_SET_INTERFACE, input_acl_set_interface)                     \
-_(IPSEC_SPD_ADD_DEL, ipsec_spd_add_del)                                 \
-_(IPSEC_INTERFACE_ADD_DEL_SPD, ipsec_interface_add_del_spd)             \
-_(IPSEC_SPD_ADD_DEL_ENTRY, ipsec_spd_add_del_entry)                     \
-_(IPSEC_SAD_ADD_DEL_ENTRY, ipsec_sad_add_del_entry)                     \
-_(IPSEC_SA_SET_KEY, ipsec_sa_set_key)                                   \
-_(IKEV2_PROFILE_ADD_DEL, ikev2_profile_add_del)                         \
-_(IKEV2_PROFILE_SET_AUTH, ikev2_profile_set_auth)                       \
-_(IKEV2_PROFILE_SET_ID, ikev2_profile_set_id)                           \
-_(IKEV2_PROFILE_SET_TS, ikev2_profile_set_ts)                           \
-_(IKEV2_SET_LOCAL_KEY, ikev2_set_local_key)                             \
 _(DELETE_LOOPBACK, delete_loopback)                                     \
 _(BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del)                                 \
-_(MAP_ADD_DOMAIN, map_add_domain)                                       \
-_(MAP_DEL_DOMAIN, map_del_domain)                                       \
-_(MAP_ADD_DEL_RULE, map_add_del_rule)                                   \
-_(MAP_DOMAIN_DUMP, map_domain_dump)                                     \
-_(MAP_RULE_DUMP, map_rule_dump)                                                \
-_(MAP_SUMMARY_STATS, map_summary_stats)                                        \
 _(COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable)          \
 _(COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable)          \
 _(GET_NODE_GRAPH, get_node_graph)                                       \
-_(SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats)                   \
-_(IOAM_ENABLE, ioam_enable)                                 \
-_(IOAM_DISABLE, ioam_disable)                                 \
-_(LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set)                   \
-_(LISP_ADD_DEL_LOCATOR, lisp_add_del_locator)                           \
-_(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_ADD_DEL_ADJACENCY, lisp_add_del_adjacency)                       \
-_(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set)                 \
-_(LISP_MAP_REQUEST_MODE, lisp_map_request_mode)                         \
-_(LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map)               \
-_(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump)                         \
-_(LISP_LOCATOR_DUMP, lisp_locator_dump)                                 \
-_(LISP_EID_TABLE_DUMP, lisp_eid_table_dump)                             \
-_(LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump)                           \
-_(LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump)                       \
-_(LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump)                     \
-_(LISP_EID_TABLE_VNI_DUMP, lisp_eid_table_vni_dump)                     \
-_(LISP_ADJACENCIES_GET, lisp_adjacencies_get)                           \
-_(SHOW_LISP_STATUS, show_lisp_status)                                   \
-_(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)       \
-_(SHOW_LISP_PITR, show_lisp_pitr)                                       \
-_(SHOW_LISP_MAP_REQUEST_MODE, show_lisp_map_request_mode)               \
+_(IOAM_ENABLE, ioam_enable)                                             \
+_(IOAM_DISABLE, ioam_disable)                                           \
 _(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)                                           \
 _(POLICER_CLASSIFY_SET_INTERFACE, policer_classify_set_interface)       \
 _(POLICER_CLASSIFY_DUMP, policer_classify_dump)                         \
-_(NETMAP_CREATE, netmap_create)                                         \
-_(NETMAP_DELETE, netmap_delete)                                         \
-_(MPLS_ETH_TUNNEL_DUMP, mpls_eth_tunnel_dump)                           \
-_(MPLS_ETH_TUNNEL_DETAILS, mpls_eth_tunnel_details)                     \
-_(MPLS_FIB_ENCAP_DUMP, mpls_fib_encap_dump)                             \
-_(MPLS_FIB_ENCAP_DETAILS, mpls_fib_encap_details)                       \
+_(MPLS_TUNNEL_DUMP, mpls_tunnel_dump)                                   \
+_(MPLS_TUNNEL_DETAILS, mpls_tunnel_details)                             \
 _(MPLS_FIB_DUMP, mpls_fib_dump)                                         \
 _(MPLS_FIB_DETAILS, mpls_fib_details)                                   \
 _(CLASSIFY_TABLE_IDS,classify_table_ids)                                \
@@ -310,8 +204,6 @@ _(SET_IPFIX_CLASSIFY_STREAM, set_ipfix_classify_stream)                 \
 _(IPFIX_CLASSIFY_STREAM_DUMP, ipfix_classify_stream_dump)               \
 _(IPFIX_CLASSIFY_TABLE_ADD_DEL, ipfix_classify_table_add_del)           \
 _(IPFIX_CLASSIFY_TABLE_DUMP, ipfix_classify_table_dump)                 \
-_(SW_INTERFACE_SPAN_ENABLE_DISABLE, sw_interface_span_enable_disable)   \
-_(SW_INTERFACE_SPAN_DUMP, sw_interface_span_dump)                       \
 _(GET_NEXT_INDEX, get_next_index)                                       \
 _(PG_CREATE_INTERFACE, pg_create_interface)                             \
 _(PG_CAPTURE, pg_capture)                                               \
@@ -320,86 +212,27 @@ _(IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL,                               \
   ip_source_and_port_range_check_add_del)                               \
 _(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL,                     \
   ip_source_and_port_range_check_interface_add_del)                     \
-_(IPSEC_GRE_ADD_DEL_TUNNEL, ipsec_gre_add_del_tunnel)                   \
-_(IPSEC_GRE_TUNNEL_DUMP, ipsec_gre_tunnel_dump)                         \
 _(DELETE_SUBIF, delete_subif)                                           \
 _(L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite)           \
 _(PUNT, punt)                                                           \
 _(FLOW_CLASSIFY_SET_INTERFACE, flow_classify_set_interface)             \
 _(FLOW_CLASSIFY_DUMP, flow_classify_dump)                               \
-_(IPSEC_SPD_DUMP, ipsec_spd_dump)                                       \
-_(IP_FIB_DUMP, ip_fib_dump)                                             \
-_(IP_FIB_DETAILS, ip_fib_details)                                       \
-_(IP6_FIB_DUMP, ip6_fib_dump)                                           \
-_(IP6_FIB_DETAILS, ip6_fib_details)                                     \
 _(FEATURE_ENABLE_DISABLE, feature_enable_disable)
 
 #define QUOTE_(x) #x
 #define QUOTE(x) QUOTE_(x)
-
-#define foreach_registration_hash               \
-_(interface_events)                             \
-_(to_netconf_server)                            \
-_(from_netconf_server)                          \
-_(to_netconf_client)                            \
-_(from_netconf_client)                          \
-_(oam_events)
-
 typedef enum
 {
   RESOLVE_IP4_ADD_DEL_ROUTE = 1,
   RESOLVE_IP6_ADD_DEL_ROUTE,
-  RESOLVE_MPLS_ETHERNET_ADD_DEL,
 } resolve_t;
 
-typedef struct
-{
-  u8 resolve_type;
-  union
-  {
-    vl_api_ip_add_del_route_t r;
-    vl_api_mpls_ethernet_add_del_tunnel_2_t t;
-  };
-} pending_route_t;
-
-typedef struct
-{
-
-#define _(a) uword *a##_registration_hash;              \
-    vpe_client_registration_t * a##_registrations;
-  foreach_registration_hash
-#undef _
-    /* notifications happen really early in the game */
-  u8 link_state_process_up;
-
-  /* ip4 and ip6 pending route adds */
-  pending_route_t *pending_routes;
-
-  /* ip4 arp event registration pool */
-  vl_api_ip4_arp_event_t *arp_events;
-
-  /* ip6 nd event registration pool */
-  vl_api_ip6_nd_event_t *nd_events;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} vpe_api_main_t;
-
 static vlib_node_registration_t vpe_resolver_process_node;
-static vpe_api_main_t vpe_api_main;
-
-static void send_sw_interface_flags (vpe_api_main_t * am,
-                                    unix_shared_memory_queue_t * q,
-                                    vnet_sw_interface_t * swif);
-static void send_sw_interface_flags_deleted (vpe_api_main_t * am,
-                                            unix_shared_memory_queue_t * q,
-                                            u32 sw_if_index);
+vpe_api_main_t vpe_api_main;
 
 static int arp_change_delete_callback (u32 pool_index, u8 * notused);
 static int nd_change_delete_callback (u32 pool_index, u8 * notused);
 
-
 /* Clean up all registrations belonging to the indicated client */
 int
 vl_api_memclnt_delete_callback (u32 client_index)
@@ -423,179 +256,16 @@ vl_api_memclnt_delete_callback (u32 client_index)
   return 0;
 }
 
-#define API_LINK_STATE_EVENT 1
-#define API_ADMIN_UP_DOWN_EVENT 2
-
-static int
-event_data_cmp (void *a1, void *a2)
-{
-  uword *e1 = a1;
-  uword *e2 = a2;
-
-  return (word) e1[0] - (word) e2[0];
-}
-
-static uword
-link_state_process (vlib_main_t * vm,
-                   vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  vpe_api_main_t *vam = &vpe_api_main;
-  vnet_main_t *vnm = vam->vnet_main;
-  vnet_sw_interface_t *swif;
-  uword *event_data = 0;
-  vpe_client_registration_t *reg;
-  int i;
-  u32 prev_sw_if_index;
-  unix_shared_memory_queue_t *q;
-
-  vam->link_state_process_up = 1;
-
-  while (1)
-    {
-      vlib_process_wait_for_event (vm);
-
-      /* Unified list of changed link or admin state sw_if_indices */
-      vlib_process_get_events_with_type
-       (vm, &event_data, API_LINK_STATE_EVENT);
-      vlib_process_get_events_with_type
-       (vm, &event_data, API_ADMIN_UP_DOWN_EVENT);
-
-      /* Sort, so we can eliminate duplicates */
-      vec_sort_with_function (event_data, event_data_cmp);
-
-      prev_sw_if_index = ~0;
-
-      for (i = 0; i < vec_len (event_data); i++)
-       {
-         /* Only one message per swif */
-         if (prev_sw_if_index == event_data[i])
-           continue;
-         prev_sw_if_index = event_data[i];
-
-          /* *INDENT-OFF* */
-          pool_foreach(reg, vam->interface_events_registrations,
-          ({
-            q = vl_api_client_index_to_input_queue (reg->client_index);
-            if (q)
-              {
-                /* sw_interface may be deleted already */
-                if (!pool_is_free_index (vnm->interface_main.sw_interfaces,
-                                         event_data[i]))
-                  {
-                    swif = vnet_get_sw_interface (vnm, event_data[i]);
-                    send_sw_interface_flags (vam, q, swif);
-                  }
-              }
-          }));
-          /* *INDENT-ON* */
-       }
-      vec_reset_length (event_data);
-    }
-
-  return 0;
-}
-
-static clib_error_t *link_up_down_function (vnet_main_t * vm, u32 hw_if_index,
-                                           u32 flags);
-static clib_error_t *admin_up_down_function (vnet_main_t * vm,
-                                            u32 hw_if_index, u32 flags);
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (link_state_process_node,static) = {
-  .function = link_state_process,
-  .type = VLIB_NODE_TYPE_PROCESS,
-  .name = "vpe-link-state-process",
-};
-/* *INDENT-ON* */
-
-VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (admin_up_down_function);
-VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION (link_up_down_function);
-
-static clib_error_t *
-link_up_down_function (vnet_main_t * vm, u32 hw_if_index, u32 flags)
-{
-  vpe_api_main_t *vam = &vpe_api_main;
-  vnet_hw_interface_t *hi = vnet_get_hw_interface (vm, hw_if_index);
-
-  if (vam->link_state_process_up)
-    vlib_process_signal_event (vam->vlib_main,
-                              link_state_process_node.index,
-                              API_LINK_STATE_EVENT, hi->sw_if_index);
-  return 0;
-}
-
-static clib_error_t *
-admin_up_down_function (vnet_main_t * vm, u32 sw_if_index, u32 flags)
-{
-  vpe_api_main_t *vam = &vpe_api_main;
-
-  /*
-   * Note: it's perfectly fair to set a subif admin up / admin down.
-   * Note the subtle distinction between this routine and the previous
-   * routine.
-   */
-  if (vam->link_state_process_up)
-    vlib_process_signal_event (vam->vlib_main,
-                              link_state_process_node.index,
-                              API_ADMIN_UP_DOWN_EVENT, sw_if_index);
-  return 0;
-}
-
-#define pub_sub_handler(lca,UCA)                                        \
-static void vl_api_want_##lca##_t_handler (                             \
-    vl_api_want_##lca##_t *mp)                                          \
-{                                                                       \
-    vpe_api_main_t *vam = &vpe_api_main;                                \
-    vpe_client_registration_t *rp;                                      \
-    vl_api_want_##lca##_reply_t *rmp;                                   \
-    uword *p;                                                           \
-    i32 rv = 0;                                                         \
-                                                                        \
-    p = hash_get (vam->lca##_registration_hash, mp->client_index);      \
-    if (p) {                                                            \
-        if (mp->enable_disable) {                                       \
-            clib_warning ("pid %d: already enabled...", mp->pid);       \
-            rv = VNET_API_ERROR_INVALID_REGISTRATION;                   \
-            goto reply;                                                 \
-        } else {                                                        \
-            rp = pool_elt_at_index (vam->lca##_registrations, p[0]);    \
-            pool_put (vam->lca##_registrations, rp);                    \
-            hash_unset (vam->lca##_registration_hash,                   \
-                mp->client_index);                                      \
-            goto reply;                                                 \
-        }                                                               \
-    }                                                                   \
-    if (mp->enable_disable == 0) {                                      \
-        clib_warning ("pid %d: already disabled...", mp->pid);          \
-        rv = VNET_API_ERROR_INVALID_REGISTRATION;                       \
-        goto reply;                                                     \
-    }                                                                   \
-    pool_get (vam->lca##_registrations, rp);                            \
-    rp->client_index = mp->client_index;                                \
-    rp->client_pid = mp->pid;                                           \
-    hash_set (vam->lca##_registration_hash, rp->client_index,           \
-              rp - vam->lca##_registrations);                           \
-                                                                        \
-reply:                                                                  \
-    REPLY_MACRO (VL_API_WANT_##UCA##_REPLY);                            \
-}
-
-/* *INDENT-OFF* */
-pub_sub_handler (interface_events, INTERFACE_EVENTS)
-pub_sub_handler (oam_events, OAM_EVENTS)
-/* *INDENT-ON* */
+pub_sub_handler (oam_events, OAM_EVENTS);
 
 #define RESOLUTION_EVENT 1
 #define RESOLUTION_PENDING_EVENT 2
 #define IP4_ARP_EVENT 3
 #define IP6_ND_EVENT 4
 
-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);
+int ip4_add_del_route_t_handler (vl_api_ip_add_del_route_t * mp);
 
-static int mpls_ethernet_add_del_tunnel_2_t_handler
-  (vl_api_mpls_ethernet_add_del_tunnel_2_t * mp);
+int ip6_add_del_route_t_handler (vl_api_ip_add_del_route_t * mp);
 
 void
 handle_ip4_arp_event (u32 pool_index)
@@ -702,13 +372,7 @@ resolver_process (vlib_main_t * vm,
   uword event_type;
   uword *event_data = 0;
   f64 timeout = 100.0;
-  vpe_api_main_t *vam = &vpe_api_main;
-  pending_route_t *pr;
-  vl_api_ip_add_del_route_t *adr;
-  vl_api_mpls_ethernet_add_del_tunnel_2_t *pme;
-  u32 *resolution_failures = 0;
-  int i, rv;
-  clib_error_t *e;
+  int i;
 
   while (1)
     {
@@ -723,58 +387,7 @@ resolver_process (vlib_main_t * vm,
          break;
 
        case RESOLUTION_EVENT:
-         for (i = 0; i < vec_len (event_data); i++)
-           {
-             /*
-              * Resolution events can occur long after the
-              * original request has timed out. $$$ add a cancel
-              * mechanism..
-              */
-             if (pool_is_free_index (vam->pending_routes, event_data[i]))
-               continue;
-
-             pr = pool_elt_at_index (vam->pending_routes, event_data[i]);
-             adr = &pr->r;
-             pme = &pr->t;
-
-             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",
-                               format_ip4_address,
-                               (ip4_address_t *) & (adr->dst_address),
-                               adr->dst_address_length,
-                               format_ip4_address,
-                               (ip4_address_t *) & (adr->next_hop_address),
-                               (rv >= 0) ? "succeeded" : "failed");
-                 break;
-
-               case RESOLVE_IP6_ADD_DEL_ROUTE:
-                 rv = ip6_add_del_route_t_handler (adr);
-                 clib_warning ("resolver: add %U/%d via %U %s",
-                               format_ip6_address,
-                               (ip6_address_t *) & (adr->dst_address),
-                               adr->dst_address_length,
-                               format_ip6_address,
-                               (ip6_address_t *) & (adr->next_hop_address),
-                               (rv >= 0) ? "succeeded" : "failed");
-                 break;
-
-               case RESOLVE_MPLS_ETHERNET_ADD_DEL:
-                 rv = mpls_ethernet_add_del_tunnel_2_t_handler (pme);
-                 clib_warning ("resolver: add mpls-o-e via %U %s",
-                               format_ip4_address,
-                               (ip4_address_t *) &
-                               (pme->next_hop_ip4_address_in_outer_vrf),
-                               (rv >= 0) ? "succeeded" : "failed");
-                 break;
-
-               default:
-                 clib_warning ("resolver: BOGUS TYPE %d", pr->resolve_type);
-               }
-             pool_put (vam->pending_routes, pr);
-           }
+         clib_warning ("resolver: BOGUS TYPE");
          break;
 
        case IP4_ARP_EVENT:
@@ -787,109 +400,10 @@ resolver_process (vlib_main_t * vm,
            handle_ip6_nd_event (event_data[i]);
          break;
 
-       case ~0:                /* timeout, retry pending resolutions */
-          /* *INDENT-OFF* */
-          pool_foreach (pr, vam->pending_routes,
-          ({
-            int is_adr = 1;
-            adr = &pr->r;
-            pme = &pr->t;
-
-            /* May fail, e.g. due to interface down */
-            switch (pr->resolve_type)
-              {
-              case RESOLVE_IP4_ADD_DEL_ROUTE:
-                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
-                  (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,
-                   (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);
-              }
-            if (e)
-              {
-                clib_error_report (e);
-                if (is_adr)
-                  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,
-                            pr - vam->pending_routes);
-              }
-            else
-              {
-                pme->resolve_attempts -= 1;
-                if (pme->resolve_attempts == 0)
-                  vec_add1 (resolution_failures,
-                            pr - vam->pending_routes);
-              }
-          }));
-          /* *INDENT-ON* */
-         for (i = 0; i < vec_len (resolution_failures); i++)
-           {
-             pr = pool_elt_at_index (vam->pending_routes,
-                                     resolution_failures[i]);
-             adr = &pr->r;
-             pme = &pr->t;
-
-             switch (pr->resolve_type)
-               {
-               case RESOLVE_IP4_ADD_DEL_ROUTE:
-                 clib_warning ("resolver: add %U/%d via %U retry failure",
-                               format_ip4_address,
-                               (ip4_address_t *) & (adr->dst_address),
-                               adr->dst_address_length,
-                               format_ip4_address,
-                               (ip4_address_t *) & (adr->next_hop_address));
-                 break;
-
-               case RESOLVE_IP6_ADD_DEL_ROUTE:
-                 clib_warning ("resolver: add %U/%d via %U retry failure",
-                               format_ip6_address,
-                               (ip6_address_t *) & (adr->dst_address),
-                               adr->dst_address_length,
-                               format_ip6_address,
-                               (ip6_address_t *) & (adr->next_hop_address));
-                 break;
-
-               case RESOLVE_MPLS_ETHERNET_ADD_DEL:
-                 clib_warning ("resolver: add mpls-o-e via %U retry failure",
-                               format_ip4_address,
-                               (ip4_address_t *) &
-                               (pme->next_hop_ip4_address_in_outer_vrf));
-                 break;
-
-               default:
-                 clib_warning ("BUG");
-               }
-             pool_put (vam->pending_routes, pr);
-           }
-         vec_reset_length (resolution_failures);
+       case ~0:                /* timeout */
          break;
        }
-      if (pool_elts (vam->pending_routes) == 0)
-       timeout = 100.0;
+
       vec_reset_length (event_data);
     }
   return 0;                    /* or not */
@@ -903,311 +417,13 @@ VLIB_REGISTER_NODE (vpe_resolver_process_node,static) = {
 };
 /* *INDENT-ON* */
 
-static int
-add_del_route_t_handler (u8 is_multipath,
-                        u8 is_add,
-                        u8 is_drop,
-                        u8 is_unreach,
-                        u8 is_prohibit,
-                        u8 is_local,
-                        u8 is_classify,
-                        u32 classify_table_index,
-                        u8 is_resolve_host,
-                        u8 is_resolve_attached,
-                        u32 fib_index,
-                        const fib_prefix_t * prefix,
-                        u8 next_hop_proto_is_ip4,
-                        const ip46_address_t * next_hop,
-                        u32 next_hop_sw_if_index,
-                        u8 next_hop_fib_index,
-                        u32 next_hop_weight, u32 next_hop_out_label)
-{
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  stats_main_t *sm = &stats_main;
-
-  if (is_multipath)
-    {
-      fib_route_path_flags_t path_flags = FIB_ROUTE_PATH_FLAG_NONE;
-
-      dslock (sm, 1 /* release hint */ , 10 /* tag */ );
-
-      if (is_resolve_host)
-       path_flags |= FIB_ROUTE_PATH_RESOLVE_VIA_HOST;
-      if (is_resolve_attached)
-       path_flags |= FIB_ROUTE_PATH_RESOLVE_VIA_ATTACHED;
-
-      if (is_add)
-       fib_table_entry_path_add (fib_index,
-                                 prefix,
-                                 FIB_SOURCE_API,
-                                 FIB_ENTRY_FLAG_NONE,
-                                 (next_hop_proto_is_ip4 ?
-                                  FIB_PROTOCOL_IP4 :
-                                  FIB_PROTOCOL_IP6),
-                                 next_hop,
-                                 next_hop_sw_if_index,
-                                 next_hop_fib_index,
-                                 next_hop_weight,
-                                 next_hop_out_label, path_flags);
-      else
-       fib_table_entry_path_remove (fib_index,
-                                    prefix,
-                                    FIB_SOURCE_API,
-                                    (next_hop_proto_is_ip4 ?
-                                     FIB_PROTOCOL_IP4 :
-                                     FIB_PROTOCOL_IP6),
-                                    next_hop,
-                                    next_hop_sw_if_index,
-                                    next_hop_fib_index,
-                                    next_hop_weight, path_flags);
-
-      dsunlock (sm);
-      return 0;
-    }
-
-  dslock (sm, 1 /* release hint */ , 2 /* tag */ );
-
-  if (is_drop || is_local || is_classify || is_unreach || is_prohibit)
-    {
-      /*
-       * special route types that link directly to the adj
-       */
-      if (is_add)
-       {
-         dpo_id_t dpo = DPO_INVALID;
-         dpo_proto_t dproto;
-
-         dproto = fib_proto_to_dpo (prefix->fp_proto);
-
-         if (is_drop)
-           ip_null_dpo_add_and_lock (dproto, IP_NULL_ACTION_NONE, &dpo);
-         else if (is_local)
-           receive_dpo_add_or_lock (dproto, ~0, NULL, &dpo);
-         else if (is_unreach)
-           ip_null_dpo_add_and_lock (dproto,
-                                     IP_NULL_ACTION_SEND_ICMP_UNREACH, &dpo);
-         else if (is_prohibit)
-           ip_null_dpo_add_and_lock (dproto,
-                                     IP_NULL_ACTION_SEND_ICMP_PROHIBIT,
-                                     &dpo);
-         else if (is_classify)
-           {
-             if (pool_is_free_index (cm->tables,
-                                     ntohl (classify_table_index)))
-               {
-                 dsunlock (sm);
-                 return VNET_API_ERROR_NO_SUCH_TABLE;
-               }
-
-             dpo_set (&dpo, DPO_CLASSIFY, dproto,
-                      classify_dpo_create (dproto,
-                                           ntohl (classify_table_index)));
-           }
-         else
-           {
-             dsunlock (sm);
-             return VNET_API_ERROR_NO_SUCH_TABLE;
-           }
-
-         fib_table_entry_special_dpo_update (fib_index,
-                                             prefix,
-                                             FIB_SOURCE_API,
-                                             FIB_ENTRY_FLAG_EXCLUSIVE, &dpo);
-         dpo_reset (&dpo);
-       }
-      else
-       {
-         fib_table_entry_special_remove (fib_index, prefix, FIB_SOURCE_API);
-       }
-    }
-  else
-    {
-      if (is_add)
-       {
-         fib_route_path_flags_t path_flags = FIB_ROUTE_PATH_FLAG_NONE;
-
-         if (is_resolve_host)
-           path_flags |= FIB_ROUTE_PATH_RESOLVE_VIA_HOST;
-         if (is_resolve_attached)
-           path_flags |= FIB_ROUTE_PATH_RESOLVE_VIA_ATTACHED;
-
-         fib_table_entry_update_one_path (fib_index,
-                                          prefix,
-                                          FIB_SOURCE_API,
-                                          FIB_ENTRY_FLAG_NONE,
-                                          (next_hop_proto_is_ip4 ?
-                                           FIB_PROTOCOL_IP4 :
-                                           FIB_PROTOCOL_IP6),
-                                          next_hop,
-                                          next_hop_sw_if_index,
-                                          next_hop_fib_index,
-                                          next_hop_weight,
-                                          next_hop_out_label, path_flags);
-       }
-      else
-       {
-         fib_table_entry_delete (fib_index, prefix, FIB_SOURCE_API);
-       }
-    }
-
-  dsunlock (sm);
-  return (0);
-}
-
-static int
-add_del_route_check (fib_protocol_t table_proto,
-                    u32 table_id,
-                    u32 next_hop_sw_if_index,
-                    fib_protocol_t next_hop_table_proto,
-                    u32 next_hop_table_id,
-                    u8 create_missing_tables,
-                    u32 * fib_index, u32 * next_hop_fib_index)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-
-  *fib_index = fib_table_find (table_proto, ntohl (table_id));
-  if (~0 == *fib_index)
-    {
-      if (create_missing_tables)
-       {
-         *fib_index = fib_table_find_or_create_and_lock (table_proto,
-                                                         ntohl (table_id));
-       }
-      else
-       {
-         /* No such VRF, and we weren't asked to create one */
-         return VNET_API_ERROR_NO_SUCH_FIB;
-       }
-    }
-
-  if (~0 != ntohl (next_hop_sw_if_index))
-    {
-      if (pool_is_free_index (vnm->interface_main.sw_interfaces,
-                             ntohl (next_hop_sw_if_index)))
-       {
-         return VNET_API_ERROR_NO_MATCHING_INTERFACE;
-       }
-    }
-  else
-    {
-      *next_hop_fib_index = fib_table_find (next_hop_table_proto,
-                                           ntohl (next_hop_table_id));
-
-      if (~0 == *next_hop_fib_index)
-       {
-         if (create_missing_tables)
-           {
-             *next_hop_fib_index =
-               fib_table_find_or_create_and_lock (next_hop_table_proto,
-                                                  ntohl (next_hop_table_id));
-           }
-         else
-           {
-             /* No such VRF, and we weren't asked to create one */
-             return VNET_API_ERROR_NO_SUCH_FIB;
-           }
-       }
-    }
-
-  return (0);
-}
-
-static int
-ip4_add_del_route_t_handler (vl_api_ip_add_del_route_t * mp)
-{
-  u32 fib_index, next_hop_fib_index;
-  int rv;
-
-  rv = add_del_route_check (FIB_PROTOCOL_IP4,
-                           mp->table_id,
-                           mp->next_hop_sw_if_index,
-                           FIB_PROTOCOL_IP4,
-                           mp->next_hop_table_id,
-                           mp->create_vrf_if_needed,
-                           &fib_index, &next_hop_fib_index);
-
-  if (0 != rv)
-    return (rv);
-
-  fib_prefix_t pfx = {
-    .fp_len = mp->dst_address_length,
-    .fp_proto = FIB_PROTOCOL_IP4,
-  };
-  clib_memcpy (&pfx.fp_addr.ip4, mp->dst_address, sizeof (pfx.fp_addr.ip4));
-
-  ip46_address_t nh;
-  memset (&nh, 0, sizeof (nh));
-  memcpy (&nh.ip4, mp->next_hop_address, sizeof (nh.ip4));
-
-  return (add_del_route_t_handler (mp->is_multipath,
-                                  mp->is_add,
-                                  mp->is_drop,
-                                  mp->is_unreach,
-                                  mp->is_prohibit,
-                                  mp->is_local,
-                                  mp->is_classify,
-                                  mp->classify_table_index,
-                                  mp->is_resolve_host,
-                                  mp->is_resolve_attached,
-                                  fib_index, &pfx, 1,
-                                  &nh,
-                                  ntohl (mp->next_hop_sw_if_index),
-                                  next_hop_fib_index,
-                                  mp->next_hop_weight,
-                                  ntohl (mp->next_hop_out_label)));
-}
-
-static int
-ip6_add_del_route_t_handler (vl_api_ip_add_del_route_t * mp)
-{
-  u32 fib_index, next_hop_fib_index;
-  int rv;
-
-  rv = add_del_route_check (FIB_PROTOCOL_IP6,
-                           mp->table_id,
-                           mp->next_hop_sw_if_index,
-                           FIB_PROTOCOL_IP6,
-                           mp->next_hop_table_id,
-                           mp->create_vrf_if_needed,
-                           &fib_index, &next_hop_fib_index);
-
-  if (0 != rv)
-    return (rv);
-
-  fib_prefix_t pfx = {
-    .fp_len = mp->dst_address_length,
-    .fp_proto = FIB_PROTOCOL_IP6,
-  };
-  clib_memcpy (&pfx.fp_addr.ip6, mp->dst_address, sizeof (pfx.fp_addr.ip6));
-
-  ip46_address_t nh;
-  memset (&nh, 0, sizeof (nh));
-  memcpy (&nh.ip6, mp->next_hop_address, sizeof (nh.ip6));
-
-  return (add_del_route_t_handler (mp->is_multipath,
-                                  mp->is_add,
-                                  mp->is_drop,
-                                  mp->is_unreach,
-                                  mp->is_prohibit,
-                                  mp->is_local,
-                                  mp->is_classify,
-                                  mp->classify_table_index,
-                                  mp->is_resolve_host,
-                                  mp->is_resolve_attached,
-                                  fib_index, &pfx, 0,
-                                  &nh, ntohl (mp->next_hop_sw_if_index),
-                                  next_hop_fib_index,
-                                  mp->next_hop_weight,
-                                  ntohl (mp->next_hop_out_label)));
-}
-
 static int
 mpls_route_add_del_t_handler (vnet_main_t * vnm,
                              vl_api_mpls_route_add_del_t * mp)
 {
   u32 fib_index, next_hop_fib_index;
-
-  int rv;
+  mpls_label_t *label_stack = NULL;
+  int rv, ii, n_labels;;
 
   fib_prefix_t pfx = {
     .fp_len = 21,
@@ -1250,6 +466,18 @@ mpls_route_add_del_t_handler (vnet_main_t * vnm,
   else
     memcpy (&nh.ip6, mp->mr_next_hop, sizeof (nh.ip6));
 
+  n_labels = mp->mr_next_hop_n_out_labels;
+  if (n_labels == 0)
+    ;
+  else if (1 == n_labels)
+    vec_add1 (label_stack, ntohl (mp->mr_next_hop_out_label_stack[0]));
+  else
+    {
+      vec_validate (label_stack, n_labels - 1);
+      for (ii = 0; ii < n_labels; ii++)
+       label_stack[ii] = ntohl (mp->mr_next_hop_out_label_stack[ii]);
+    }
+
   return (add_del_route_t_handler (mp->mr_is_multipath, mp->mr_is_add, 0,      // mp->is_drop,
                                   0,   // mp->is_unreach,
                                   0,   // mp->is_prohibit,
@@ -1263,26 +491,8 @@ mpls_route_add_del_t_handler (vnet_main_t * vnm,
                                   &nh, ntohl (mp->mr_next_hop_sw_if_index),
                                   next_hop_fib_index,
                                   mp->mr_next_hop_weight,
-                                  ntohl (mp->mr_next_hop_out_label)));
-}
-
-void
-vl_api_ip_add_del_route_t_handler (vl_api_ip_add_del_route_t * mp)
-{
-  vl_api_ip_add_del_route_reply_t *rmp;
-  int rv;
-  vnet_main_t *vnm = vnet_get_main ();
-
-  vnm->api_errno = 0;
-
-  if (mp->is_ipv6)
-    rv = ip6_add_del_route_t_handler (mp);
-  else
-    rv = ip4_add_del_route_t_handler (mp);
-
-  rv = (rv == 0) ? vnm->api_errno : rv;
-
-  REPLY_MACRO (VL_API_IP_ADD_DEL_ROUTE_REPLY);
+                                  ntohl (mp->mr_next_hop_via_label),
+                                  label_stack));
 }
 
 void
@@ -1375,78 +585,11 @@ vl_api_mpls_ip_bind_unbind_t_handler (vl_api_mpls_ip_bind_unbind_t * mp)
 }
 
 static void
-  vl_api_sw_interface_add_del_address_t_handler
-  (vl_api_sw_interface_add_del_address_t * mp)
+vl_api_sw_interface_set_vpath_t_handler (vl_api_sw_interface_set_vpath_t * mp)
 {
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_sw_interface_add_del_address_reply_t *rmp;
+  vl_api_sw_interface_set_vpath_reply_t *rmp;
   int rv = 0;
-  u32 is_del;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  is_del = mp->is_add == 0;
-
-  if (mp->del_all)
-    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,
-                                  mp->address_length, is_del);
-  else
-    ip4_add_del_interface_address (vm, ntohl (mp->sw_if_index),
-                                  (void *) mp->address,
-                                  mp->address_length, is_del);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_ADD_DEL_ADDRESS_REPLY);
-}
-
-static void
-vl_api_sw_interface_set_table_t_handler (vl_api_sw_interface_set_table_t * mp)
-{
-  int rv = 0;
-  u32 table_id = ntohl (mp->vrf_id);
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  vl_api_sw_interface_set_table_reply_t *rmp;
-  stats_main_t *sm = &stats_main;
-  u32 fib_index;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  dslock (sm, 1 /* release hint */ , 4 /* tag */ );
-
-  if (mp->is_ipv6)
-    {
-      fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6,
-                                                    table_id);
-
-      vec_validate (ip6_main.fib_index_by_sw_if_index, sw_if_index);
-      ip6_main.fib_index_by_sw_if_index[sw_if_index] = fib_index;
-    }
-  else
-    {
-
-      fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4,
-                                                    table_id);
-
-      vec_validate (ip4_main.fib_index_by_sw_if_index, sw_if_index);
-      ip4_main.fib_index_by_sw_if_index[sw_if_index] = fib_index;
-    }
-  dsunlock (sm);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_TABLE_REPLY);
-}
-
-static void
-vl_api_sw_interface_set_vpath_t_handler (vl_api_sw_interface_set_vpath_t * mp)
-{
-  vl_api_sw_interface_set_vpath_reply_t *rmp;
-  int rv = 0;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
+  u32 sw_if_index = ntohl (mp->sw_if_index);
 
   VALIDATE_SW_IF_INDEX (mp);
 
@@ -1745,6 +888,7 @@ vl_api_bridge_domain_add_del_t_handler (vl_api_bridge_domain_add_del_t * mp)
       if (disable_flags)
        bd_set_flags (vm, bd_index, disable_flags, 0 /* disable */ );
 
+      bd_set_mac_age (vm, bd_index, mp->mac_age);
     }
   else
     rv = bd_delete_bd_index (bdm, bd_id);
@@ -1782,6 +926,7 @@ send_bridge_domain_details (unix_shared_memory_queue_t * q,
   mp->learn = bd_feature_learn (bd_config);
   mp->arp_term = bd_feature_arp_term (bd_config);
   mp->bvi_sw_if_index = ntohl (bd_config->bvi_sw_if_index);
+  mp->mac_age = bd_config->mac_age;
   mp->n_sw_ifs = ntohl (n_sw_ifs);
   mp->context = context;
 
@@ -1875,24 +1020,27 @@ vl_api_l2fib_add_del_t_handler (vl_api_l2fib_add_del_t * mp)
 
   if (mp->is_add)
     {
-      VALIDATE_SW_IF_INDEX (mp);
-      if (vec_len (l2im->configs) <= sw_if_index)
-       {
-         rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
-         goto bad_sw_if_index;
-       }
-      else
+      filter_mac = mp->filter_mac ? 1 : 0;
+      if (filter_mac == 0)
        {
-         l2_input_config_t *config;
-         config = vec_elt_at_index (l2im->configs, sw_if_index);
-         if (config->bridge == 0)
+         VALIDATE_SW_IF_INDEX (mp);
+         if (vec_len (l2im->configs) <= sw_if_index)
            {
              rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
              goto bad_sw_if_index;
            }
+         else
+           {
+             l2_input_config_t *config;
+             config = vec_elt_at_index (l2im->configs, sw_if_index);
+             if (config->bridge == 0)
+               {
+                 rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
+                 goto bad_sw_if_index;
+               }
+           }
        }
       static_mac = mp->static_mac ? 1 : 0;
-      filter_mac = mp->filter_mac ? 1 : 0;
       bvi_mac = mp->bvi_mac ? 1 : 0;
       l2fib_add_entry (mac, bd_index, sw_if_index, static_mac, filter_mac,
                       bvi_mac);
@@ -1992,84 +1140,6 @@ out:
   REPLY_MACRO (VL_API_BD_IP_MAC_ADD_DEL_REPLY);
 }
 
-static void
-vl_api_tap_connect_t_handler (vl_api_tap_connect_t * mp, vlib_main_t * vm)
-{
-  int rv;
-  vl_api_tap_connect_reply_t *rmp;
-  unix_shared_memory_queue_t *q;
-  u32 sw_if_index = (u32) ~ 0;
-
-  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;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_TAP_CONNECT_REPLY);
-  rmp->context = mp->context;
-  rmp->retval = ntohl (rv);
-  rmp->sw_if_index = ntohl (sw_if_index);
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_tap_modify_t_handler (vl_api_tap_modify_t * mp, vlib_main_t * vm)
-{
-  int rv;
-  vl_api_tap_modify_reply_t *rmp;
-  unix_shared_memory_queue_t *q;
-  u32 sw_if_index = (u32) ~ 0;
-
-  rv = vnet_tap_modify (vm, ntohl (mp->sw_if_index), 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;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_TAP_MODIFY_REPLY);
-  rmp->context = mp->context;
-  rmp->retval = ntohl (rv);
-  rmp->sw_if_index = ntohl (sw_if_index);
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_tap_delete_t_handler (vl_api_tap_delete_t * mp, vlib_main_t * vm)
-{
-  int rv;
-  vpe_api_main_t *vam = &vpe_api_main;
-  vl_api_tap_delete_reply_t *rmp;
-  unix_shared_memory_queue_t *q;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-
-  rv = vnet_tap_delete (vm, sw_if_index);
-
-  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_TAP_DELETE_REPLY);
-  rmp->context = mp->context;
-  rmp->retval = ntohl (rv);
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-
-  if (!rv)
-    send_sw_interface_flags_deleted (vam, q, sw_if_index);
-}
-
 static void
 vl_api_create_vlan_subif_t_handler (vl_api_create_vlan_subif_t * mp)
 {
@@ -2230,169 +1300,61 @@ out:
 }
 
 static void
-  vl_api_mpls_ethernet_add_del_tunnel_t_handler
-  (vl_api_mpls_ethernet_add_del_tunnel_t * mp)
+vl_api_mpls_tunnel_add_del_t_handler (vl_api_mpls_tunnel_add_del_t * mp)
 {
-  vl_api_mpls_ethernet_add_del_tunnel_reply_t *rmp;
+  vl_api_mpls_tunnel_add_del_reply_t *rmp;
   int rv = 0;
   stats_main_t *sm = &stats_main;
   u32 tunnel_sw_if_index;
+  int ii;
 
   dslock (sm, 1 /* release hint */ , 5 /* tag */ );
 
-  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),
-     ntohl (mp->tx_sw_if_index),
-     &tunnel_sw_if_index, mp->l2_only, mp->is_add);
-
-  dsunlock (sm);
+  if (mp->mt_is_add)
+    {
+      fib_route_path_t rpath, *rpaths = NULL;
+      mpls_label_t *label_stack = NULL;
 
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_MPLS_ETHERNET_ADD_DEL_TUNNEL_REPLY,
-  ({
-    rmp->tunnel_sw_if_index = ntohl(tunnel_sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
+      memset (&rpath, 0, sizeof (rpath));
 
-/*
- * 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
-  (vl_api_mpls_ethernet_add_del_tunnel_2_t * mp)
-{
-  pending_route_t *pr;
-  vl_api_mpls_ethernet_add_del_tunnel_2_t *pme;
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
-  stats_main_t *sm = &stats_main;
-  vpe_api_main_t *vam = &vpe_api_main;
-  u32 inner_fib_index, outer_fib_index;
-  ip4_main_t *im = &ip4_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-  ip_adjacency_t *adj = 0;
-  u32 lookup_result;
-  u32 tx_sw_if_index;
-  u8 *dst_mac_address;
-  clib_error_t *e;
-  uword *p;
-  int rv;
-  u32 tunnel_sw_if_index;
+      if (mp->mt_next_hop_proto_is_ip4)
+       {
+         rpath.frp_proto = FIB_PROTOCOL_IP4;
+         clib_memcpy (&rpath.frp_addr.ip4,
+                      mp->mt_next_hop, sizeof (rpath.frp_addr.ip4));
+       }
+      else
+       {
+         rpath.frp_proto = FIB_PROTOCOL_IP6;
+         clib_memcpy (&rpath.frp_addr.ip6,
+                      mp->mt_next_hop, sizeof (rpath.frp_addr.ip6));
+       }
+      rpath.frp_sw_if_index = ntohl (mp->mt_next_hop_sw_if_index);
 
-  p = hash_get (im->fib_index_by_table_id, ntohl (mp->outer_vrf_id));
-  if (!p)
-    return VNET_API_ERROR_NO_SUCH_FIB;
-  else
-    outer_fib_index = p[0];
+      for (ii = 0; ii < mp->mt_next_hop_n_out_labels; ii++)
+       vec_add1 (label_stack, ntohl (mp->mt_next_hop_out_label_stack[ii]));
 
+      vec_add1 (rpaths, rpath);
 
-  p = hash_get (im->fib_index_by_table_id, ntohl (mp->inner_vrf_id));
-  if (!p)
-    return VNET_API_ERROR_NO_SUCH_INNER_FIB;
+      vnet_mpls_tunnel_add (rpaths, label_stack,
+                           mp->mt_l2_only, &tunnel_sw_if_index);
+      vec_free (rpaths);
+      vec_free (label_stack);
+    }
   else
-    inner_fib_index = p[0];
-
-  if (inner_fib_index == outer_fib_index)
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  // FIXME not an ADJ
-  lookup_result = ip4_fib_table_lookup_lb (ip4_fib_get (outer_fib_index),
-                                          (ip4_address_t *)
-                                          mp->next_hop_ip4_address_in_outer_vrf);
-
-  adj = ip_get_adjacency (lm, lookup_result);
-  tx_sw_if_index = adj->rewrite_header.sw_if_index;
-
-  if (mp->is_add && mp->resolve_if_needed)
     {
-      if (adj->lookup_next_index == IP_LOOKUP_NEXT_ARP)
-       {
-         pool_get (vam->pending_routes, pr);
-         pr->resolve_type = RESOLVE_MPLS_ETHERNET_ADD_DEL;
-         pme = &pr->t;
-         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,
-            (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
-           (vm, vpe_resolver_process_node.index,
-            RESOLUTION_PENDING_EVENT, 0 /* data */ );
-
-         /* The interface may be down, etc. */
-         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;
-       }
+      tunnel_sw_if_index = ntohl (mp->mt_sw_if_index);
+      vnet_mpls_tunnel_del (tunnel_sw_if_index);
     }
 
-  if (adj->lookup_next_index != IP_LOOKUP_NEXT_REWRITE)
-    return VNET_API_ERROR_NEXT_HOP_NOT_IN_FIB;
-
-  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
-    (dst_mac_address, (ip4_address_t *) (mp->adj_address),
-     (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);
 
-  return rv;
-}
-
-static void
-  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);
-}
-
-
-static void
-vl_api_mpls_add_del_encap_t_handler (vl_api_mpls_add_del_encap_t * mp)
-{
-  vl_api_mpls_add_del_encap_reply_t *rmp;
-  int rv;
-  static u32 *labels;
-  int i;
-
-  vec_reset_length (labels);
-
-  for (i = 0; i < mp->nlabels; i++)
-    vec_add1 (labels, ntohl (mp->labels[i]));
-
-  /* $$$$ fixme */
-  rv = vnet_mpls_add_del_encap ((ip4_address_t *) mp->dst_address,
-                               ntohl (mp->vrf_id), labels,
-                               ~0 /* policy_tunnel_index */ ,
-                               0 /* no_dst_hash */ ,
-                               0 /* indexp */ ,
-                               mp->is_add);
-
-  REPLY_MACRO (VL_API_MPLS_ADD_DEL_ENCAP_REPLY);
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_MPLS_TUNNEL_ADD_DEL_REPLY,
+  ({
+    rmp->sw_if_index = ntohl(tunnel_sw_if_index);
+  }));
+  /* *INDENT-ON* */
 }
 
 static void
@@ -2464,58 +1426,6 @@ out:
   REPLY_MACRO (VL_API_PROXY_ARP_INTFC_ENABLE_DISABLE_REPLY);
 }
 
-static void
-vl_api_ip_neighbor_add_del_t_handler (vl_api_ip_neighbor_add_del_t * mp,
-                                     vlib_main_t * vm)
-{
-  vl_api_ip_neighbor_add_del_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  stats_main_t *sm = &stats_main;
-  int rv = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  dslock (sm, 1 /* release hint */ , 7 /* tag */ );
-
-  /*
-   * there's no validation here of the ND/ARP entry being added.
-   * The expectation is that the FIB will ensure that nothing bad
-   * will come of adding bogus entries.
-   */
-  if (mp->is_ipv6)
-    {
-      if (mp->is_add)
-       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->is_static);
-      else
-       rv = vnet_unset_ip6_ethernet_neighbor
-         (vm, ntohl (mp->sw_if_index),
-          (ip6_address_t *) (mp->dst_address),
-          mp->mac_address, sizeof (mp->mac_address));
-    }
-  else
-    {
-      ethernet_arp_ip4_over_ethernet_address_t a;
-
-      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),
-                                            &a, mp->is_static);
-      else
-       rv =
-         vnet_arp_unset_ip4_over_ethernet (vnm, ntohl (mp->sw_if_index), &a);
-    }
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  dsunlock (sm);
-  REPLY_MACRO (VL_API_IP_NEIGHBOR_ADD_DEL_REPLY);
-}
-
 static void
 vl_api_is_address_reachable_t_handler (vl_api_is_address_reachable_t * mp)
 {
@@ -2592,12 +1502,6 @@ send:
 #endif
 }
 
-static void
-vl_api_sw_interface_details_t_handler (vl_api_sw_interface_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
 static void
   vl_api_sw_interface_set_mpls_enable_t_handler
   (vl_api_sw_interface_set_mpls_enable_t * mp)
@@ -2614,271 +1518,46 @@ static void
   REPLY_MACRO (VL_API_SW_INTERFACE_SET_MPLS_ENABLE_REPLY);
 }
 
-static void
-vl_api_sw_interface_clear_stats_t_handler (vl_api_sw_interface_clear_stats_t *
-                                          mp)
+void
+send_oam_event (oam_target_t * t)
 {
-  vl_api_sw_interface_clear_stats_reply_t *rmp;
-
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vlib_simple_counter_main_t *sm;
-  vlib_combined_counter_main_t *cm;
-  static vnet_main_t **my_vnet_mains;
-  int i, j, n_counters;
-  int rv = 0;
-
-  if (mp->sw_if_index != ~0)
-    VALIDATE_SW_IF_INDEX (mp);
-
-  vec_reset_length (my_vnet_mains);
-
-  for (i = 0; i < vec_len (vnet_mains); i++)
-    {
-      if (vnet_mains[i])
-       vec_add1 (my_vnet_mains, vnet_mains[i]);
-    }
-
-  if (vec_len (vnet_mains) == 0)
-    vec_add1 (my_vnet_mains, vnm);
-
-  n_counters = vec_len (im->combined_sw_if_counters);
-
-  for (j = 0; j < n_counters; j++)
-    {
-      for (i = 0; i < vec_len (my_vnet_mains); i++)
-       {
-         im = &my_vnet_mains[i]->interface_main;
-         cm = im->combined_sw_if_counters + j;
-         if (mp->sw_if_index == (u32) ~ 0)
-           vlib_clear_combined_counters (cm);
-         else
-           vlib_zero_combined_counter (cm, ntohl (mp->sw_if_index));
-       }
-    }
+  vpe_api_main_t *vam = &vpe_api_main;
+  unix_shared_memory_queue_t *q;
+  vpe_client_registration_t *reg;
+  vl_api_oam_event_t *mp;
 
-  n_counters = vec_len (im->sw_if_counters);
+  /* *INDENT-OFF* */
+  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);
+        clib_memcpy (mp->dst_address, &t->dst_address,
+                     sizeof (mp->dst_address));
+        mp->state = t->state;
+        vl_msg_api_send_shmem (q, (u8 *)&mp);
+      }
+  }));
+  /* *INDENT-ON* */
+}
 
-  for (j = 0; j < n_counters; j++)
-    {
-      for (i = 0; i < vec_len (my_vnet_mains); i++)
-       {
-         im = &my_vnet_mains[i]->interface_main;
-         sm = im->sw_if_counters + j;
-         if (mp->sw_if_index == (u32) ~ 0)
-           vlib_clear_simple_counters (sm);
-         else
-           vlib_zero_simple_counter (sm, ntohl (mp->sw_if_index));
-       }
-    }
+static void
+vl_api_oam_add_del_t_handler (vl_api_oam_add_del_t * mp)
+{
+  vl_api_oam_add_del_reply_t *rmp;
+  int rv;
 
-  BAD_SW_IF_INDEX_LABEL;
+  rv = vpe_oam_add_del_target ((ip4_address_t *) mp->src_address,
+                              (ip4_address_t *) mp->dst_address,
+                              ntohl (mp->vrf_id), (int) (mp->is_add));
 
-  REPLY_MACRO (VL_API_SW_INTERFACE_CLEAR_STATS_REPLY);
+  REPLY_MACRO (VL_API_OAM_ADD_DEL_REPLY);
 }
 
 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, u32 context)
-{
-  vl_api_sw_interface_details_t *mp;
-  vnet_hw_interface_t *hi;
-
-  hi = vnet_get_sup_hw_interface (am->vnet_main, swif->sw_if_index);
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_DETAILS);
-  mp->sw_if_index = ntohl (swif->sw_if_index);
-  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) ? 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,
-          (char *) interface_name, ARRAY_LEN (mp->interface_name) - 1);
-
-  /* Send the L2 address for ethernet physical intfcs */
-  if (swif->sup_sw_if_index == swif->sw_if_index
-      && hi->hw_class_index == ethernet_hw_interface_class.index)
-    {
-      ethernet_main_t *em = ethernet_get_main (am->vlib_main);
-      ethernet_interface_t *ei;
-
-      ei = pool_elt_at_index (em->interfaces, hi->hw_instance);
-      ASSERT (sizeof (mp->l2_address) >= sizeof (ei->address));
-      clib_memcpy (mp->l2_address, ei->address, sizeof (ei->address));
-      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;
-      mp->sub_id = ntohl (sub->id);
-      mp->sub_dot1ad = sub->eth.flags.dot1ad;
-      mp->sub_number_of_tags =
-       sub->eth.flags.one_tag + sub->eth.flags.two_tags * 2;
-      mp->sub_outer_vlan_id = ntohs (sub->eth.outer_vlan_id);
-      mp->sub_inner_vlan_id = ntohs (sub->eth.inner_vlan_id);
-      mp->sub_exact_match = sub->eth.flags.exact_match;
-      mp->sub_default = sub->eth.flags.default_sub;
-      mp->sub_outer_vlan_id_any = sub->eth.flags.outer_vlan_id_any;
-      mp->sub_inner_vlan_id_any = sub->eth.flags.inner_vlan_id_any;
-
-      /* vlan tag rewrite data */
-      u32 vtr_op = L2_VTR_DISABLED;
-      u32 vtr_push_dot1q = 0, vtr_tag1 = 0, vtr_tag2 = 0;
-
-      if (l2vtr_get (am->vlib_main, am->vnet_main, swif->sw_if_index,
-                    &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",
-                       swif->sw_if_index);
-       }
-      else
-       {
-         mp->vtr_op = ntohl (vtr_op);
-         mp->vtr_push_dot1q = ntohl (vtr_push_dot1q);
-         mp->vtr_tag1 = ntohl (vtr_tag1);
-         mp->vtr_tag2 = ntohl (vtr_tag2);
-       }
-    }
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-send_sw_interface_flags (vpe_api_main_t * am,
-                        unix_shared_memory_queue_t * q,
-                        vnet_sw_interface_t * swif)
-{
-  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,
-                                                      swif->sw_if_index);
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_FLAGS);
-  mp->sw_if_index = ntohl (swif->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) ? 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)
-  __attribute__ ((unused));
-
-static void
-send_sw_interface_flags_deleted (vpe_api_main_t * am,
-                                unix_shared_memory_queue_t * q,
-                                u32 sw_if_index)
-{
-  vl_api_sw_interface_set_flags_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_FLAGS);
-  mp->sw_if_index = ntohl (sw_if_index);
-
-  mp->admin_up_down = 0;
-  mp->link_up_down = 0;
-  mp->deleted = 1;
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_sw_interface_dump_t_handler (vl_api_sw_interface_dump_t * mp)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  vnet_sw_interface_t *swif;
-  vnet_interface_main_t *im = &am->vnet_main->interface_main;
-  u8 *filter_string = 0, *name_string = 0;
-  unix_shared_memory_queue_t *q;
-  char *strcasestr (char *, char *);   /* lnx hdr file botch */
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-
-  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);
-    }
-
-  /* *INDENT-OFF* */
-  pool_foreach (swif, im->sw_interfaces,
-  ({
-    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, mp->context);
-    }
-    _vec_len (name_string) = 0;
-  }));
-  /* *INDENT-ON* */
-
-  vec_free (name_string);
-  vec_free (filter_string);
-}
-
-void
-send_oam_event (oam_target_t * t)
-{
-  vpe_api_main_t *vam = &vpe_api_main;
-  unix_shared_memory_queue_t *q;
-  vpe_client_registration_t *reg;
-  vl_api_oam_event_t *mp;
-
-  /* *INDENT-OFF* */
-  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);
-        clib_memcpy (mp->dst_address, &t->dst_address,
-                     sizeof (mp->dst_address));
-        mp->state = t->state;
-        vl_msg_api_send_shmem (q, (u8 *)&mp);
-      }
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_oam_add_del_t_handler (vl_api_oam_add_del_t * mp)
-{
-  vl_api_oam_add_del_reply_t *rmp;
-  int rv;
-
-  rv = vpe_oam_add_del_target ((ip4_address_t *) mp->src_address,
-                              (ip4_address_t *) mp->dst_address,
-                              ntohl (mp->vrf_id), (int) (mp->is_add));
-
-  REPLY_MACRO (VL_API_OAM_ADD_DEL_REPLY);
-}
-
-static void
-vl_api_vnet_get_summary_stats_t_handler (vl_api_vnet_get_summary_stats_t * mp)
+vl_api_vnet_get_summary_stats_t_handler (vl_api_vnet_get_summary_stats_t * mp)
 {
   stats_main_t *sm = &stats_main;
   vnet_interface_main_t *im = sm->interface_main;
@@ -3227,226 +1906,6 @@ static void vl_api_dhcp_client_config_t_handler
   REPLY_MACRO (VL_API_DHCP_CLIENT_CONFIG_REPLY);
 }
 
-static void
-  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, suppress, managed, other, ll_option, send_unicast, cease,
-    default_router;
-
-  is_no = mp->is_no == 1;
-  suppress = mp->suppress == 1;
-  managed = mp->managed == 1;
-  other = mp->other == 1;
-  ll_option = mp->ll_option == 1;
-  send_unicast = mp->send_unicast == 1;
-  cease = mp->cease == 1;
-  default_router = mp->default_router == 1;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = ip6_neighbor_ra_config (vm, ntohl (mp->sw_if_index),
-                              suppress, managed, other,
-                              ll_option, send_unicast, cease,
-                              default_router, ntohl (mp->lifetime),
-                              ntohl (mp->initial_count),
-                              ntohl (mp->initial_interval),
-                              ntohl (mp->max_interval),
-                              ntohl (mp->min_interval), is_no);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_IP6ND_RA_CONFIG_REPLY);
-}
-
-static void
-  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;
-  use_default = mp->use_default == 1;
-  no_advertise = mp->no_advertise == 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),
-                              (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, is_no);
-
-  BAD_SW_IF_INDEX_LABEL;
-  REPLY_MACRO (VL_API_SW_INTERFACE_IP6ND_RA_PREFIX_REPLY);
-}
-
-static void
-  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;
-  vnet_main_t *vnm = vnet_get_main ();
-  int rv = 0;
-  clib_error_t *error;
-
-  vnm->api_errno = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  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 * mp, vlib_main_t * vm)
-{
-  vl_api_sw_interface_ip6_set_link_local_address_reply_t *rmp;
-  int rv = 0;
-  clib_error_t *error;
-  vnet_main_t *vnm = vnet_get_main ();
-
-  vnm->api_errno = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  error = set_ip6_link_local_address (vm,
-                                     ntohl (mp->sw_if_index),
-                                     (ip6_address_t *) mp->address,
-                                     mp->address_length);
-  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_SET_LINK_LOCAL_ADDRESS_REPLY);
-}
-
-static void
-set_ip6_flow_hash (vl_api_set_ip_flow_hash_t * mp)
-{
-  vl_api_set_ip_flow_hash_reply_t *rmp;
-  int rv = VNET_API_ERROR_UNIMPLEMENTED;
-
-  clib_warning ("unimplemented...");
-
-  REPLY_MACRO (VL_API_SET_IP_FLOW_HASH_REPLY);
-}
-
-static void
-set_ip4_flow_hash (vl_api_set_ip_flow_hash_t * mp)
-{
-  vl_api_set_ip_flow_hash_reply_t *rmp;
-  int rv;
-  u32 table_id;
-  flow_hash_config_t flow_hash_config = 0;
-
-  table_id = ntohl (mp->vrf_id);
-
-#define _(a,b) if (mp->a) flow_hash_config |= b;
-  foreach_flow_hash_bit;
-#undef _
-
-  rv = vnet_set_ip4_flow_hash (table_id, flow_hash_config);
-
-  REPLY_MACRO (VL_API_SET_IP_FLOW_HASH_REPLY);
-}
-
-
-static void
-vl_api_set_ip_flow_hash_t_handler (vl_api_set_ip_flow_hash_t * mp)
-{
-  if (mp->is_ipv6 == 0)
-    set_ip4_flow_hash (mp);
-  else
-    set_ip6_flow_hash (mp);
-}
-
-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;
-  int rv = 0;
-  vnet_sw_interface_t *si;
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 sw_if_index, unnumbered_sw_if_index;
-
-  sw_if_index = ntohl (mp->sw_if_index);
-  unnumbered_sw_if_index = ntohl (mp->unnumbered_sw_if_index);
-
-  /*
-   * 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,
-                         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 &&
-      pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
-    {
-      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX_2;
-      goto done;
-    }
-
-  si = vnet_get_sw_interface (vnm, unnumbered_sw_if_index);
-
-  if (mp->is_add)
-    {
-      si->flags |= VNET_SW_INTERFACE_FLAG_UNNUMBERED;
-      si->unnumbered_sw_if_index = sw_if_index;
-      ip4_sw_interface_enable_disable (unnumbered_sw_if_index, 1);
-      ip6_sw_interface_enable_disable (unnumbered_sw_if_index, 1);
-    }
-  else
-    {
-      si->flags &= ~(VNET_SW_INTERFACE_FLAG_UNNUMBERED);
-      si->unnumbered_sw_if_index = (u32) ~ 0;
-      ip4_sw_interface_enable_disable (unnumbered_sw_if_index, 0);
-      ip6_sw_interface_enable_disable (unnumbered_sw_if_index, 0);
-    }
-
-done:
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_UNNUMBERED_REPLY);
-}
-
 static void
 vl_api_create_loopback_t_handler (vl_api_create_loopback_t * mp)
 {
@@ -3826,7 +2285,7 @@ static void vl_api_classify_add_del_table_t_handler
     (cm, mp->mask, nbuckets, memory_size,
      skip_n_vectors, match_n_vectors,
      next_table_index, miss_next_index, &table_index,
-     current_data_flag, current_data_offset, mp->is_add);
+     current_data_flag, current_data_offset, mp->is_add, mp->del_chain);
 
 out:
   /* *INDENT-OFF* */
@@ -4015,385 +2474,25 @@ static void
 }
 
 static void
-vl_api_create_vhost_user_if_t_handler (vl_api_create_vhost_user_if_t * mp)
+vl_api_l2_fib_table_entry_t_handler (vl_api_l2_fib_table_entry_t * mp)
 {
-  int rv = 0;
-  vl_api_create_vhost_user_if_reply_t *rmp;
-  u32 sw_if_index = (u32) ~ 0;
-
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
-
-  rv = vhost_user_create_if (vnm, vm, (char *) mp->sock_filename,
-                            mp->is_server, &sw_if_index, (u64) ~ 0,
-                            mp->renumber, ntohl (mp->custom_dev_instance),
-                            (mp->use_custom_mac) ? mp->mac_address : NULL);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_CREATE_VHOST_USER_IF_REPLY,
-  ({
-    rmp->sw_if_index = ntohl (sw_if_index);
-  }));
-  /* *INDENT-ON* */
+  clib_warning ("BUG");
 }
 
 static void
-vl_api_modify_vhost_user_if_t_handler (vl_api_modify_vhost_user_if_t * mp)
+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, u32 context)
 {
-  int rv = 0;
-  vl_api_modify_vhost_user_if_reply_t *rmp;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
+  vl_api_l2_fib_table_entry_t *mp;
 
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_L2_FIB_TABLE_ENTRY);
 
-  rv = vhost_user_modify_if (vnm, vm, (char *) mp->sock_filename,
-                            mp->is_server, sw_if_index, (u64) ~ 0,
-                            mp->renumber, ntohl (mp->custom_dev_instance));
-  REPLY_MACRO (VL_API_MODIFY_VHOST_USER_IF_REPLY);
-}
-
-static void
-vl_api_delete_vhost_user_if_t_handler (vl_api_delete_vhost_user_if_t * mp)
-{
-  int rv = 0;
-  vl_api_delete_vhost_user_if_reply_t *rmp;
-  vpe_api_main_t *vam = &vpe_api_main;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
-
-  rv = vhost_user_delete_if (vnm, vm, sw_if_index);
-
-  REPLY_MACRO (VL_API_DELETE_VHOST_USER_IF_REPLY);
-  if (!rv)
-    {
-      unix_shared_memory_queue_t *q =
-       vl_api_client_index_to_input_queue (mp->client_index);
-      if (!q)
-       return;
-
-      send_sw_interface_flags_deleted (vam, q, sw_if_index);
-    }
-}
-
-static void
-  vl_api_sw_interface_vhost_user_details_t_handler
-  (vl_api_sw_interface_vhost_user_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-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,
-                                     u32 context)
-{
-  vl_api_sw_interface_vhost_user_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_VHOST_USER_DETAILS);
-  mp->sw_if_index = ntohl (vui->sw_if_index);
-  mp->virtio_net_hdr_sz = ntohl (vui->virtio_net_hdr_sz);
-  mp->features = clib_net_to_host_u64 (vui->features);
-  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);
-  strncpy ((char *) mp->interface_name,
-          (char *) vui->if_name, ARRAY_LEN (mp->interface_name) - 1);
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-  vl_api_sw_interface_vhost_user_dump_t_handler
-  (vl_api_sw_interface_vhost_user_dump_t * mp)
-{
-  int rv = 0;
-  vpe_api_main_t *am = &vpe_api_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
-  vhost_user_intf_details_t *ifaces = NULL;
-  vhost_user_intf_details_t *vuid = NULL;
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  rv = vhost_user_dump_ifs (vnm, vm, &ifaces);
-  if (rv)
-    return;
-
-  vec_foreach (vuid, ifaces)
-  {
-    send_sw_interface_vhost_user_details (am, q, vuid, mp->context);
-  }
-  vec_free (ifaces);
-}
-
-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, u32 context)
-{
-  vl_api_sw_if_l2tpv3_tunnel_details_t *mp;
-  u8 *if_name = NULL;
-  vnet_sw_interface_t *si = NULL;
-
-  si = vnet_get_hw_sw_interface (lm->vnet_main, s->hw_if_index);
-
-  if_name = format (if_name, "%U",
-                   format_vnet_sw_interface_name, lm->vnet_main, si);
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_IF_L2TPV3_TUNNEL_DETAILS);
-  strncpy ((char *) mp->interface_name,
-          (char *) if_name, ARRAY_LEN (mp->interface_name) - 1);
-  mp->sw_if_index = ntohl (si->sw_if_index);
-  mp->local_session_id = s->local_session_id;
-  mp->remote_session_id = s->remote_session_id;
-  mp->local_cookie[0] = s->local_cookie[0];
-  mp->local_cookie[1] = s->local_cookie[1];
-  mp->remote_cookie = s->remote_cookie;
-  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);
-}
-
-static void
-send_ip_address_details (vpe_api_main_t * am,
-                        unix_shared_memory_queue_t * q,
-                        u8 * ip, u16 prefix_length, u8 is_ipv6, u32 context)
-{
-  vl_api_ip_address_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IP_ADDRESS_DETAILS);
-
-  if (is_ipv6)
-    {
-      clib_memcpy (&mp->ip, ip, sizeof (mp->ip));
-    }
-  else
-    {
-      u32 *tp = (u32 *) mp->ip;
-      *tp = *(u32 *) ip;
-    }
-  mp->prefix_length = prefix_length;
-  mp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_ip_address_dump_t_handler (vl_api_ip_address_dump_t * mp)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  unix_shared_memory_queue_t *q;
-  ip6_address_t *r6;
-  ip4_address_t *r4;
-  ip6_main_t *im6 = &ip6_main;
-  ip4_main_t *im4 = &ip4_main;
-  ip_lookup_main_t *lm6 = &im6->lookup_main;
-  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);
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  if (mp->is_ipv6)
-    {
-      /* *INDENT-OFF* */
-      foreach_ip_interface_address (lm6, ia, sw_if_index,
-                                    1 /* honor unnumbered */,
-      ({
-        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, mp->context);
-      }));
-      /* *INDENT-ON* */
-    }
-  else
-    {
-      /* *INDENT-OFF* */
-      foreach_ip_interface_address (lm4, ia, sw_if_index,
-                                    1 /* honor unnumbered */,
-      ({
-        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, mp->context);
-      }));
-      /* *INDENT-ON* */
-    }
-  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 context)
-{
-  vl_api_ip_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*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);
-}
-
-static void
-vl_api_sw_if_l2tpv3_tunnel_dump_t_handler (vl_api_sw_if_l2tpv3_tunnel_dump_t *
-                                          mp)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  l2t_main_t *lm = &l2t_main;
-  unix_shared_memory_queue_t *q;
-  l2t_session_t *session;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  /* *INDENT-OFF* */
-  pool_foreach (session, lm->sessions,
-  ({
-    send_sw_if_l2tpv3_tunnel_details (am, q, session, lm, mp->context);
-  }));
-  /* *INDENT-ON* */
-}
-
-
-static void
-send_sw_interface_tap_details (vpe_api_main_t * am,
-                              unix_shared_memory_queue_t * q,
-                              tapcli_interface_details_t * tap_if,
-                              u32 context)
-{
-  vl_api_sw_interface_tap_details_t *mp;
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_TAP_DETAILS);
-  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);
-}
-
-static void
-vl_api_sw_interface_tap_dump_t_handler (vl_api_sw_interface_tap_dump_t * mp)
-{
-  int rv = 0;
-  vpe_api_main_t *am = &vpe_api_main;
-  unix_shared_memory_queue_t *q;
-  tapcli_interface_details_t *tapifs = NULL;
-  tapcli_interface_details_t *tap_if = NULL;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  rv = vnet_tap_dump_ifs (&tapifs);
-  if (rv)
-    return;
-
-  vec_foreach (tap_if, tapifs)
-  {
-    send_sw_interface_tap_details (am, q, tap_if, mp->context);
-  }
-
-  vec_free (tapifs);
-}
-
-static void
-vl_api_ip_dump_t_handler (vl_api_ip_dump_t * mp)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  unix_shared_memory_queue_t *q;
-  vnet_sw_interface_t *si, *sorted_sis;
-  u32 sw_if_index = ~0;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  /* Gather interfaces. */
-  sorted_sis = vec_new (vnet_sw_interface_t, pool_elts (im->sw_interfaces));
-  _vec_len (sorted_sis) = 0;
-  /* *INDENT-OFF* */
-  pool_foreach (si, im->sw_interfaces,
-  ({
-    vec_add1 (sorted_sis, si[0]);
-  }));
-  /* *INDENT-ON* */
-
-  vec_foreach (si, sorted_sis)
-  {
-    if (!(si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED))
-      {
-       if (mp->is_ipv6 && !ip6_interface_enabled (vm, si->sw_if_index))
-         {
-           continue;
-         }
-       sw_if_index = si->sw_if_index;
-       send_ip_details (am, q, sw_if_index, mp->context);
-      }
-  }
-}
-
-static void
-vl_api_l2_fib_table_entry_t_handler (vl_api_l2_fib_table_entry_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-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, u32 context)
-{
-  vl_api_l2_fib_table_entry_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_L2_FIB_TABLE_ENTRY);
-
-  mp->bd_id =
-    ntohl (l2input_main.bd_configs[l2fe_key->fields.bd_index].bd_id);
+  mp->bd_id =
+    ntohl (l2input_main.bd_configs[l2fe_key->fields.bd_index].bd_id);
 
   mp->mac = l2fib_make_key (l2fe_key->fields.mac, 0);
   mp->sw_if_index = ntohl (l2fe_res->fields.sw_if_index);
@@ -4577,152 +2676,52 @@ out:
   /* *INDENT-ON* */
 }
 
-static void vl_api_l2tpv3_create_tunnel_t_handler
-  (vl_api_l2tpv3_create_tunnel_t * mp)
+static void vl_api_vxlan_add_del_tunnel_t_handler
+  (vl_api_vxlan_add_del_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;
+  vl_api_vxlan_add_del_tunnel_reply_t *rmp;
+  int rv = 0;
+  vnet_vxlan_add_del_tunnel_args_t _a, *a = &_a;
+  u32 encap_fib_index;
+  uword *p;
+  ip4_main_t *im = &ip4_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 sw_if_index = ~0;
 
-  if (mp->is_ipv6 != 1)
+  p = hash_get (im->fib_index_by_table_id, ntohl (mp->encap_vrf_id));
+  if (!p)
     {
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
+      rv = VNET_API_ERROR_NO_SUCH_FIB;
       goto out;
     }
+  encap_fib_index = p[0];
+  memset (a, 0, sizeof (*a));
 
-  u32 encap_fib_index;
+  a->is_add = mp->is_add;
+  a->is_ip6 = mp->is_ipv6;
+
+  /* ip addresses sent in network byte order */
+  ip46_from_addr_buf (mp->is_ipv6, mp->dst_address, &a->dst);
+  ip46_from_addr_buf (mp->is_ipv6, mp->src_address, &a->src);
 
-  if (mp->encap_vrf_id != ~0)
+  /* Check src & dst are different */
+  if (ip46_address_cmp (&a->dst, &a->src) == 0)
     {
-      uword *p;
-      ip6_main_t *im = &ip6_main;
-      if (!
-         (p =
-          hash_get (im->fib_index_by_table_id, ntohl (mp->encap_vrf_id))))
-       {
-         rv = VNET_API_ERROR_NO_SUCH_FIB;
-         goto out;
-       }
-      encap_fib_index = p[0];
+      rv = VNET_API_ERROR_SAME_SRC_DST;
+      goto out;
     }
-  else
+  a->mcast_sw_if_index = ntohl (mp->mcast_sw_if_index);
+  if (ip46_address_is_multicast (&a->dst) &&
+      pool_is_free_index (vnm->interface_main.sw_interfaces,
+                         a->mcast_sw_if_index))
     {
-      encap_fib_index = ~0;
+      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
+      goto out;
     }
-
-  rv = create_l2tpv3_ipv6_tunnel (lm,
-                                 (ip6_address_t *) mp->client_address,
-                                 (ip6_address_t *) mp->our_address,
-                                 ntohl (mp->local_session_id),
-                                 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,
-                                 encap_fib_index, &sw_if_index);
-
-out:
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_L2TPV3_CREATE_TUNNEL_REPLY,
-  ({
-    rmp->sw_if_index = ntohl (sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-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;
-  l2t_main_t *lm = &l2t_main;
-  int rv;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = l2tpv3_set_tunnel_cookies (lm, ntohl (mp->sw_if_index),
-                                 clib_net_to_host_u64 (mp->new_local_cookie),
-                                 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
-  (vl_api_l2tpv3_interface_enable_disable_t * mp)
-{
-  int rv;
-  vnet_main_t *vnm = vnet_get_main ();
-  vl_api_l2tpv3_interface_enable_disable_reply_t *rmp;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  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
-  (vl_api_l2tpv3_set_lookup_key_t * mp)
-{
-  int rv = 0;
-  l2t_main_t *lm = &l2t_main;
-  vl_api_l2tpv3_set_lookup_key_reply_t *rmp;
-
-  if (mp->key > L2T_LOOKUP_SESSION_ID)
-    {
-      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
-  (vl_api_vxlan_add_del_tunnel_t * mp)
-{
-  vl_api_vxlan_add_del_tunnel_reply_t *rmp;
-  int rv = 0;
-  vnet_vxlan_add_del_tunnel_args_t _a, *a = &_a;
-  u32 encap_fib_index;
-  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;
-      goto out;
-    }
-  encap_fib_index = p[0];
-  memset (a, 0, sizeof (*a));
-
-  a->is_add = mp->is_add;
-  a->is_ip6 = mp->is_ipv6;
-
-  /* ip addresses sent in network byte order */
-  ip46_from_addr_buf (mp->is_ipv6, mp->dst_address, &a->dst);
-  ip46_from_addr_buf (mp->is_ipv6, mp->src_address, &a->src);
-
-  /* Check src & dst are different */
-  if (ip46_address_cmp (&a->dst, &a->src) == 0)
-    {
-      rv = VNET_API_ERROR_SAME_SRC_DST;
-      goto out;
-    }
-  a->mcast_sw_if_index = ntohl (mp->mcast_sw_if_index);
-  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);
+  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:
   /* *INDENT-OFF* */
@@ -4758,8 +2757,7 @@ static void send_vxlan_tunnel_details
     }
   rmp->mcast_sw_if_index = htonl (t->mcast_sw_if_index);
   rmp->vni = htonl (t->vni);
-  /* decap_next_index is deprecated, hard code to l2-input */
-  rmp->decap_next_index = htonl (VXLAN_INPUT_NEXT_L2_INPUT);
+  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;
@@ -4804,109 +2802,6 @@ static void vl_api_vxlan_tunnel_dump_t_handler
     }
 }
 
-static void vl_api_gre_add_del_tunnel_t_handler
-  (vl_api_gre_add_del_tunnel_t * mp)
-{
-  vl_api_gre_add_del_tunnel_reply_t *rmp;
-  int rv = 0;
-  vnet_gre_add_del_tunnel_args_t _a, *a = &_a;
-  u32 outer_fib_id;
-  uword *p;
-  ip4_main_t *im = &ip4_main;
-  u32 sw_if_index = ~0;
-
-  p = hash_get (im->fib_index_by_table_id, ntohl (mp->outer_fib_id));
-  if (!p)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_FIB;
-      goto out;
-    }
-  outer_fib_id = 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->teb = mp->teb;
-
-  /* ip addresses sent in network byte order */
-  clib_memcpy (&(a->src), mp->src_address, 4);
-  clib_memcpy (&(a->dst), mp->dst_address, 4);
-
-  a->outer_fib_id = outer_fib_id;
-  rv = vnet_gre_add_del_tunnel (a, &sw_if_index);
-
-out:
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_GRE_ADD_DEL_TUNNEL_REPLY,
-  ({
-    rmp->sw_if_index = ntohl (sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void send_gre_tunnel_details
-  (gre_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_gre_tunnel_details_t *rmp;
-  ip4_main_t *im = &ip4_main;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_GRE_TUNNEL_DETAILS);
-  clib_memcpy (rmp->src_address, &(t->tunnel_src), 4);
-  clib_memcpy (rmp->dst_address, &(t->tunnel_dst), 4);
-  rmp->outer_fib_id = htonl (im->fibs[t->outer_fib_index].ft_table_id);
-  rmp->teb = (GRE_TUNNEL_TYPE_TEB == t->type);
-  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;
-    }
-
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  if (~0 == sw_if_index)
-    {
-      /* *INDENT-OFF* */
-      pool_foreach (t, gm->tunnels,
-      ({
-        send_gre_tunnel_details(t, q, mp->context);
-      }));
-      /* *INDENT-ON* */
-    }
-  else
-    {
-      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);
-    }
-}
-
 static void
 vl_api_l2_patch_add_del_t_handler (vl_api_l2_patch_add_del_t * mp)
 {
@@ -5078,2913 +2973,701 @@ static void vl_api_vxlan_gpe_tunnel_dump_t_handler
     }
 }
 
-/** Used for transferring locators via VPP API */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u32 sw_if_index; /**< locator sw_if_index */
-  u8 priority; /**< locator priority */
-  u8 weight; /**< locator weight */
-}) ls_locator_t;
-/* *INDENT-ON* */
-
 static void
-vl_api_lisp_add_del_locator_set_t_handler (vl_api_lisp_add_del_locator_set_t *
-                                          mp)
+vl_api_interface_name_renumber_t_handler (vl_api_interface_name_renumber_t *
+                                         mp)
 {
-  vl_api_lisp_add_del_locator_set_reply_t *rmp;
+  vl_api_interface_name_renumber_reply_t *rmp;
   int rv = 0;
-  vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
-  locator_t locator;
-  ls_locator_t *ls_loc;
-  u32 ls_index = ~0, locator_num;
-  u8 *locator_name = NULL;
-  int i;
 
-  memset (a, 0, sizeof (a[0]));
-
-  locator_name = format (0, "%s", mp->locator_set_name);
+  VALIDATE_SW_IF_INDEX (mp);
 
-  a->name = locator_name;
-  a->is_add = mp->is_add;
-  a->local = 1;
-  locator_num = clib_net_to_host_u32 (mp->locator_num);
+  rv = vnet_interface_name_renumber
+    (ntohl (mp->sw_if_index), ntohl (mp->new_show_dev_instance));
 
-  memset (&locator, 0, sizeof (locator));
-  for (i = 0; i < locator_num; i++)
-    {
-      ls_loc = &((ls_locator_t *) mp->locators)[i];
-      VALIDATE_SW_IF_INDEX (ls_loc);
-
-      locator.sw_if_index = htonl (ls_loc->sw_if_index);
-      locator.priority = ls_loc->priority;
-      locator.weight = ls_loc->weight;
-      locator.local = 1;
-      vec_add1 (a->locators, locator);
-    }
+  BAD_SW_IF_INDEX_LABEL;
 
-  rv = vnet_lisp_add_del_locator_set (a, &ls_index);
+  REPLY_MACRO (VL_API_INTERFACE_NAME_RENUMBER_REPLY);
+}
 
-  BAD_SW_IF_INDEX_LABEL;
+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;
+  vlib_main_t *vm = am->vlib_main;
+  vl_api_ip4_arp_event_t *event;
+  static f64 arp_event_last_time;
+  f64 now = vlib_time_now (vm);
 
-  vec_free (locator_name);
-  vec_free (a->locators);
+  if (pool_is_free_index (am->arp_events, pool_index))
+    return 1;
 
+  event = pool_elt_at_index (am->arp_events, pool_index);
   /* *INDENT-OFF* */
-  REPLY_MACRO2 (VL_API_LISP_ADD_DEL_LOCATOR_SET_REPLY,
-  ({
-    rmp->ls_index = clib_host_to_net_u32 (ls_index);
-  }));
+  if (memcmp (&event->new_mac, new_mac, sizeof (event->new_mac)))
+    {
+      clib_memcpy (event->new_mac, new_mac, sizeof (event->new_mac));
+    }
+  else
+    {                          /* same mac */
+      if (sw_if_index == event->sw_if_index &&
+         (!event->mac_ip ||
+          /* for BD case, also check IP address with 10 sec timeout */
+          (address == event->address &&
+           (now - arp_event_last_time) < 10.0)))
+       return 1;
+    }
   /* *INDENT-ON* */
+
+  arp_event_last_time = now;
+  event->sw_if_index = sw_if_index;
+  if (event->mac_ip)
+    event->address = address;
+  return 0;
 }
 
-static void
-vl_api_lisp_add_del_locator_t_handler (vl_api_lisp_add_del_locator_t * mp)
+static int
+nd_change_data_callback (u32 pool_index, u8 * new_mac,
+                        u32 sw_if_index, ip6_address_t * address)
 {
-  vl_api_lisp_add_del_locator_reply_t *rmp;
-  int rv = 0;
-  locator_t locator, *locators = NULL;
-  vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
-  u32 ls_index = ~0;
-  u8 *locator_name = NULL;
-
-  memset (&locator, 0, sizeof (locator));
-  memset (a, 0, sizeof (a[0]));
-
-  locator.sw_if_index = ntohl (mp->sw_if_index);
-  locator.priority = mp->priority;
-  locator.weight = mp->weight;
-  locator.local = 1;
-  vec_add1 (locators, locator);
-
-  locator_name = format (0, "%s", mp->locator_set_name);
+  vpe_api_main_t *am = &vpe_api_main;
+  vlib_main_t *vm = am->vlib_main;
+  vl_api_ip6_nd_event_t *event;
+  static f64 nd_event_last_time;
+  f64 now = vlib_time_now (vm);
 
-  a->name = locator_name;
-  a->locators = locators;
-  a->is_add = mp->is_add;
-  a->local = 1;
+  if (pool_is_free_index (am->nd_events, pool_index))
+    return 1;
 
-  rv = vnet_lisp_add_del_locator (a, NULL, &ls_index);
+  event = pool_elt_at_index (am->nd_events, pool_index);
 
-  vec_free (locators);
-  vec_free (locator_name);
+  /* *INDENT-OFF* */
+  if (memcmp (&event->new_mac, new_mac, sizeof (event->new_mac)))
+    {
+      clib_memcpy (event->new_mac, new_mac, sizeof (event->new_mac));
+    }
+  else
+    {                          /* same mac */
+      if (sw_if_index == event->sw_if_index &&
+         (!event->mac_ip ||
+          /* for BD case, also check IP address with 10 sec timeout */
+          (ip6_address_is_equal (address,
+                                 (ip6_address_t *) event->address) &&
+           (now - nd_event_last_time) < 10.0)))
+       return 1;
+    }
+  /* *INDENT-ON* */
 
-  REPLY_MACRO (VL_API_LISP_ADD_DEL_LOCATOR_REPLY);
+  nd_event_last_time = now;
+  event->sw_if_index = sw_if_index;
+  if (event->mac_ip)
+    clib_memcpy (event->address, address, sizeof (event->address));
+  return 0;
 }
 
 static int
-unformat_lisp_eid_api (gid_address_t * dst, u32 vni, u8 type, void *src,
-                      u8 len)
+arp_change_delete_callback (u32 pool_index, u8 * notused)
 {
-  switch (type)
-    {
-    case 0:                    /* ipv4 */
-      gid_address_type (dst) = GID_ADDR_IP_PREFIX;
-      gid_address_ip_set (dst, src, IP4);
-      gid_address_ippref_len (dst) = len;
-      ip_prefix_normalize (&gid_address_ippref (dst));
-      break;
-    case 1:                    /* ipv6 */
-      gid_address_type (dst) = GID_ADDR_IP_PREFIX;
-      gid_address_ip_set (dst, src, IP6);
-      gid_address_ippref_len (dst) = len;
-      ip_prefix_normalize (&gid_address_ippref (dst));
-      break;
-    case 2:                    /* l2 mac */
-      gid_address_type (dst) = GID_ADDR_MAC;
-      clib_memcpy (&gid_address_mac (dst), src, 6);
-      break;
-    default:
-      /* unknown type */
-      return VNET_API_ERROR_INVALID_VALUE;
-    }
+  vpe_api_main_t *am = &vpe_api_main;
 
-  gid_address_vni (dst) = vni;
+  if (pool_is_free_index (am->arp_events, pool_index))
+    return 1;
 
+  pool_put_index (am->arp_events, pool_index);
   return 0;
 }
 
-static void
-vl_api_lisp_add_del_local_eid_t_handler (vl_api_lisp_add_del_local_eid_t * mp)
+static int
+nd_change_delete_callback (u32 pool_index, u8 * notused)
 {
-  vl_api_lisp_add_del_local_eid_reply_t *rmp;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  int rv = 0;
-  gid_address_t _eid, *eid = &_eid;
-  uword *p = NULL;
-  u32 locator_set_index = ~0, map_index = ~0;
-  vnet_lisp_add_del_mapping_args_t _a, *a = &_a;
-  u8 *name = NULL;
-  memset (a, 0, sizeof (a[0]));
-  memset (eid, 0, sizeof (eid[0]));
-
-  rv = unformat_lisp_eid_api (eid, clib_net_to_host_u32 (mp->vni),
-                             mp->eid_type, mp->eid, mp->prefix_len);
-  if (rv)
-    goto out;
-
-  name = format (0, "%s", mp->locator_set_name);
-  p = hash_get_mem (lcm->locator_set_index_by_name, name);
-  if (!p)
-    {
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto out;
-    }
-  locator_set_index = p[0];
-
-  /* XXX treat batch configuration */
-  a->is_add = mp->is_add;
-  gid_address_copy (&a->eid, eid);
-  a->locator_set_index = locator_set_index;
-  a->local = 1;
-  rv = vnet_lisp_add_del_local_mapping (a, &map_index);
+  vpe_api_main_t *am = &vpe_api_main;
 
-out:
-  vec_free (name);
-  gid_address_free (&a->eid);
+  if (pool_is_free_index (am->nd_events, pool_index))
+    return 1;
 
-  REPLY_MACRO (VL_API_LISP_ADD_DEL_LOCAL_EID_REPLY);
+  pool_put_index (am->nd_events, pool_index);
+  return 0;
 }
 
 static void
-  vl_api_lisp_eid_table_add_del_map_t_handler
-  (vl_api_lisp_eid_table_add_del_map_t * mp)
-{
-  vl_api_lisp_eid_table_add_del_map_reply_t *rmp;
-  int rv = 0;
-  rv = vnet_lisp_eid_table_map (clib_net_to_host_u32 (mp->vni),
-                               clib_net_to_host_u32 (mp->dp_table),
-                               mp->is_l2, mp->is_add);
-REPLY_MACRO (VL_API_LISP_EID_TABLE_ADD_DEL_MAP_REPLY)}
-
-/** Used for transferring locators via VPP API */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u8 is_ip4; /**< is locator an IPv4 address */
-  u8 priority; /**< locator priority */
-  u8 weight; /**< locator weight */
-  u8 addr[16]; /**< IPv4/IPv6 address */
-}) rloc_t;
-/* *INDENT-ON* */
-
-static locator_pair_t *
-unformat_lisp_loc_pairs (void *lcl_locs, void *rmt_locs, u32 rloc_num)
+vl_api_want_ip4_arp_events_t_handler (vl_api_want_ip4_arp_events_t * mp)
 {
-  u32 i;
-  locator_pair_t *pairs = 0, pair;
-  rloc_t *r;
+  vpe_api_main_t *am = &vpe_api_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  vl_api_want_ip4_arp_events_reply_t *rmp;
+  vl_api_ip4_arp_event_t *event;
+  int rv;
 
-  for (i = 0; i < rloc_num; i++)
+  if (mp->enable_disable)
     {
-      /* local locator */
-      r = &((rloc_t *) lcl_locs)[i];
-      memset (&pair.lcl_loc, 0, sizeof (pair.lcl_loc));
-      ip_address_set (&pair.lcl_loc, &r->addr, r->is_ip4 ? IP4 : IP6);
-
-      /* remote locators */
-      r = &((rloc_t *) rmt_locs)[i];
-      memset (&pair.rmt_loc, 0, sizeof (pair.rmt_loc));
-      ip_address_set (&pair.rmt_loc, &r->addr, r->is_ip4 ? IP4 : IP6);
+      pool_get (am->arp_events, event);
+      memset (event, 0, sizeof (*event));
 
-      pair.priority = r->priority;
-      pair.weight = r->weight;
+      event->_vl_msg_id = ntohs (VL_API_IP4_ARP_EVENT);
+      event->client_index = mp->client_index;
+      event->context = mp->context;
+      event->address = mp->address;
+      event->pid = mp->pid;
+      if (mp->address == 0)
+       event->mac_ip = 1;
 
-      vec_add1 (pairs, pair);
+      rv = vnet_add_del_ip4_arp_change_event
+       (vnm, arp_change_data_callback,
+        mp->pid, &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
+       (vnm, arp_change_delete_callback,
+        mp->pid, &mp->address /* addr, in net byte order */ ,
+        vpe_resolver_process_node.index,
+        IP4_ARP_EVENT, ~0 /* pool index */ , 0 /* is_add */ );
     }
-  return pairs;
+  REPLY_MACRO (VL_API_WANT_IP4_ARP_EVENTS_REPLY);
 }
 
-static locator_t *
-unformat_lisp_locs (void *rmt_locs, u32 rloc_num)
+static void
+vl_api_want_ip6_nd_events_t_handler (vl_api_want_ip6_nd_events_t * mp)
 {
-  u32 i;
-  locator_t *locs = 0, loc;
-  rloc_t *r;
+  vpe_api_main_t *am = &vpe_api_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  vl_api_want_ip6_nd_events_reply_t *rmp;
+  vl_api_ip6_nd_event_t *event;
+  int rv;
 
-  for (i = 0; i < rloc_num; i++)
+  if (mp->enable_disable)
     {
-      /* remote locators */
-      r = &((rloc_t *) rmt_locs)[i];
-      memset (&loc, 0, sizeof (loc));
-      gid_address_ip_set (&loc.address, &r->addr, r->is_ip4 ? IP4 : IP6);
+      pool_get (am->nd_events, event);
+      memset (event, 0, sizeof (*event));
 
-      loc.priority = r->priority;
-      loc.weight = r->weight;
+      event->_vl_msg_id = ntohs (VL_API_IP6_ND_EVENT);
+      event->client_index = mp->client_index;
+      event->context = mp->context;
+      clib_memcpy (event->address, mp->address, 16);
+      event->pid = mp->pid;
+      if (ip6_address_is_zero ((ip6_address_t *) mp->address))
+       event->mac_ip = 1;
 
-      vec_add1 (locs, loc);
+      rv = vnet_add_del_ip6_nd_change_event
+       (vnm, nd_change_data_callback,
+        mp->pid, mp->address /* addr, in net byte order */ ,
+        vpe_resolver_process_node.index,
+        IP6_ND_EVENT, event - am->nd_events, 1 /* is_add */ );
+    }
+  else
+    {
+      rv = vnet_add_del_ip6_nd_change_event
+       (vnm, nd_change_delete_callback,
+        mp->pid, mp->address /* addr, in net byte order */ ,
+        vpe_resolver_process_node.index,
+        IP6_ND_EVENT, ~0 /* pool index */ , 0 /* is_add */ );
     }
-  return locs;
+  REPLY_MACRO (VL_API_WANT_IP6_ND_EVENTS_REPLY);
 }
 
-static void
-  vl_api_lisp_gpe_add_del_fwd_entry_t_handler
-  (vl_api_lisp_gpe_add_del_fwd_entry_t * mp)
+static void vl_api_input_acl_set_interface_t_handler
+  (vl_api_input_acl_set_interface_t * mp)
 {
-  vl_api_lisp_gpe_add_del_fwd_entry_reply_t *rmp;
-  vnet_lisp_gpe_add_del_fwd_entry_args_t _a, *a = &_a;
-  locator_pair_t *pairs = 0;
-  int rv = 0;
-
-  memset (a, 0, sizeof (a[0]));
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_input_acl_set_interface_reply_t *rmp;
+  int rv;
+  u32 sw_if_index, ip4_table_index, ip6_table_index, l2_table_index;
 
-  rv = unformat_lisp_eid_api (&a->rmt_eid, mp->vni, mp->eid_type,
-                             mp->rmt_eid, mp->rmt_len);
-  rv |= unformat_lisp_eid_api (&a->lcl_eid, mp->vni, mp->eid_type,
-                              mp->lcl_eid, mp->lcl_len);
+  ip4_table_index = ntohl (mp->ip4_table_index);
+  ip6_table_index = ntohl (mp->ip6_table_index);
+  l2_table_index = ntohl (mp->l2_table_index);
+  sw_if_index = ntohl (mp->sw_if_index);
 
-  pairs = unformat_lisp_loc_pairs (mp->lcl_locs, mp->rmt_locs, mp->loc_num);
+  VALIDATE_SW_IF_INDEX (mp);
 
-  if (rv || 0 == pairs)
-    goto send_reply;
+  rv = vnet_set_input_acl_intfc (vm, sw_if_index, ip4_table_index,
+                                ip6_table_index, l2_table_index, mp->is_add);
 
-  a->is_add = mp->is_add;
-  a->locator_pairs = pairs;
-  a->dp_table = mp->dp_table;
-  a->vni = mp->vni;
-  a->action = mp->action;
+  BAD_SW_IF_INDEX_LABEL;
 
-  rv = vnet_lisp_gpe_add_del_fwd_entry (a, 0);
-  vec_free (pairs);
-send_reply:
-  REPLY_MACRO (VL_API_LISP_GPE_ADD_DEL_FWD_ENTRY_REPLY);
+  REPLY_MACRO (VL_API_INPUT_ACL_SET_INTERFACE_REPLY);
 }
 
-static void
-vl_api_lisp_add_del_map_resolver_t_handler (vl_api_lisp_add_del_map_resolver_t
-                                           * mp)
+static void vl_api_cop_interface_enable_disable_t_handler
+  (vl_api_cop_interface_enable_disable_t * mp)
 {
-  vl_api_lisp_add_del_map_resolver_reply_t *rmp;
-  int rv = 0;
-  vnet_lisp_add_del_map_resolver_args_t _a, *a = &_a;
+  vl_api_cop_interface_enable_disable_reply_t *rmp;
+  int rv;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  int enable_disable;
+
+  VALIDATE_SW_IF_INDEX (mp);
 
-  memset (a, 0, sizeof (a[0]));
+  enable_disable = (int) mp->enable_disable;
 
-  a->is_add = mp->is_add;
-  ip_address_set (&a->address, mp->ip_address, mp->is_ipv6 ? IP6 : IP4);
+  rv = cop_interface_enable_disable (sw_if_index, enable_disable);
 
-  rv = vnet_lisp_add_del_map_resolver (a);
+  BAD_SW_IF_INDEX_LABEL;
 
-  REPLY_MACRO (VL_API_LISP_ADD_DEL_MAP_RESOLVER_REPLY);
+  REPLY_MACRO (VL_API_COP_INTERFACE_ENABLE_DISABLE_REPLY);
 }
 
-static void
-vl_api_lisp_gpe_enable_disable_t_handler (vl_api_lisp_gpe_enable_disable_t *
-                                         mp)
+static void vl_api_cop_whitelist_enable_disable_t_handler
+  (vl_api_cop_whitelist_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;
+  vl_api_cop_whitelist_enable_disable_reply_t *rmp;
+  cop_whitelist_enable_disable_args_t _a, *a = &_a;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  int rv;
 
-  a->is_en = mp->is_en;
-  vnet_lisp_gpe_enable_disable (a);
+  VALIDATE_SW_IF_INDEX (mp);
 
-  REPLY_MACRO (VL_API_LISP_GPE_ENABLE_DISABLE_REPLY);
-}
+  a->sw_if_index = sw_if_index;
+  a->ip4 = mp->ip4;
+  a->ip6 = mp->ip6;
+  a->default_cop = mp->default_cop;
+  a->fib_id = ntohl (mp->fib_id);
 
-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;
+  rv = cop_whitelist_enable_disable (a);
+
+  BAD_SW_IF_INDEX_LABEL;
 
-  vnet_lisp_enable_disable (mp->is_en);
-  REPLY_MACRO (VL_API_LISP_ENABLE_DISABLE_REPLY);
+  REPLY_MACRO (VL_API_COP_WHITELIST_ENABLE_DISABLE_REPLY);
 }
 
 static void
-vl_api_lisp_gpe_add_del_iface_t_handler (vl_api_lisp_gpe_add_del_iface_t * mp)
+vl_api_get_node_graph_t_handler (vl_api_get_node_graph_t * mp)
 {
-  vl_api_lisp_gpe_add_del_iface_reply_t *rmp;
   int rv = 0;
+  u8 *vector = 0;
+  api_main_t *am = &api_main;
+  vlib_main_t *vm = vlib_get_main ();
+  void *oldheap;
+  vl_api_get_node_graph_reply_t *rmp;
 
-  if (mp->is_l2)
-    {
-      if (mp->is_add)
-       {
-         if (~0 ==
-             lisp_gpe_tenant_l2_iface_add_or_lock (mp->vni, mp->dp_table))
-           rv = 1;
-       }
-      else
-       lisp_gpe_tenant_l2_iface_unlock (mp->vni);
-    }
-  else
-    {
-      if (mp->is_add)
-       {
-         if (~0 ==
-             lisp_gpe_tenant_l3_iface_add_or_lock (mp->vni, mp->dp_table))
-           rv = 1;
-       }
-      else
-       lisp_gpe_tenant_l3_iface_unlock (mp->vni);
-    }
+  pthread_mutex_lock (&am->vlib_rp->mutex);
+  oldheap = svm_push_data_heap (am->vlib_rp);
 
-  REPLY_MACRO (VL_API_LISP_GPE_ADD_DEL_IFACE_REPLY);
-}
+  /*
+   * Keep the number of memcpy ops to a minimum (e.g. 1).
+   */
+  vec_validate (vector, 16384);
+  vec_reset_length (vector);
 
-static void
-  vl_api_show_lisp_map_request_mode_t_handler
-  (vl_api_show_lisp_map_request_mode_t * mp)
-{
-  int rv = 0;
-  vl_api_show_lisp_map_request_mode_reply_t *rmp;
+  /* $$$$ 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);
 
   /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_SHOW_LISP_MAP_REQUEST_MODE_REPLY,
+  REPLY_MACRO2(VL_API_GET_NODE_GRAPH_REPLY,
   ({
-    rmp->mode = vnet_lisp_get_map_request_mode ();
+    rmp->reply_in_shmem = (uword) vector;
   }));
   /* *INDENT-ON* */
 }
 
 static void
-vl_api_lisp_map_request_mode_t_handler (vl_api_lisp_map_request_mode_t * mp)
+vl_api_ioam_enable_t_handler (vl_api_ioam_enable_t * mp)
 {
-  vl_api_lisp_map_request_mode_reply_t *rmp;
   int rv = 0;
+  vl_api_ioam_enable_reply_t *rmp;
+  clib_error_t *error;
 
-  rv = vnet_lisp_set_map_request_mode (mp->mode);
+  /* Ignoring the profile id as currently a single profile
+   * is supported */
+  error = ip6_ioam_enable (mp->trace_enable, mp->pot_enable,
+                          mp->seqno, mp->analyse);
+  if (error)
+    {
+      clib_error_report (error);
+      rv = clib_error_get_code (error);
+    }
 
-  REPLY_MACRO (VL_API_LISP_MAP_REQUEST_MODE_REPLY);
+  REPLY_MACRO (VL_API_IOAM_ENABLE_REPLY);
 }
 
 static void
-vl_api_lisp_pitr_set_locator_set_t_handler (vl_api_lisp_pitr_set_locator_set_t
-                                           * mp)
+vl_api_ioam_disable_t_handler (vl_api_ioam_disable_t * mp)
 {
-  vl_api_lisp_pitr_set_locator_set_reply_t *rmp;
   int rv = 0;
-  u8 *ls_name = 0;
+  vl_api_ioam_disable_reply_t *rmp;
+  clib_error_t *error;
 
-  ls_name = format (0, "%s", mp->ls_name);
-  rv = vnet_lisp_pitr_set_locator_set (ls_name, mp->is_add);
-  vec_free (ls_name);
+  error = clear_ioam_rewrite_fn ();
+  if (error)
+    {
+      clib_error_report (error);
+      rv = clib_error_get_code (error);
+    }
 
-  REPLY_MACRO (VL_API_LISP_PITR_SET_LOCATOR_SET_REPLY);
+  REPLY_MACRO (VL_API_IOAM_DISABLE_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_policer_add_del_t_handler (vl_api_policer_add_del_t * mp)
 {
-  vl_api_lisp_add_del_map_request_itr_rlocs_reply_t *rmp;
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_policer_add_del_reply_t *rmp;
   int rv = 0;
-  u8 *locator_set_name = NULL;
-  vnet_lisp_add_del_mreq_itr_rloc_args_t _a, *a = &_a;
+  u8 *name = NULL;
+  sse2_qos_pol_cfg_params_st cfg;
+  clib_error_t *error;
+  u32 policer_index;
 
-  locator_set_name = format (0, "%s", mp->locator_set_name);
+  name = format (0, "%s", mp->name);
 
-  a->is_add = mp->is_add;
-  a->locator_set_name = locator_set_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;
+  cfg.conform_action.action_type = mp->conform_action_type;
+  cfg.conform_action.dscp = mp->conform_dscp;
+  cfg.exceed_action.action_type = mp->exceed_action_type;
+  cfg.exceed_action.dscp = mp->exceed_dscp;
+  cfg.violate_action.action_type = mp->violate_action_type;
+  cfg.violate_action.dscp = mp->violate_dscp;
+  cfg.color_aware = mp->color_aware;
 
-  rv = vnet_lisp_add_del_mreq_itr_rlocs (a);
+  error = policer_add_del (vm, name, &cfg, &policer_index, mp->is_add);
 
-  vec_free (locator_set_name);
+  if (error)
+    rv = VNET_API_ERROR_UNSPECIFIED;
 
-  REPLY_MACRO (VL_API_LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS_REPLY);
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_POLICER_ADD_DEL_REPLY,
+  ({
+    if (rv == 0 &&  mp->is_add)
+      rmp->policer_index = ntohl(policer_index);
+    else
+      rmp->policer_index = ~0;
+  }));
+  /* *INDENT-ON* */
 }
 
 static void
-  vl_api_lisp_add_del_remote_mapping_t_handler
-  (vl_api_lisp_add_del_remote_mapping_t * mp)
+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)
 {
-  locator_t *rlocs = 0;
-  vl_api_lisp_add_del_remote_mapping_reply_t *rmp;
-  int rv = 0;
-  gid_address_t _eid, *eid = &_eid;
-  u32 rloc_num = clib_net_to_host_u32 (mp->rloc_num);
-
-  memset (eid, 0, sizeof (eid[0]));
-
-  rv = unformat_lisp_eid_api (eid, clib_net_to_host_u32 (mp->vni),
-                             mp->eid_type, mp->eid, mp->eid_len);
-  if (rv)
-    goto send_reply;
-
-  rlocs = unformat_lisp_locs (mp->rlocs, rloc_num);
+  vl_api_policer_details_t *mp;
 
-  if (!mp->is_add)
-    {
-      vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
-      gid_address_copy (&a->reid, eid);
-      a->is_add = 0;
-      rv = vnet_lisp_add_del_adjacency (a);
-      if (rv)
-       {
-         goto out;
-       }
-    }
-
-  /* NOTE: for now this works as a static remote mapping, i.e.,
-   * not authoritative and ttl infinite. */
-  rv = vnet_lisp_add_del_mapping (eid, rlocs, mp->action, 0, ~0,
-                                 mp->is_add, 1 /* is_static */ , 0);
-
-  if (mp->del_all)
-    vnet_lisp_clear_all_remote_adjacencies ();
-
-out:
-  vec_free (rlocs);
-send_reply:
-  REPLY_MACRO (VL_API_LISP_ADD_DEL_REMOTE_MAPPING_REPLY);
-}
-
-static void
-vl_api_lisp_add_del_adjacency_t_handler (vl_api_lisp_add_del_adjacency_t * mp)
-{
-  vl_api_lisp_add_del_adjacency_reply_t *rmp;
-  vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
-
-  int rv = 0;
-  memset (a, 0, sizeof (a[0]));
-
-  rv = unformat_lisp_eid_api (&a->leid, clib_net_to_host_u32 (mp->vni),
-                             mp->eid_type, mp->leid, mp->leid_len);
-  rv |= unformat_lisp_eid_api (&a->reid, clib_net_to_host_u32 (mp->vni),
-                              mp->eid_type, mp->reid, mp->reid_len);
-
-  if (rv)
-    goto send_reply;
-
-  a->is_add = mp->is_add;
-  rv = vnet_lisp_add_del_adjacency (a);
-
-send_reply:
-  REPLY_MACRO (VL_API_LISP_ADD_DEL_ADJACENCY_REPLY);
-}
-
-static void
-send_lisp_locator_details (lisp_cp_main_t * lcm,
-                          locator_t * loc,
-                          unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_lisp_locator_details_t *rmp;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_LISP_LOCATOR_DETAILS);
-  rmp->context = context;
-
-  rmp->local = loc->local;
-  if (loc->local)
-    {
-      rmp->sw_if_index = ntohl (loc->sw_if_index);
-    }
-  else
-    {
-      rmp->is_ipv6 = gid_address_ip_version (&loc->address);
-      ip_address_copy_addr (rmp->ip_address, &gid_address_ip (&loc->address));
-    }
-  rmp->priority = loc->priority;
-  rmp->weight = loc->weight;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_lisp_locator_dump_t_handler (vl_api_lisp_locator_dump_t * mp)
-{
-  u8 *ls_name = 0;
-  unix_shared_memory_queue_t *q = 0;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  locator_set_t *lsit = 0;
-  locator_t *loc = 0;
-  u32 ls_index = ~0, *locit = 0;
-  uword *p = 0;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  if (mp->is_index_set)
-    ls_index = htonl (mp->ls_index);
-  else
-    {
-      /* make sure we get a proper C-string */
-      mp->ls_name[sizeof (mp->ls_name) - 1] = 0;
-      ls_name = format (0, "%s", mp->ls_name);
-      p = hash_get_mem (lcm->locator_set_index_by_name, ls_name);
-      if (!p)
-       goto out;
-      ls_index = p[0];
-    }
-
-  if (pool_is_free_index (lcm->locator_set_pool, ls_index))
-    return;
-
-  lsit = pool_elt_at_index (lcm->locator_set_pool, ls_index);
-
-  vec_foreach (locit, lsit->locator_indices)
-  {
-    loc = pool_elt_at_index (lcm->locator_pool, locit[0]);
-    send_lisp_locator_details (lcm, loc, q, mp->context);
-  };
-out:
-  vec_free (ls_name);
-}
-
-static void
-send_lisp_locator_set_details (lisp_cp_main_t * lcm,
-                              locator_set_t * lsit,
-                              unix_shared_memory_queue_t * q,
-                              u32 context, u32 ls_index)
-{
-  vl_api_lisp_locator_set_details_t *rmp;
-  u8 *str = 0;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_LISP_LOCATOR_SET_DETAILS);
-  rmp->context = context;
-
-  rmp->ls_index = htonl (ls_index);
-  if (lsit->local)
-    {
-      ASSERT (lsit->name != NULL);
-      strncpy ((char *) rmp->ls_name, (char *) lsit->name,
-              vec_len (lsit->name));
-    }
-  else
-    {
-      str = format (0, "<remote-%d>", ls_index);
-      strncpy ((char *) rmp->ls_name, (char *) str, vec_len (str));
-      vec_free (str);
-    }
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_lisp_locator_set_dump_t_handler (vl_api_lisp_locator_set_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q = NULL;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  locator_set_t *lsit = NULL;
-  u8 filter;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  filter = mp->filter;
-  /* *INDENT-OFF* */
-  pool_foreach (lsit, lcm->locator_set_pool,
-  ({
-    if (filter && !((1 == filter && lsit->local) ||
-                    (2 == filter && !lsit->local)))
-      {
-        continue;
-      }
-    send_lisp_locator_set_details (lcm, lsit, q, mp->context,
-                                   lsit - lcm->locator_set_pool);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-lisp_fid_put_api (u8 * dst, fid_address_t * src, u8 * prefix_length)
-{
-  ASSERT (prefix_length);
-  ip_prefix_t *ippref = &fid_addr_ippref (src);
-
-  switch (fid_addr_type (src))
-    {
-    case FID_ADDR_IP_PREF:
-      if (ip_prefix_version (ippref) == IP4)
-       clib_memcpy (dst, &ip_prefix_v4 (ippref), 4);
-      else
-       clib_memcpy (dst, &ip_prefix_v6 (ippref), 16);
-      prefix_length[0] = ip_prefix_len (ippref);
-      break;
-
-    case FID_ADDR_MAC:
-      prefix_length[0] = 0;
-      clib_memcpy (dst, fid_addr_mac (src), 6);
-      break;
-
-    default:
-      clib_warning ("Unknown FID type %d!", fid_addr_type (src));
-      break;
-    }
-}
-
-static u8
-fid_type_to_api_type (fid_address_t * fid)
-{
-  ip_prefix_t *ippref;
-
-  switch (fid_addr_type (fid))
-    {
-    case FID_ADDR_IP_PREF:
-      ippref = &fid_addr_ippref (fid);
-      if (ip_prefix_version (ippref) == IP4)
-       return 0;
-      else if (ip_prefix_version (ippref) == IP6)
-       return 1;
-      else
-       return ~0;
-
-    case FID_ADDR_MAC:
-      return 2;
-    }
-
-  return ~0;
-}
-
-static void
-send_lisp_eid_table_details (mapping_t * mapit,
-                            unix_shared_memory_queue_t * q,
-                            u32 context, u8 filter)
-{
-  fid_address_t *fid;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  locator_set_t *ls = 0;
-  vl_api_lisp_eid_table_details_t *rmp = NULL;
-  gid_address_t *gid = NULL;
-  u8 *mac = 0;
-  ip_prefix_t *ip_prefix = NULL;
-
-  switch (filter)
-    {
-    case 0:                    /* all mappings */
-      break;
-
-    case 1:                    /* local only */
-      if (!mapit->local)
-       return;
-      break;
-    case 2:                    /* remote only */
-      if (mapit->local)
-       return;
-      break;
-    default:
-      clib_warning ("Filter error, unknown filter: %d", filter);
-      return;
-    }
-
-  gid = &mapit->eid;
-  ip_prefix = &gid_address_ippref (gid);
-  mac = gid_address_mac (gid);
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_DETAILS);
-
-  ls = pool_elt_at_index (lcm->locator_set_pool, mapit->locator_set_index);
-  if (vec_len (ls->locator_indices) == 0)
-    rmp->locator_set_index = ~0;
-  else
-    rmp->locator_set_index = clib_host_to_net_u32 (mapit->locator_set_index);
-
-  rmp->is_local = mapit->local;
-  rmp->ttl = clib_host_to_net_u32 (mapit->ttl);
-  rmp->action = mapit->action;
-  rmp->authoritative = mapit->authoritative;
-
-  switch (gid_address_type (gid))
-    {
-    case GID_ADDR_SRC_DST:
-      rmp->is_src_dst = 1;
-      fid = &gid_address_sd_src (gid);
-      rmp->eid_type = fid_type_to_api_type (fid);
-      lisp_fid_put_api (rmp->seid, &gid_address_sd_src (gid),
-                       &rmp->seid_prefix_len);
-      lisp_fid_put_api (rmp->eid, &gid_address_sd_dst (gid),
-                       &rmp->eid_prefix_len);
-      break;
-    case GID_ADDR_IP_PREFIX:
-      rmp->eid_prefix_len = ip_prefix_len (ip_prefix);
-      if (ip_prefix_version (ip_prefix) == IP4)
-       {
-         rmp->eid_type = 0;    /* ipv4 type */
-         clib_memcpy (rmp->eid, &ip_prefix_v4 (ip_prefix),
-                      sizeof (ip_prefix_v4 (ip_prefix)));
-       }
-      else
-       {
-         rmp->eid_type = 1;    /* ipv6 type */
-         clib_memcpy (rmp->eid, &ip_prefix_v6 (ip_prefix),
-                      sizeof (ip_prefix_v6 (ip_prefix)));
-       }
-      break;
-    case GID_ADDR_MAC:
-      rmp->eid_type = 2;       /* l2 mac type */
-      clib_memcpy (rmp->eid, mac, 6);
-      break;
-    default:
-      ASSERT (0);
-    }
-  rmp->context = context;
-  rmp->vni = clib_host_to_net_u32 (gid_address_vni (gid));
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_lisp_eid_table_dump_t_handler (vl_api_lisp_eid_table_dump_t * mp)
-{
-  u32 mi;
-  unix_shared_memory_queue_t *q = NULL;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  mapping_t *mapit = NULL;
-  gid_address_t _eid, *eid = &_eid;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  if (mp->eid_set)
-    {
-      memset (eid, 0, sizeof (*eid));
-
-      unformat_lisp_eid_api (eid, clib_net_to_host_u32 (mp->vni),
-                            mp->eid_type, mp->eid, mp->prefix_length);
-
-      mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, eid);
-      if ((u32) ~ 0 == mi)
-       return;
-
-      mapit = pool_elt_at_index (lcm->mapping_pool, mi);
-      send_lisp_eid_table_details (mapit, q, mp->context,
-                                  0 /* ignore filter */ );
-    }
-  else
-    {
-      /* *INDENT-OFF* */
-      pool_foreach (mapit, lcm->mapping_pool,
-      ({
-        send_lisp_eid_table_details(mapit, q, mp->context,
-                                    mp->filter);
-      }));
-      /* *INDENT-ON* */
-    }
-}
-
-static void
-send_lisp_gpe_fwd_entry_details (lisp_gpe_fwd_entry_t * lfe,
-                                unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_lisp_gpe_tunnel_details_t *rmp;
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_LISP_GPE_TUNNEL_DETAILS);
-
-  rmp->tunnels = lfe - lgm->lisp_fwd_entry_pool;
-
-  rmp->is_ipv6 = ip_prefix_version (&(lfe->key->rmt.ippref)) == IP6 ? 1 : 0;
-  ip_address_copy_addr (rmp->source_ip,
-                       &ip_prefix_addr (&(lfe->key->rmt.ippref)));
-  ip_address_copy_addr (rmp->destination_ip,
-                       &ip_prefix_addr (&(lfe->key->rmt.ippref)));
-
-  rmp->encap_fib_id = htonl (0);
-  rmp->decap_fib_id = htonl (lfe->eid_fib_index);
-  rmp->iid = htonl (lfe->key->vni);
-  rmp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_lisp_gpe_tunnel_dump_t_handler (vl_api_lisp_gpe_tunnel_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q = NULL;
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-  lisp_gpe_fwd_entry_t *lfe = NULL;
-
-  if (pool_elts (lgm->lisp_fwd_entry_pool) == 0)
-    {
-      return;
-    }
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  /* *INDENT-OFF* */
-  pool_foreach(lfe, lgm->lisp_fwd_entry_pool,
-  ({
-    send_lisp_gpe_fwd_entry_details(lfe, q, mp->context);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-send_lisp_map_resolver_details (ip_address_t * ip,
-                               unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_lisp_map_resolver_details_t *rmp = NULL;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_LISP_MAP_RESOLVER_DETAILS);
-
-  switch (ip_addr_version (ip))
-    {
-    case IP4:
-      rmp->is_ipv6 = 0;
-      clib_memcpy (rmp->ip_address, &ip_addr_v4 (ip),
-                  sizeof (ip_addr_v4 (ip)));
-      break;
-
-    case IP6:
-      rmp->is_ipv6 = 1;
-      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_map_resolver_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q = NULL;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  map_resolver_t *mr;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  vec_foreach (mr, lcm->map_resolvers)
-  {
-    send_lisp_map_resolver_details (&mr->address, q, mp->context);
-  }
-}
-
-static void
-send_eid_table_map_pair (hash_pair_t * p,
-                        unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_lisp_eid_table_map_details_t *rmp = NULL;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_MAP_DETAILS);
-
-  rmp->vni = clib_host_to_net_u32 (p->key);
-  rmp->dp_table = clib_host_to_net_u32 (p->value[0]);
-  rmp->context = context;
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_lisp_eid_table_map_dump_t_handler (vl_api_lisp_eid_table_map_dump_t *
-                                         mp)
-{
-  unix_shared_memory_queue_t *q = NULL;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  hash_pair_t *p;
-  uword *vni_table = 0;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  if (mp->is_l2)
-    {
-      vni_table = lcm->bd_id_by_vni;
-    }
-  else
-    {
-      vni_table = lcm->table_id_by_vni;
-    }
-
-  /* *INDENT-OFF* */
-  hash_foreach_pair (p, vni_table,
-  ({
-    send_eid_table_map_pair (p, q, mp->context);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-send_eid_table_vni (u32 vni, unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_lisp_eid_table_vni_details_t *rmp = 0;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_VNI_DETAILS);
-  rmp->context = context;
-  rmp->vni = clib_host_to_net_u32 (vni);
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-lisp_adjacency_copy (vl_api_lisp_adjacency_t * dst, lisp_adjacency_t * adjs)
-{
-  lisp_adjacency_t *adj;
-  vl_api_lisp_adjacency_t a;
-  u32 i, n = vec_len (adjs);
-
-  for (i = 0; i < n; i++)
-    {
-      adj = vec_elt_at_index (adjs, i);
-      memset (&a, 0, sizeof (a));
-
-      switch (gid_address_type (&adj->reid))
-       {
-       case GID_ADDR_IP_PREFIX:
-         a.reid_prefix_len = gid_address_ippref_len (&adj->reid);
-         a.leid_prefix_len = gid_address_ippref_len (&adj->leid);
-         if (gid_address_ip_version (&adj->reid) == IP4)
-           {
-             a.eid_type = 0;   /* ipv4 type */
-             clib_memcpy (a.reid, &gid_address_ip (&adj->reid), 4);
-             clib_memcpy (a.leid, &gid_address_ip (&adj->leid), 4);
-           }
-         else
-           {
-             a.eid_type = 1;   /* ipv6 type */
-             clib_memcpy (a.reid, &gid_address_ip (&adj->reid), 16);
-             clib_memcpy (a.leid, &gid_address_ip (&adj->leid), 16);
-           }
-         break;
-       case GID_ADDR_MAC:
-         a.eid_type = 2;       /* l2 mac type */
-         mac_copy (a.reid, gid_address_mac (&adj->reid));
-         mac_copy (a.leid, gid_address_mac (&adj->leid));
-         break;
-       default:
-         ASSERT (0);
-       }
-      dst[i] = a;
-    }
-}
-
-static void
-vl_api_lisp_adjacencies_get_t_handler (vl_api_lisp_adjacencies_get_t * mp)
-{
-  vl_api_lisp_adjacencies_get_reply_t *rmp = 0;
-  lisp_adjacency_t *adjs = 0;
-  int rv = 0;
-  vl_api_lisp_adjacency_t a;
-  u32 size = ~0;
-  u32 vni = clib_net_to_host_u32 (mp->vni);
-
-  adjs = vnet_lisp_adjacencies_get_by_vni (vni);
-  size = vec_len (adjs) * sizeof (a);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO4 (VL_API_LISP_ADJACENCIES_GET_REPLY, size,
-  {
-    rmp->count = clib_host_to_net_u32 (vec_len (adjs));
-    lisp_adjacency_copy (rmp->adjacencies, adjs);
-  });
-  /* *INDENT-ON* */
-
-  vec_free (adjs);
-}
-
-static void
-vl_api_lisp_eid_table_vni_dump_t_handler (vl_api_lisp_eid_table_vni_dump_t *
-                                         mp)
-{
-  hash_pair_t *p;
-  u32 *vnis = 0;
-  unix_shared_memory_queue_t *q = 0;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  /* *INDENT-OFF* */
-  hash_foreach_pair (p, lcm->table_id_by_vni,
-  ({
-    hash_set (vnis, p->key, 0);
-  }));
-
-  hash_foreach_pair (p, lcm->bd_id_by_vni,
-  ({
-    hash_set (vnis, p->key, 0);
-  }));
-
-  hash_foreach_pair (p, vnis,
-  ({
-    send_eid_table_vni (p->key, q, mp->context);
-  }));
-  /* *INDENT-ON* */
-
-  hash_free (vnis);
-}
-
-static void
-vl_api_show_lisp_status_t_handler (vl_api_show_lisp_status_t * mp)
-{
-  unix_shared_memory_queue_t *q = NULL;
-  vl_api_show_lisp_status_reply_t *rmp = NULL;
-  int rv = 0;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_SHOW_LISP_STATUS_REPLY,
-  ({
-    rmp->gpe_status = vnet_lisp_gpe_enable_disable_status ();
-    rmp->feature_status = vnet_lisp_enable_disable_status ();
-  }));
-  /* *INDENT-ON* */
-}
-
-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);
-    }
-
-  /* *INDENT-OFF* */
-  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);
-  }));
-  /* *INDENT-ON* */
-
-  vec_free (tmp_str);
-}
-
-static void
-vl_api_show_lisp_pitr_t_handler (vl_api_show_lisp_pitr_t * mp)
-{
-  unix_shared_memory_queue_t *q = NULL;
-  vl_api_show_lisp_pitr_reply_t *rmp = NULL;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  mapping_t *m;
-  locator_set_t *ls = 0;
-  u8 *tmp_str = 0;
-  int rv = 0;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  if (!lcm->lisp_pitr)
-    {
-      tmp_str = format (0, "N/A");
-    }
-  else
-    {
-      m = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
-      if (~0 != m->locator_set_index)
-       {
-         ls =
-           pool_elt_at_index (lcm->locator_set_pool, m->locator_set_index);
-         tmp_str = format (0, "%s", ls->name);
-       }
-      else
-       {
-         tmp_str = format (0, "N/A");
-       }
-    }
-  vec_add1 (tmp_str, 0);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_SHOW_LISP_PITR_REPLY,
-  ({
-    rmp->status = lcm->lisp_pitr;
-    strncpy((char *) rmp->locator_set_name, (char *) tmp_str,
-            ARRAY_LEN(rmp->locator_set_name) - 1);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_interface_name_renumber_t_handler (vl_api_interface_name_renumber_t *
-                                         mp)
-{
-  vl_api_interface_name_renumber_reply_t *rmp;
-  int rv = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  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,
-                         u32 sw_if_index, u32 address)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  vlib_main_t *vm = am->vlib_main;
-  vl_api_ip4_arp_event_t *event;
-  static f64 arp_event_last_time;
-  f64 now = vlib_time_now (vm);
-
-  if (pool_is_free_index (am->arp_events, pool_index))
-    return 1;
-
-  event = pool_elt_at_index (am->arp_events, pool_index);
-  /* *INDENT-OFF* */
-  if (memcmp (&event->new_mac, new_mac, sizeof (event->new_mac)))
-    {
-      clib_memcpy (event->new_mac, new_mac, sizeof (event->new_mac));
-    }
-  else
-    {                          /* same mac */
-      if (sw_if_index == event->sw_if_index &&
-         (!event->mac_ip ||
-          /* for BD case, also check IP address with 10 sec timeout */
-          (address == event->address &&
-           (now - arp_event_last_time) < 10.0)))
-       return 1;
-    }
-  /* *INDENT-ON* */
-
-  arp_event_last_time = now;
-  event->sw_if_index = sw_if_index;
-  if (event->mac_ip)
-    event->address = address;
-  return 0;
-}
-
-static int
-nd_change_data_callback (u32 pool_index, u8 * new_mac,
-                        u32 sw_if_index, ip6_address_t * address)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  vlib_main_t *vm = am->vlib_main;
-  vl_api_ip6_nd_event_t *event;
-  static f64 nd_event_last_time;
-  f64 now = vlib_time_now (vm);
-
-  if (pool_is_free_index (am->nd_events, pool_index))
-    return 1;
-
-  event = pool_elt_at_index (am->nd_events, pool_index);
-
-  /* *INDENT-OFF* */
-  if (memcmp (&event->new_mac, new_mac, sizeof (event->new_mac)))
-    {
-      clib_memcpy (event->new_mac, new_mac, sizeof (event->new_mac));
-    }
-  else
-    {                          /* same mac */
-      if (sw_if_index == event->sw_if_index &&
-         (!event->mac_ip ||
-          /* for BD case, also check IP address with 10 sec timeout */
-          (ip6_address_is_equal (address,
-                                 (ip6_address_t *) event->address) &&
-           (now - nd_event_last_time) < 10.0)))
-       return 1;
-    }
-  /* *INDENT-ON* */
-
-  nd_event_last_time = now;
-  event->sw_if_index = sw_if_index;
-  if (event->mac_ip)
-    clib_memcpy (event->address, address, sizeof (event->address));
-  return 0;
-}
-
-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;
-
-  pool_put_index (am->arp_events, pool_index);
-  return 0;
-}
-
-static int
-nd_change_delete_callback (u32 pool_index, u8 * notused)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-
-  if (pool_is_free_index (am->nd_events, pool_index))
-    return 1;
-
-  pool_put_index (am->nd_events, pool_index);
-  return 0;
-}
-
-static void
-vl_api_want_ip4_arp_events_t_handler (vl_api_want_ip4_arp_events_t * mp)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  vnet_main_t *vnm = vnet_get_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->_vl_msg_id = ntohs (VL_API_IP4_ARP_EVENT);
-      event->client_index = mp->client_index;
-      event->context = mp->context;
-      event->address = mp->address;
-      event->pid = mp->pid;
-      if (mp->address == 0)
-       event->mac_ip = 1;
-
-      rv = vnet_add_del_ip4_arp_change_event
-       (vnm, arp_change_data_callback,
-        mp->pid, &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
-       (vnm, arp_change_delete_callback,
-        mp->pid, &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_want_ip6_nd_events_t_handler (vl_api_want_ip6_nd_events_t * mp)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  vl_api_want_ip6_nd_events_reply_t *rmp;
-  vl_api_ip6_nd_event_t *event;
-  int rv;
-
-  if (mp->enable_disable)
-    {
-      pool_get (am->nd_events, event);
-      memset (event, 0, sizeof (*event));
-
-      event->_vl_msg_id = ntohs (VL_API_IP6_ND_EVENT);
-      event->client_index = mp->client_index;
-      event->context = mp->context;
-      clib_memcpy (event->address, mp->address, 16);
-      event->pid = mp->pid;
-      if (ip6_address_is_zero ((ip6_address_t *) mp->address))
-       event->mac_ip = 1;
-
-      rv = vnet_add_del_ip6_nd_change_event
-       (vnm, nd_change_data_callback,
-        mp->pid, mp->address /* addr, in net byte order */ ,
-        vpe_resolver_process_node.index,
-        IP6_ND_EVENT, event - am->nd_events, 1 /* is_add */ );
-    }
-  else
-    {
-      rv = vnet_add_del_ip6_nd_change_event
-       (vnm, nd_change_delete_callback,
-        mp->pid, mp->address /* addr, in net byte order */ ,
-        vpe_resolver_process_node.index,
-        IP6_ND_EVENT, ~0 /* pool index */ , 0 /* is_add */ );
-    }
-  REPLY_MACRO (VL_API_WANT_IP6_ND_EVENTS_REPLY);
-}
-
-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 ();
-  vl_api_input_acl_set_interface_reply_t *rmp;
-  int rv;
-  u32 sw_if_index, ip4_table_index, ip6_table_index, l2_table_index;
-
-  ip4_table_index = ntohl (mp->ip4_table_index);
-  ip6_table_index = ntohl (mp->ip6_table_index);
-  l2_table_index = ntohl (mp->l2_table_index);
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = vnet_set_input_acl_intfc (vm, sw_if_index, ip4_table_index,
-                                ip6_table_index, l2_table_index, mp->is_add);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_INPUT_ACL_SET_INTERFACE_REPLY);
-}
-
-static void vl_api_ipsec_spd_add_del_t_handler
-  (vl_api_ipsec_spd_add_del_t * mp)
-{
-#if IPSEC == 0
-  clib_warning ("unimplemented");
-#else
-
-  vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
-  vl_api_ipsec_spd_add_del_reply_t *rmp;
-  int rv;
-
-#if DPDK > 0
-  rv = ipsec_add_del_spd (vm, ntohl (mp->spd_id), mp->is_add);
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif
-
-  REPLY_MACRO (VL_API_IPSEC_SPD_ADD_DEL_REPLY);
-#endif
-}
-
-static void vl_api_ipsec_interface_add_del_spd_t_handler
-  (vl_api_ipsec_interface_add_del_spd_t * mp)
-{
-  vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
-  vl_api_ipsec_interface_add_del_spd_reply_t *rmp;
-  int rv;
-  u32 sw_if_index __attribute__ ((unused));
-  u32 spd_id __attribute__ ((unused));
-
-  sw_if_index = ntohl (mp->sw_if_index);
-  spd_id = ntohl (mp->spd_id);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-#if IPSEC > 0
-  rv = ipsec_set_interface_spd (vm, sw_if_index, spd_id, mp->is_add);
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_IPSEC_INTERFACE_ADD_DEL_SPD_REPLY);
-}
-
-static void vl_api_ipsec_spd_add_del_entry_t_handler
-  (vl_api_ipsec_spd_add_del_entry_t * mp)
-{
-  vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
-  vl_api_ipsec_spd_add_del_entry_reply_t *rmp;
-  int rv;
-
-#if IPSEC > 0
-  ipsec_policy_t p;
-
-  memset (&p, 0, sizeof (p));
-
-  p.id = ntohl (mp->spd_id);
-  p.priority = ntohl (mp->priority);
-  p.is_outbound = mp->is_outbound;
-  p.is_ipv6 = mp->is_ipv6;
-
-  if (mp->is_ipv6 || mp->is_ip_any)
-    {
-      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);
-    }
-  else
-    {
-      clib_memcpy (&p.raddr.start.ip4.data, mp->remote_address_start, 4);
-      clib_memcpy (&p.raddr.stop.ip4.data, mp->remote_address_stop, 4);
-      clib_memcpy (&p.laddr.start.ip4.data, mp->local_address_start, 4);
-      clib_memcpy (&p.laddr.stop.ip4.data, mp->local_address_stop, 4);
-    }
-  p.protocol = mp->protocol;
-  p.rport.start = ntohs (mp->remote_port_start);
-  p.rport.stop = ntohs (mp->remote_port_stop);
-  p.lport.start = ntohs (mp->local_port_start);
-  p.lport.stop = ntohs (mp->local_port_stop);
-  /* policy action resolve unsupported */
-  if (mp->policy == IPSEC_POLICY_ACTION_RESOLVE)
-    {
-      clib_warning ("unsupported action: 'resolve'");
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto out;
-    }
-  p.policy = mp->policy;
-  p.sa_id = ntohl (mp->sa_id);
-
-  rv = ipsec_add_del_policy (vm, &p, mp->is_add);
-  if (rv)
-    goto out;
-
-  if (mp->is_ip_any)
-    {
-      p.is_ipv6 = 1;
-      rv = ipsec_add_del_policy (vm, &p, mp->is_add);
-    }
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-  goto out;
-#endif
-
-out:
-  REPLY_MACRO (VL_API_IPSEC_SPD_ADD_DEL_ENTRY_REPLY);
-}
-
-static void vl_api_ipsec_sad_add_del_entry_t_handler
-  (vl_api_ipsec_sad_add_del_entry_t * mp)
-{
-  vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
-  vl_api_ipsec_sad_add_del_entry_reply_t *rmp;
-  int rv;
-#if IPSEC > 0
-  ipsec_sa_t sa;
-
-  memset (&sa, 0, sizeof (sa));
-
-  sa.id = ntohl (mp->sad_id);
-  sa.spi = ntohl (mp->spi);
-  /* security protocol AH unsupported */
-  if (mp->protocol == IPSEC_PROTOCOL_AH)
-    {
-      clib_warning ("unsupported security protocol 'AH'");
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto out;
-    }
-  sa.protocol = mp->protocol;
-  /* check for unsupported crypto-alg */
-  if (mp->crypto_algorithm < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
-      mp->crypto_algorithm >= IPSEC_CRYPTO_N_ALG)
-    {
-      clib_warning ("unsupported crypto-alg: '%U'", format_ipsec_crypto_alg,
-                   mp->crypto_algorithm);
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto out;
-    }
-  sa.crypto_alg = mp->crypto_algorithm;
-  sa.crypto_key_len = mp->crypto_key_length;
-  clib_memcpy (&sa.crypto_key, mp->crypto_key, sizeof (sa.crypto_key));
-  /* check for unsupported integ-alg */
-#if DPDK_CRYPTO==1
-  if (mp->integrity_algorithm < IPSEC_INTEG_ALG_NONE ||
-#else
-  if (mp->integrity_algorithm < IPSEC_INTEG_ALG_SHA1_96 ||
-#endif
-      mp->integrity_algorithm >= IPSEC_INTEG_N_ALG)
-    {
-      clib_warning ("unsupported integ-alg: '%U'", format_ipsec_integ_alg,
-                   mp->integrity_algorithm);
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto out;
-    }
-
-#if DPDK_CRYPTO==1
-  /*Special cases, aes-gcm-128 encryption */
-  if (mp->crypto_algorithm == IPSEC_CRYPTO_ALG_AES_GCM_128)
-    {
-      if (mp->integrity_algorithm != IPSEC_INTEG_ALG_NONE
-         && mp->integrity_algorithm != IPSEC_INTEG_ALG_AES_GCM_128)
-       {
-         clib_warning
-           ("unsupported: aes-gcm-128 crypto-alg needs none as integ-alg");
-         rv = VNET_API_ERROR_UNIMPLEMENTED;
-         goto out;
-       }
-      else                     /*set integ-alg internally to aes-gcm-128 */
-       mp->integrity_algorithm = IPSEC_INTEG_ALG_AES_GCM_128;
-    }
-  else if (mp->integrity_algorithm == IPSEC_INTEG_ALG_AES_GCM_128)
-    {
-      clib_warning ("unsupported integ-alg: aes-gcm-128");
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto out;
-    }
-  else if (mp->integrity_algorithm == IPSEC_INTEG_ALG_NONE)
-    {
-      clib_warning ("unsupported integ-alg: none");
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto out;
-    }
-#endif
-
-  sa.integ_alg = mp->integrity_algorithm;
-  sa.integ_key_len = mp->integrity_key_length;
-  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;
-  if (sa.is_tunnel_ip6)
-    {
-      clib_memcpy (&sa.tunnel_src_addr, mp->tunnel_src_address, 16);
-      clib_memcpy (&sa.tunnel_dst_addr, mp->tunnel_dst_address, 16);
-    }
-  else
-    {
-      clib_memcpy (&sa.tunnel_src_addr.ip4.data, mp->tunnel_src_address, 4);
-      clib_memcpy (&sa.tunnel_dst_addr.ip4.data, mp->tunnel_dst_address, 4);
-    }
-
-  rv = ipsec_add_del_sa (vm, &sa, mp->is_add);
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-  goto out;
-#endif
-
-out:
-  REPLY_MACRO (VL_API_IPSEC_SAD_ADD_DEL_ENTRY_REPLY);
-}
-
-static void
-vl_api_ikev2_profile_add_del_t_handler (vl_api_ikev2_profile_add_del_t * mp)
-{
-  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);
-  vec_free (tmp);
-  if (error)
-    rv = VNET_API_ERROR_UNSPECIFIED;
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif
-
-  REPLY_MACRO (VL_API_IKEV2_PROFILE_ADD_DEL_REPLY);
-}
-
-static void
-  vl_api_ikev2_profile_set_auth_t_handler
-  (vl_api_ikev2_profile_set_auth_t * mp)
-{
-  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);
-  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);
-  if (error)
-    rv = VNET_API_ERROR_UNSPECIFIED;
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif
-
-  REPLY_MACRO (VL_API_IKEV2_PROFILE_SET_AUTH_REPLY);
-}
-
-static void
-vl_api_ikev2_profile_set_id_t_handler (vl_api_ikev2_profile_set_id_t * mp)
-{
-  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);
-  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);
-  if (error)
-    rv = VNET_API_ERROR_UNSPECIFIED;
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif
-
-  REPLY_MACRO (VL_API_IKEV2_PROFILE_SET_ID_REPLY);
-}
-
-static void
-vl_api_ikev2_profile_set_ts_t_handler (vl_api_ikev2_profile_set_ts_t * mp)
-{
-  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,
-                               mp->end_port, (ip4_address_t) mp->start_addr,
-                               (ip4_address_t) mp->end_addr, mp->is_local);
-  vec_free (tmp);
-  if (error)
-    rv = VNET_API_ERROR_UNSPECIFIED;
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif
-
-  REPLY_MACRO (VL_API_IKEV2_PROFILE_SET_TS_REPLY);
-}
-
-static void
-vl_api_ikev2_set_local_key_t_handler (vl_api_ikev2_set_local_key_t * mp)
-{
-  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);
-  if (error)
-    rv = VNET_API_ERROR_UNSPECIFIED;
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif
-
-  REPLY_MACRO (VL_API_IKEV2_SET_LOCAL_KEY_REPLY);
-}
-
-static void
-vl_api_map_add_domain_t_handler (vl_api_map_add_domain_t * mp)
-{
-  vl_api_map_add_domain_reply_t *rmp;
-  int rv = 0;
-  u32 index;
-  u8 flags = mp->is_translation ? MAP_DOMAIN_TRANSLATION : 0;
-  rv =
-    map_create_domain ((ip4_address_t *) & mp->ip4_prefix, mp->ip4_prefix_len,
-                      (ip6_address_t *) & mp->ip6_prefix, mp->ip6_prefix_len,
-                      (ip6_address_t *) & mp->ip6_src,
-                      mp->ip6_src_prefix_len, mp->ea_bits_len,
-                      mp->psid_offset, mp->psid_length, &index,
-                      ntohs (mp->mtu), flags);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_MAP_ADD_DOMAIN_REPLY,
-  ({
-    rmp->index = ntohl(index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_map_del_domain_t_handler (vl_api_map_del_domain_t * mp)
-{
-  vl_api_map_del_domain_reply_t *rmp;
-  int rv = 0;
-
-  rv = map_delete_domain (ntohl (mp->index));
-
-  REPLY_MACRO (VL_API_MAP_DEL_DOMAIN_REPLY);
-}
-
-static void
-vl_api_map_add_del_rule_t_handler (vl_api_map_add_del_rule_t * mp)
-{
-  vl_api_map_del_domain_reply_t *rmp;
-  int rv = 0;
-
-  rv =
-    map_add_del_psid (ntohl (mp->index), ntohs (mp->psid),
-                     (ip6_address_t *) mp->ip6_dst, mp->is_add);
-
-  REPLY_MACRO (VL_API_MAP_ADD_DEL_RULE_REPLY);
-}
-
-static void
-vl_api_map_domain_dump_t_handler (vl_api_map_domain_dump_t * mp)
-{
-  vl_api_map_domain_details_t *rmp;
-  map_main_t *mm = &map_main;
-  map_domain_t *d;
-  unix_shared_memory_queue_t *q;
-
-  if (pool_elts (mm->domains) == 0)
-    return;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  /* *INDENT-OFF* */
-  pool_foreach(d, mm->domains,
-  ({
-    /* Make sure every field is initiated (or don't skip the memset()) */
-    rmp = vl_msg_api_alloc (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;
-    clib_memcpy(rmp->ip4_prefix, &d->ip4_prefix, sizeof(rmp->ip4_prefix));
-    rmp->ip4_prefix_len = d->ip4_prefix_len;
-    clib_memcpy(rmp->ip6_prefix, &d->ip6_prefix, sizeof(rmp->ip6_prefix));
-    rmp->ip6_prefix_len = d->ip6_prefix_len;
-    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);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_map_rule_dump_t_handler (vl_api_map_rule_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  u16 i;
-  ip6_address_t dst;
-  vl_api_map_rule_details_t *rmp;
-  map_main_t *mm = &map_main;
-  u32 domain_index = ntohl (mp->domain_index);
-  map_domain_t *d;
-
-  if (pool_elts (mm->domains) == 0)
-    return;
-
-  d = pool_elt_at_index (mm->domains, domain_index);
-  if (!d || !d->rules)
-    {
-      return;
-    }
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  for (i = 0; i < (0x1 << d->psid_length); i++)
-    {
-      dst = d->rules[i];
-      if (dst.as_u64[0] == 0 && dst.as_u64[1] == 0)
-       {
-         continue;
-       }
-      rmp = vl_msg_api_alloc (sizeof (*rmp));
-      memset (rmp, 0, sizeof (*rmp));
-      rmp->_vl_msg_id = ntohs (VL_API_MAP_RULE_DETAILS);
-      rmp->psid = htons (i);
-      clib_memcpy (rmp->ip6_dst, &dst, sizeof (rmp->ip6_dst));
-      rmp->context = mp->context;
-      vl_msg_api_send_shmem (q, (u8 *) & rmp);
-    }
-}
-
-static void
-vl_api_map_summary_stats_t_handler (vl_api_map_summary_stats_t * mp)
-{
-  vl_api_map_summary_stats_reply_t *rmp;
-  vlib_combined_counter_main_t *cm;
-  vlib_counter_t v;
-  int i, which;
-  u64 total_pkts[VLIB_N_RX_TX];
-  u64 total_bytes[VLIB_N_RX_TX];
-  map_main_t *mm = &map_main;
-  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_MAP_SUMMARY_STATS_REPLY);
-  rmp->context = mp->context;
-  rmp->retval = 0;
-
-  memset (total_pkts, 0, sizeof (total_pkts));
-  memset (total_bytes, 0, sizeof (total_bytes));
-
-  map_domain_counter_lock (mm);
-  vec_foreach (cm, mm->domain_counters)
-  {
-    which = cm - mm->domain_counters;
-
-    for (i = 0; i < vec_len (cm->maxi); i++)
-      {
-       vlib_get_combined_counter (cm, i, &v);
-       total_pkts[which] += v.packets;
-       total_bytes[which] += v.bytes;
-      }
-  }
-
-  map_domain_counter_unlock (mm);
-
-  /* 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] =
-    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);
-}
-
-static void
-vl_api_ipsec_sa_set_key_t_handler (vl_api_ipsec_sa_set_key_t * mp)
-{
-  vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
-  vl_api_ipsec_sa_set_key_reply_t *rmp;
-  int rv;
-#if IPSEC > 0
-  ipsec_sa_t sa;
-  sa.id = ntohl (mp->sa_id);
-  sa.crypto_key_len = mp->crypto_key_length;
-  clib_memcpy (&sa.crypto_key, mp->crypto_key, sizeof (sa.crypto_key));
-  sa.integ_key_len = mp->integrity_key_length;
-  clib_memcpy (&sa.integ_key, mp->integrity_key, sizeof (sa.integ_key));
-
-  rv = ipsec_set_sa_key (vm, &sa);
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif
-
-  REPLY_MACRO (VL_API_IPSEC_SA_SET_KEY_REPLY);
-}
-
-static void vl_api_cop_interface_enable_disable_t_handler
-  (vl_api_cop_interface_enable_disable_t * mp)
-{
-  vl_api_cop_interface_enable_disable_reply_t *rmp;
-  int rv;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  int enable_disable;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  enable_disable = (int) mp->enable_disable;
-
-  rv = cop_interface_enable_disable (sw_if_index, enable_disable);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_COP_INTERFACE_ENABLE_DISABLE_REPLY);
-}
-
-static void vl_api_cop_whitelist_enable_disable_t_handler
-  (vl_api_cop_whitelist_enable_disable_t * mp)
-{
-  vl_api_cop_whitelist_enable_disable_reply_t *rmp;
-  cop_whitelist_enable_disable_args_t _a, *a = &_a;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  int rv;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  a->sw_if_index = sw_if_index;
-  a->ip4 = mp->ip4;
-  a->ip6 = mp->ip6;
-  a->default_cop = mp->default_cop;
-  a->fib_id = ntohl (mp->fib_id);
-
-  rv = cop_whitelist_enable_disable (a);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_COP_WHITELIST_ENABLE_DISABLE_REPLY);
-}
-
-static void
-vl_api_get_node_graph_t_handler (vl_api_get_node_graph_t * mp)
-{
-  int rv = 0;
-  u8 *vector = 0;
-  api_main_t *am = &api_main;
-  vlib_main_t *vm = vlib_get_main ();
-  void *oldheap;
-  vl_api_get_node_graph_reply_t *rmp;
-
-  pthread_mutex_lock (&am->vlib_rp->mutex);
-  oldheap = svm_push_data_heap (am->vlib_rp);
-
-  /*
-   * Keep the number of memcpy ops to a minimum (e.g. 1).
-   */
-  vec_validate (vector, 16384);
-  vec_reset_length (vector);
-
-  /* $$$$ FIXME */
-  vector = vlib_node_serialize (&vm->node_main, vector,
-                               (u32) ~ 0 /* all threads */ ,
-                               1 /* include nexts */ ,
-                               1 /* include stats */ );
-
-  svm_pop_heap (oldheap);
-  pthread_mutex_unlock (&am->vlib_rp->mutex);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_GET_NODE_GRAPH_REPLY,
-  ({
-    rmp->reply_in_shmem = (uword) vector;
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_ioam_enable_t_handler (vl_api_ioam_enable_t * mp)
-{
-  int rv = 0;
-  vl_api_ioam_enable_reply_t *rmp;
-  clib_error_t *error;
-
-  /* Ignoring the profile id as currently a single profile
-   * is supported */
-  error = ip6_ioam_enable (mp->trace_enable, mp->pot_enable,
-                          mp->seqno, mp->analyse);
-  if (error)
-    {
-      clib_error_report (error);
-      rv = clib_error_get_code (error);
-    }
-
-  REPLY_MACRO (VL_API_IOAM_ENABLE_REPLY);
-}
-
-static void
-vl_api_ioam_disable_t_handler (vl_api_ioam_disable_t * mp)
-{
-  int rv = 0;
-  vl_api_ioam_disable_reply_t *rmp;
-  clib_error_t *error;
-
-  error = clear_ioam_rewrite_fn ();
-  if (error)
-    {
-      clib_error_report (error);
-      rv = clib_error_get_code (error);
-    }
-
-  REPLY_MACRO (VL_API_IOAM_DISABLE_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);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_AF_PACKET_CREATE_REPLY,
-  ({
-    rmp->sw_if_index = clib_host_to_net_u32(sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-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;
-  u32 policer_index;
-
-  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;
-  cfg.conform_action.action_type = mp->conform_action_type;
-  cfg.conform_action.dscp = mp->conform_dscp;
-  cfg.exceed_action.action_type = mp->exceed_action_type;
-  cfg.exceed_action.dscp = mp->exceed_dscp;
-  cfg.violate_action.action_type = mp->violate_action_type;
-  cfg.violate_action.dscp = mp->violate_dscp;
-  cfg.color_aware = mp->color_aware;
-
-  error = policer_add_del (vm, name, &cfg, &policer_index, mp->is_add);
-
-  if (error)
-    rv = VNET_API_ERROR_UNSPECIFIED;
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_POLICER_ADD_DEL_REPLY,
-  ({
-    if (rv == 0 &&  mp->is_add)
-      rmp->policer_index = ntohl(policer_index);
-    else
-      rmp->policer_index = ~0;
-  }));
-  /* *INDENT-ON* */
-}
-
-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->conform_action_type = config->conform_action.action_type;
-  mp->conform_dscp = config->conform_action.dscp;
-  mp->exceed_action_type = config->exceed_action.action_type;
-  mp->exceed_dscp = config->exceed_action.dscp;
-  mp->violate_action_type = config->violate_action.action_type;
-  mp->violate_dscp = config->violate_action.dscp;
-  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
-    {
-      /* *INDENT-OFF* */
-      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);
-      }));
-      /* *INDENT-ON* */
-    }
-}
-
-static void
-  vl_api_policer_classify_set_interface_t_handler
-  (vl_api_policer_classify_set_interface_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_policer_classify_set_interface_reply_t *rmp;
-  int rv;
-  u32 sw_if_index, ip4_table_index, ip6_table_index, l2_table_index;
-
-  ip4_table_index = ntohl (mp->ip4_table_index);
-  ip6_table_index = ntohl (mp->ip6_table_index);
-  l2_table_index = ntohl (mp->l2_table_index);
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = vnet_set_policer_classify_intfc (vm, sw_if_index, ip4_table_index,
-                                       ip6_table_index, l2_table_index,
-                                       mp->is_add);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_POLICER_CLASSIFY_SET_INTERFACE_REPLY);
-}
-
-static void
-send_policer_classify_details (u32 sw_if_index,
-                              u32 table_index,
-                              unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_policer_classify_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_POLICER_CLASSIFY_DETAILS);
-  mp->context = context;
-  mp->sw_if_index = htonl (sw_if_index);
-  mp->table_index = htonl (table_index);
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_policer_classify_dump_t_handler (vl_api_policer_classify_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  policer_classify_main_t *pcm = &policer_classify_main;
-  u32 *vec_tbl;
-  int i;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  vec_tbl = pcm->classify_table_index_by_sw_if_index[mp->type];
-
-  if (vec_len (vec_tbl))
-    {
-      for (i = 0; i < vec_len (vec_tbl); i++)
-       {
-         if (vec_elt (vec_tbl, i) == ~0)
-           continue;
-
-         send_policer_classify_details (i, vec_elt (vec_tbl, i), 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);
-}
-
-static void
-vl_api_mpls_eth_tunnel_details_t_handler (vl_api_mpls_eth_tunnel_details_t *
-                                         mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-send_mpls_eth_tunnel_entry (vpe_api_main_t * am,
-                           unix_shared_memory_queue_t * q,
-                           mpls_eth_tunnel_t * et, u32 index, u32 context)
-{
-  mpls_main_t *mm = &mpls_main;
-  mpls_encap_t *e;
-  int i;
-  u32 nlabels;
-  vl_api_mpls_eth_tunnel_details_t *mp;
-
-  e = pool_elt_at_index (mm->encaps, et->encap_index);
-  nlabels = vec_len (e->labels);
-
-  mp = vl_msg_api_alloc (sizeof (*mp) + nlabels * sizeof (u32));
+  mp = vl_msg_api_alloc (sizeof (*mp));
   memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_MPLS_ETH_TUNNEL_DETAILS);
+  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->conform_action_type = config->conform_action.action_type;
+  mp->conform_dscp = config->conform_action.dscp;
+  mp->exceed_action_type = config->exceed_action.action_type;
+  mp->exceed_dscp = config->exceed_action.dscp;
+  mp->violate_action_type = config->violate_action.action_type;
+  mp->violate_dscp = config->violate_action.dscp;
+  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);
 
-  mp->tunnel_index = htonl (index);
-  memcpy (mp->tunnel_dst_mac, et->tunnel_dst, 6);
-  mp->intfc_address = et->intfc_address.as_u32;
-  mp->tx_sw_if_index = htonl (et->tx_sw_if_index);
-  mp->inner_fib_index = htonl (et->inner_fib_index);
-  mp->mask_width = htonl (et->mask_width);
-  mp->encap_index = htonl (et->encap_index);
-  mp->hw_if_index = htonl (et->hw_if_index);
-  mp->l2_only = htonl (et->l2_only);
-  mp->nlabels = htonl (nlabels);
-
-  for (i = 0; i < nlabels; i++)
-    {
-      mp->labels[i] =
-       htonl (vnet_mpls_uc_get_label
-              (clib_host_to_net_u32 (e->labels[i].label_exp_s_ttl)));
-    }
+  strncpy ((char *) mp->name, (char *) name, ARRAY_LEN (mp->name) - 1);
 
   vl_msg_api_send_shmem (q, (u8 *) & mp);
 }
 
 static void
-vl_api_mpls_eth_tunnel_dump_t_handler (vl_api_mpls_eth_tunnel_dump_t * mp)
+vl_api_policer_dump_t_handler (vl_api_policer_dump_t * mp)
 {
-  vpe_api_main_t *am = &vpe_api_main;
   unix_shared_memory_queue_t *q;
-  mpls_main_t *mm = &mpls_main;
-  mpls_eth_tunnel_t *et;
-  u32 index = ntohl (mp->tunnel_index);
+  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 (index != ~0)
+  if (mp->match_name_valid)
+    {
+      match_name = format (0, "%s%c", mp->match_name, 0);
+    }
+
+  if (mp->match_name_valid)
     {
-      if (!pool_is_free_index (mm->eth_tunnels, index))
+      p = hash_get_mem (pm->policer_config_by_name, match_name);
+      if (p)
        {
-         et = pool_elt_at_index (mm->eth_tunnels, index);
-         send_mpls_eth_tunnel_entry (am, q, et, et - mm->eth_tunnels,
-                                     mp->context);
+         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
     {
       /* *INDENT-OFF* */
-      pool_foreach (et, mm->eth_tunnels,
+      hash_foreach_pair (hp, pm->policer_config_by_name,
       ({
-        send_mpls_eth_tunnel_entry (am, q, et, et - mm->eth_tunnels,
-                                    mp->context);
+        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);
       }));
       /* *INDENT-ON* */
     }
 }
 
 static void
-vl_api_mpls_fib_details_t_handler (vl_api_mpls_fib_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-vl_api_mpls_fib_details_t_endian (vl_api_mpls_fib_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-vl_api_mpls_fib_details_t_print (vl_api_mpls_fib_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-
-static void
-copy_fib_next_hop (fib_route_path_encode_t * api_rpath,
-                  vl_api_fib_path_t * fp)
-{
-  int is_ip4;
-
-  if (api_rpath->rpath.frp_proto == FIB_PROTOCOL_IP4)
-    fp->afi = IP46_TYPE_IP4;
-  else if (api_rpath->rpath.frp_proto == FIB_PROTOCOL_IP6)
-    fp->afi = IP46_TYPE_IP6;
-  else
-    {
-      is_ip4 = ip46_address_is_ip4 (&api_rpath->rpath.frp_addr);
-      if (is_ip4)
-       fp->afi = IP46_TYPE_IP4;
-      else
-       fp->afi = IP46_TYPE_IP6;
-    }
-  if (fp->afi == IP46_TYPE_IP4)
-    memcpy (fp->next_hop, &api_rpath->rpath.frp_addr.ip4,
-           sizeof (api_rpath->rpath.frp_addr.ip4));
-  else
-    memcpy (fp->next_hop, &api_rpath->rpath.frp_addr.ip6,
-           sizeof (api_rpath->rpath.frp_addr.ip6));
-}
-
-static void
-send_mpls_fib_details (vpe_api_main_t * am,
-                      unix_shared_memory_queue_t * q,
-                      u32 table_id, u32 label, u32 eos,
-                      fib_route_path_encode_t * api_rpaths, u32 context)
-{
-  vl_api_mpls_fib_details_t *mp;
-  fib_route_path_encode_t *api_rpath;
-  vl_api_fib_path_t *fp;
-  int path_count;
-
-  path_count = vec_len (api_rpaths);
-  mp = vl_msg_api_alloc (sizeof (*mp) + path_count * sizeof (*fp));
-  if (!mp)
-    return;
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_MPLS_FIB_DETAILS);
-  mp->context = context;
-
-  mp->table_id = htonl (table_id);
-  mp->eos_bit = eos;
-  mp->label = htonl (label);
-
-  mp->count = htonl (path_count);
-  fp = mp->path;
-  vec_foreach (api_rpath, api_rpaths)
-  {
-    memset (fp, 0, sizeof (*fp));
-    fp->weight = htonl (api_rpath->rpath.frp_weight);
-    fp->sw_if_index = htonl (api_rpath->rpath.frp_sw_if_index);
-    copy_fib_next_hop (api_rpath, fp);
-    fp++;
-  }
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_mpls_fib_dump_t_handler (vl_api_mpls_fib_dump_t * mp)
+  vl_api_policer_classify_set_interface_t_handler
+  (vl_api_policer_classify_set_interface_t * mp)
 {
-  vpe_api_main_t *am = &vpe_api_main;
-  unix_shared_memory_queue_t *q;
-  mpls_main_t *mm = &mpls_main;
-  fib_table_t *fib_table;
-  fib_node_index_t lfei, *lfeip, *lfeis = NULL;
-  mpls_label_t key;
-  fib_prefix_t pfx;
-  u32 fib_index;
-  fib_route_path_encode_t *api_rpaths;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  /* *INDENT-OFF* */
-  pool_foreach (fib_table, mm->fibs,
-  ({
-    hash_foreach(key, lfei, fib_table->mpls.mf_entries,
-    ({
-       vec_add1(lfeis, lfei);
-    }));
-  }));
-  vec_sort_with_function(lfeis, fib_entry_cmp_for_sort);
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_policer_classify_set_interface_reply_t *rmp;
+  int rv;
+  u32 sw_if_index, ip4_table_index, ip6_table_index, l2_table_index;
 
-  vec_foreach(lfeip, lfeis)
-  {
-    fib_entry_get_prefix(*lfeip, &pfx);
-    fib_index = fib_entry_get_fib_index(*lfeip);
-    fib_table = fib_table_get(fib_index, pfx.fp_proto);
-    api_rpaths = NULL;
-    fib_entry_encode(*lfeip, &api_rpaths);
-    send_mpls_fib_details (am, q,
-                          fib_table->ft_table_id,
-                          pfx.fp_label,
-                          pfx.fp_eos,
-                           api_rpaths,
-                          mp->context);
-    vec_free(api_rpaths);
-  }
+  ip4_table_index = ntohl (mp->ip4_table_index);
+  ip6_table_index = ntohl (mp->ip6_table_index);
+  l2_table_index = ntohl (mp->l2_table_index);
+  sw_if_index = ntohl (mp->sw_if_index);
 
-  vec_free (lfeis);
-}
+  VALIDATE_SW_IF_INDEX (mp);
 
-static void
-vl_api_ip_fib_details_t_handler (vl_api_ip_fib_details_t * mp)
-{
-  clib_warning ("BUG");
-}
+  rv = vnet_set_policer_classify_intfc (vm, sw_if_index, ip4_table_index,
+                                       ip6_table_index, l2_table_index,
+                                       mp->is_add);
 
-static void
-vl_api_ip_fib_details_t_endian (vl_api_ip_fib_details_t * mp)
-{
-  clib_warning ("BUG");
-}
+  BAD_SW_IF_INDEX_LABEL;
 
-static void
-vl_api_ip_fib_details_t_print (vl_api_ip_fib_details_t * mp)
-{
-  clib_warning ("BUG");
+  REPLY_MACRO (VL_API_POLICER_CLASSIFY_SET_INTERFACE_REPLY);
 }
 
 static void
-send_ip_fib_details (vpe_api_main_t * am,
-                     unix_shared_memory_queue_t * q,
-                     u32 table_id, fib_prefix_t *pfx,
-                     fib_route_path_encode_t *api_rpaths, u32 context)
+send_policer_classify_details (u32 sw_if_index,
+                              u32 table_index,
+                              unix_shared_memory_queue_t * q, u32 context)
 {
-  vl_api_ip_fib_details_t *mp;
-  fib_route_path_encode_t *api_rpath;
-  vl_api_fib_path_t *fp;
-  int path_count;
+  vl_api_policer_classify_details_t *mp;
 
-  path_count = vec_len(api_rpaths);
-  mp = vl_msg_api_alloc (sizeof (*mp) + path_count * sizeof (*fp));
-  if (!mp)
-    return;
+  mp = vl_msg_api_alloc (sizeof (*mp));
   memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IP_FIB_DETAILS);
+  mp->_vl_msg_id = ntohs (VL_API_POLICER_CLASSIFY_DETAILS);
   mp->context = context;
-
-  mp->table_id = htonl (table_id);
-  mp->address_length = pfx->fp_len;
-  memcpy(mp->address, &pfx->fp_addr.ip4, sizeof(pfx->fp_addr.ip4));
-
-  mp->count = htonl (path_count);
-  fp = mp->path;
-  vec_foreach(api_rpath, api_rpaths)
-  {
-    memset (fp, 0, sizeof (*fp));
-    switch (api_rpath->dpo.dpoi_type)
-      {
-      case DPO_RECEIVE:
-       fp->is_local = true;
-       break;
-      case DPO_DROP:
-       fp->is_drop = true;
-       break;
-      case DPO_IP_NULL:
-       switch (api_rpath->dpo.dpoi_index)
-         {
-         case IP_NULL_ACTION_NONE:
-           fp->is_drop = true;
-           break;
-         case IP_NULL_ACTION_SEND_ICMP_UNREACH:
-           fp->is_unreach = true;
-           break;
-         case IP_NULL_ACTION_SEND_ICMP_PROHIBIT:
-           fp->is_prohibit = true;
-           break;
-         default:
-           break;
-         }
-       break;
-      default:
-       break;
-      }
-    fp->weight = htonl(api_rpath->rpath.frp_weight);
-    fp->sw_if_index = htonl(api_rpath->rpath.frp_sw_if_index);
-    copy_fib_next_hop (api_rpath, fp);
-    fp++;
-  }
+  mp->sw_if_index = htonl (sw_if_index);
+  mp->table_index = htonl (table_index);
 
   vl_msg_api_send_shmem (q, (u8 *) & mp);
 }
 
 static void
-vl_api_ip_fib_dump_t_handler (vl_api_ip_fib_dump_t * mp)
+vl_api_policer_classify_dump_t_handler (vl_api_policer_classify_dump_t * mp)
 {
-  vpe_api_main_t *am = &vpe_api_main;
   unix_shared_memory_queue_t *q;
-  ip4_main_t *im = &ip4_main;
-  fib_table_t *fib_table;
-  fib_node_index_t lfei, *lfeip, *lfeis = NULL;
-  mpls_label_t key;
-  fib_prefix_t pfx;
-  u32 fib_index;
-  fib_route_path_encode_t *api_rpaths;
+  policer_classify_main_t *pcm = &policer_classify_main;
+  u32 *vec_tbl;
   int i;
 
   q = vl_api_client_index_to_input_queue (mp->client_index);
   if (q == 0)
     return;
 
-  /* *INDENT-OFF* */
-  pool_foreach (fib_table, im->fibs,
-  ({
-    for (i = 0; i < ARRAY_LEN (fib_table->v4.fib_entry_by_dst_address); i++)
-      {
-        hash_foreach(key, lfei, fib_table->v4.fib_entry_by_dst_address[i],
-        ({
-          vec_add1(lfeis, lfei);
-        }));
-      }
-  }));
-
-  vec_sort_with_function(lfeis, fib_entry_cmp_for_sort);
+  vec_tbl = pcm->classify_table_index_by_sw_if_index[mp->type];
 
-  vec_foreach(lfeip, lfeis)
-  {
-    fib_entry_get_prefix(*lfeip, &pfx);
-    fib_index = fib_entry_get_fib_index(*lfeip);
-    fib_table = fib_table_get(fib_index, pfx.fp_proto);
-    api_rpaths = NULL;
-    fib_entry_encode(*lfeip, &api_rpaths);
-    send_ip_fib_details (am, q,
-                         fib_table->ft_table_id,
-                         &pfx,
-                         api_rpaths,
-                         mp->context);
-    vec_free(api_rpaths);
-  }
+  if (vec_len (vec_tbl))
+    {
+      for (i = 0; i < vec_len (vec_tbl); i++)
+       {
+         if (vec_elt (vec_tbl, i) == ~0)
+           continue;
 
-  vec_free (lfeis);
+         send_policer_classify_details (i, vec_elt (vec_tbl, i), q,
+                                        mp->context);
+       }
+    }
 }
 
 static void
-vl_api_ip6_fib_details_t_handler (vl_api_ip6_fib_details_t * mp)
+vl_api_mpls_tunnel_details_t_handler (vl_api_mpls_fib_details_t * mp)
 {
   clib_warning ("BUG");
 }
 
-static void
-vl_api_ip6_fib_details_t_endian (vl_api_ip6_fib_details_t * mp)
+typedef struct mpls_tunnel_send_walk_ctx_t_
 {
-  clib_warning ("BUG");
-}
+  unix_shared_memory_queue_t *q;
+  u32 index;
+  u32 context;
+} mpls_tunnel_send_walk_ctx_t;
 
 static void
-vl_api_ip6_fib_details_t_print (vl_api_ip6_fib_details_t * mp)
+send_mpls_tunnel_entry (u32 mti, void *arg)
 {
-  clib_warning ("BUG");
-}
+  mpls_tunnel_send_walk_ctx_t *ctx;
+  vl_api_mpls_tunnel_details_t *mp;
+  const mpls_tunnel_t *mt;
+  u32 nlabels;
 
-static void
-send_ip6_fib_details (vpe_api_main_t * am,
-                      unix_shared_memory_queue_t * q,
-                      u32 table_id, fib_prefix_t *pfx,
-                      fib_route_path_encode_t *api_rpaths, u32 context)
-{
-  vl_api_ip6_fib_details_t *mp;
-  fib_route_path_encode_t *api_rpath;
-  vl_api_fib_path_t *fp;
-  int path_count;
+  ctx = arg;
 
-  path_count = vec_len(api_rpaths);
-  mp = vl_msg_api_alloc (sizeof (*mp) + path_count * sizeof (*fp));
-  if (!mp)
+  if (~0 != ctx->index && mti != ctx->index)
     return;
+
+  mt = mpls_tunnel_get (mti);
+  nlabels = vec_len (mt->mt_label_stack);
+
+  mp = vl_msg_api_alloc (sizeof (*mp) + nlabels * sizeof (u32));
   memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IP6_FIB_DETAILS);
-  mp->context = context;
+  mp->_vl_msg_id = ntohs (VL_API_MPLS_TUNNEL_DETAILS);
+  mp->context = ctx->context;
 
-  mp->table_id = htonl (table_id);
-  mp->address_length = pfx->fp_len;
-  memcpy(mp->address, &pfx->fp_addr.ip6, sizeof(pfx->fp_addr.ip6));
+  mp->tunnel_index = ntohl (mti);
+  memcpy (mp->mt_next_hop_out_labels,
+         mt->mt_label_stack, nlabels * sizeof (u32));
 
-  mp->count = htonl (path_count);
-  fp = mp->path;
-  vec_foreach(api_rpath, api_rpaths)
-  {
-    memset (fp, 0, sizeof (*fp));
-    switch (api_rpath->dpo.dpoi_type)
-      {
-      case DPO_RECEIVE:
-       fp->is_local = true;
-       break;
-      case DPO_DROP:
-       fp->is_drop = true;
-       break;
-      case DPO_IP_NULL:
-       switch (api_rpath->dpo.dpoi_index)
-         {
-         case IP_NULL_DPO_ACTION_NUM+IP_NULL_ACTION_NONE:
-           fp->is_drop = true;
-           break;
-         case IP_NULL_DPO_ACTION_NUM+IP_NULL_ACTION_SEND_ICMP_UNREACH:
-           fp->is_unreach = true;
-           break;
-         case IP_NULL_DPO_ACTION_NUM+IP_NULL_ACTION_SEND_ICMP_PROHIBIT:
-           fp->is_prohibit = true;
-           break;
-         default:
-           break;
-         }
-       break;
-      default:
-       break;
-      }
-    fp->weight = htonl(api_rpath->rpath.frp_weight);
-    fp->sw_if_index = htonl(api_rpath->rpath.frp_sw_if_index);
-    copy_fib_next_hop (api_rpath, fp);
-    fp++;
-  }
+  // FIXME
 
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
+  vl_msg_api_send_shmem (ctx->q, (u8 *) & mp);
 }
 
-typedef struct apt_ip6_fib_show_ctx_t_ {
-    u32 fib_index;
-    fib_node_index_t *entries;
-} api_ip6_fib_show_ctx_t;
-
 static void
-api_ip6_fib_table_put_entries (clib_bihash_kv_24_8_t * kvp,
-                               void *arg)
+vl_api_mpls_tunnel_dump_t_handler (vl_api_mpls_tunnel_dump_t * mp)
 {
-  api_ip6_fib_show_ctx_t *ctx = arg;
+  unix_shared_memory_queue_t *q;
 
-  if ((kvp->key[2] >> 32) == ctx->fib_index)
-    {
-      vec_add1(ctx->entries, kvp->value);
-    }
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  mpls_tunnel_send_walk_ctx_t ctx = {
+    .q = q,
+    .index = ntohl (mp->tunnel_index),
+    .context = mp->context,
+  };
+  mpls_tunnel_walk (send_mpls_tunnel_entry, &ctx);
 }
 
 static void
-api_ip6_fib_table_get_all (unix_shared_memory_queue_t *q,
-                           vl_api_ip6_fib_dump_t *mp,
-                           fib_table_t *fib_table)
+vl_api_mpls_fib_details_t_handler (vl_api_mpls_fib_details_t * mp)
 {
-  vpe_api_main_t *am = &vpe_api_main;
-  ip6_main_t *im6 = &ip6_main;
-  ip6_fib_t *fib = &fib_table->v6;
-  fib_node_index_t *fib_entry_index;
-  api_ip6_fib_show_ctx_t ctx = {
-    .fib_index = fib->index,
-    .entries = NULL,
-  };
-  fib_route_path_encode_t *api_rpaths;
-  fib_prefix_t pfx;
-
-  BV(clib_bihash_foreach_key_value_pair)
-    ((BVT(clib_bihash) *) &im6->ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash,
-     api_ip6_fib_table_put_entries,
-     &ctx);
-
-  vec_sort_with_function(ctx.entries, fib_entry_cmp_for_sort);
-
-  vec_foreach(fib_entry_index, ctx.entries)
-    {
-      fib_entry_get_prefix(*fib_entry_index, &pfx);
-      api_rpaths = NULL;
-      fib_entry_encode(*fib_entry_index, &api_rpaths);
-      send_ip6_fib_details (am, q,
-                            fib_table->ft_table_id,
-                            &pfx,
-                            api_rpaths,
-                            mp->context);
-      vec_free(api_rpaths);
-    }
-
-  vec_free(ctx.entries);
+  clib_warning ("BUG");
 }
 
 static void
-vl_api_ip6_fib_dump_t_handler (vl_api_ip6_fib_dump_t * mp)
+vl_api_mpls_fib_details_t_endian (vl_api_mpls_fib_details_t * mp)
 {
-  unix_shared_memory_queue_t *q;
-  ip6_main_t *im6 = &ip6_main;
-  fib_table_t *fib_table;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  /* *INDENT-OFF* */
-  pool_foreach (fib_table, im6->fibs,
-  ({
-    api_ip6_fib_table_get_all(q, mp, fib_table);
-  }));
+  clib_warning ("BUG");
 }
 
 static void
-vl_api_mpls_fib_encap_details_t_handler (vl_api_mpls_fib_encap_details_t * mp)
+vl_api_mpls_fib_details_t_print (vl_api_mpls_fib_details_t * mp)
 {
   clib_warning ("BUG");
 }
 
 static void
-send_mpls_fib_encap_details (vpe_api_main_t * am,
-                            unix_shared_memory_queue_t * q,
-                            show_mpls_fib_t * s, u32 context)
+send_mpls_fib_details (vpe_api_main_t * am,
+                      unix_shared_memory_queue_t * q,
+                      u32 table_id, u32 label, u32 eos,
+                      fib_route_path_encode_t * api_rpaths, u32 context)
 {
-  vl_api_mpls_fib_encap_details_t *mp;
-  mpls_main_t *mm = &mpls_main;
-  mpls_encap_t *e;
-  int i;
-  u32 nlabels;
-
-  e = pool_elt_at_index (mm->encaps, s->entry_index);
-  nlabels = vec_len (e->labels);
+  vl_api_mpls_fib_details_t *mp;
+  fib_route_path_encode_t *api_rpath;
+  vl_api_fib_path2_t *fp;
+  int path_count;
 
-  mp = vl_msg_api_alloc (sizeof (*mp) + nlabels * sizeof (u32));
+  path_count = vec_len (api_rpaths);
+  mp = vl_msg_api_alloc (sizeof (*mp) + path_count * sizeof (*fp));
+  if (!mp)
+    return;
   memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_MPLS_FIB_ENCAP_DETAILS);
+  mp->_vl_msg_id = ntohs (VL_API_MPLS_FIB_DETAILS);
   mp->context = context;
 
-  mp->fib_index = htonl (s->fib_index);
-  mp->entry_index = htonl (s->entry_index);
-  mp->dest = s->dest;
-  mp->s_bit = htonl (s->s_bit);
-
-  mp->nlabels = htonl (nlabels);
+  mp->table_id = htonl (table_id);
+  mp->eos_bit = eos;
+  mp->label = htonl (label);
 
-  for (i = 0; i < nlabels; i++)
-    {
-      mp->labels[i] =
-       htonl (vnet_mpls_uc_get_label
-              (clib_host_to_net_u32 (e->labels[i].label_exp_s_ttl)));
-    }
+  mp->count = htonl (path_count);
+  fp = mp->path;
+  vec_foreach (api_rpath, api_rpaths)
+  {
+    memset (fp, 0, sizeof (*fp));
+    fp->weight = htonl (api_rpath->rpath.frp_weight);
+    fp->sw_if_index = htonl (api_rpath->rpath.frp_sw_if_index);
+    copy_fib_next_hop (api_rpath, fp);
+    fp++;
+  }
 
   vl_msg_api_send_shmem (q, (u8 *) & mp);
 }
 
 static void
-vl_api_mpls_fib_encap_dump_t_handler (vl_api_mpls_fib_encap_dump_t * mp)
+vl_api_mpls_fib_dump_t_handler (vl_api_mpls_fib_dump_t * mp)
 {
   vpe_api_main_t *am = &vpe_api_main;
   unix_shared_memory_queue_t *q;
-  vlib_main_t *vm = &vlib_global_main;
-  u64 key;
-  u32 value;
-  show_mpls_fib_t *records = 0;
-  show_mpls_fib_t *s;
   mpls_main_t *mm = &mpls_main;
-  ip4_fib_t *rx_fib;
+  fib_table_t *fib_table;
+  fib_node_index_t lfei, *lfeip, *lfeis = NULL;
+  mpls_label_t key;
+  fib_prefix_t pfx;
+  u32 fib_index;
+  fib_route_path_encode_t *api_rpaths;
 
   q = vl_api_client_index_to_input_queue (mp->client_index);
   if (q == 0)
     return;
 
   /* *INDENT-OFF* */
-  hash_foreach (key, value, mm->mpls_encap_by_fib_and_dest,
+  pool_foreach (fib_table, mm->fibs,
   ({
-    vec_add2 (records, s, 1);
-    s->fib_index = (u32)(key>>32);
-    s->dest = (u32)(key & 0xFFFFFFFF);
-    s->entry_index = (u32) value;
+    hash_foreach(key, lfei, fib_table->mpls.mf_entries,
+    ({
+       vec_add1(lfeis, lfei);
+    }));
   }));
-  /* *INDENT-ON* */
-
-  if (0 == vec_len (records))
-    {
-      vlib_cli_output (vm, "MPLS encap table empty");
-      goto out;
-    }
+  vec_sort_with_function(lfeis, fib_entry_cmp_for_sort);
 
-  /* sort output by dst address within fib */
-  vec_sort_with_function (records, mpls_dest_cmp);
-  vec_sort_with_function (records, mpls_fib_index_cmp);
-  vlib_cli_output (vm, "MPLS encap table");
-  vlib_cli_output (vm, "%=6s%=16s%=16s", "Table", "Dest address", "Labels");
-  vec_foreach (s, records)
+  vec_foreach(lfeip, lfeis)
   {
-    rx_fib = ip4_fib_get (s->fib_index);
-    vlib_cli_output (vm, "%=6d%=16U%=16U", rx_fib->table_id,
-                    format_ip4_address, &s->dest, format_mpls_encap_index,
-                    mm, s->entry_index);
-    send_mpls_fib_encap_details (am, q, s, mp->context);
+    fib_entry_get_prefix(*lfeip, &pfx);
+    fib_index = fib_entry_get_fib_index(*lfeip);
+    fib_table = fib_table_get(fib_index, pfx.fp_proto);
+    api_rpaths = NULL;
+    fib_entry_encode(*lfeip, &api_rpaths);
+    send_mpls_fib_details (am, q,
+                          fib_table->ft_table_id,
+                          pfx.fp_label,
+                          pfx.fp_eos,
+                           api_rpaths,
+                          mp->context);
+    vec_free(api_rpaths);
   }
 
-out:
-  vec_free (records);
+  vec_free (lfeis);
 }
 
 static void
@@ -8492,52 +4175,6 @@ static void
       send_ipfix_classify_table_details (i, q, mp->context);
 }
 
-static void
-  vl_api_sw_interface_span_enable_disable_t_handler
-  (vl_api_sw_interface_span_enable_disable_t * mp)
-{
-  vl_api_sw_interface_span_enable_disable_reply_t *rmp;
-  int rv;
-
-  vlib_main_t *vm = vlib_get_main ();
-
-  rv = span_add_delete_entry (vm, ntohl (mp->sw_if_index_from),
-                             ntohl (mp->sw_if_index_to), mp->enable);
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_SPAN_ENABLE_DISABLE_REPLY);
-}
-
-static void
-vl_api_sw_interface_span_dump_t_handler (vl_api_sw_interface_span_dump_t * mp)
-{
-
-  unix_shared_memory_queue_t *q;
-  vl_api_sw_interface_span_details_t *rmp;
-  span_main_t *sm = &span_main;
-  u32 src_sw_if_index = 0, *dst_sw_if_index;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
-
-  vec_foreach (dst_sw_if_index, sm->dst_by_src_sw_if_index)
-  {
-    if (*dst_sw_if_index > 0)
-      {
-       rmp = vl_msg_api_alloc (sizeof (*rmp));
-       memset (rmp, 0, sizeof (*rmp));
-       rmp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SPAN_DETAILS);
-       rmp->context = mp->context;
-
-       rmp->sw_if_index_from = htonl (src_sw_if_index);
-       rmp->sw_if_index_to = htonl (*dst_sw_if_index);
-
-       vl_msg_api_send_shmem (q, (u8 *) & rmp);
-      }
-    src_sw_if_index++;
-  }
-}
-
 static void
 vl_api_pg_create_interface_t_handler (vl_api_pg_create_interface_t * mp)
 {
@@ -8768,97 +4405,6 @@ reply:
   REPLY_MACRO (VL_API_IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL_REPLY);
 }
 
-static void
-vl_api_ipsec_gre_add_del_tunnel_t_handler (vl_api_ipsec_gre_add_del_tunnel_t *
-                                          mp)
-{
-  vl_api_ipsec_gre_add_del_tunnel_reply_t *rmp;
-  int rv = 0;
-  vnet_ipsec_gre_add_del_tunnel_args_t _a, *a = &_a;
-  u32 sw_if_index = ~0;
-
-  /* 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));
-
-  /* ip addresses sent in network byte order */
-  clib_memcpy (&(a->src), mp->src_address, 4);
-  clib_memcpy (&(a->dst), mp->dst_address, 4);
-  a->is_add = mp->is_add;
-  a->lsa = ntohl (mp->local_sa_id);
-  a->rsa = ntohl (mp->remote_sa_id);
-
-  rv = vnet_ipsec_gre_add_del_tunnel (a, &sw_if_index);
-
-out:
-    /* *INDENT-OFF* */
-    REPLY_MACRO2(VL_API_GRE_ADD_DEL_TUNNEL_REPLY,
-    ({
-        rmp->sw_if_index = ntohl (sw_if_index);
-    }));
-    /* *INDENT-ON* */
-}
-
-static void send_ipsec_gre_tunnel_details
-  (ipsec_gre_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_ipsec_gre_tunnel_details_t *rmp;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_IPSEC_GRE_TUNNEL_DETAILS);
-  clib_memcpy (rmp->src_address, &(t->tunnel_src), 4);
-  clib_memcpy (rmp->dst_address, &(t->tunnel_dst), 4);
-  rmp->sw_if_index = htonl (t->sw_if_index);
-  rmp->local_sa_id = htonl (t->local_sa_id);
-  rmp->remote_sa_id = htonl (t->remote_sa_id);
-  rmp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void vl_api_ipsec_gre_tunnel_dump_t_handler
-  (vl_api_ipsec_gre_tunnel_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  ipsec_gre_main_t *igm = &ipsec_gre_main;
-  ipsec_gre_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)
-    {
-        /* *INDENT-OFF* */
-        pool_foreach (t, igm->tunnels,
-        ({
-            send_ipsec_gre_tunnel_details(t, q, mp->context);
-        }));
-        /* *INDENT-ON* */
-    }
-  else
-    {
-      if ((sw_if_index >= vec_len (igm->tunnel_index_by_sw_if_index)) ||
-         (~0 == igm->tunnel_index_by_sw_if_index[sw_if_index]))
-       {
-         return;
-       }
-      t = &igm->tunnels[igm->tunnel_index_by_sw_if_index[sw_if_index]];
-      send_ipsec_gre_tunnel_details (t, q, mp->context);
-    }
-}
-
 static void
 vl_api_delete_subif_t_handler (vl_api_delete_subif_t * mp)
 {
@@ -8904,6 +4450,7 @@ static void
   BAD_SW_IF_INDEX_LABEL;
 
   REPLY_MACRO (VL_API_L2_INTERFACE_PBB_TAG_REWRITE_REPLY);
+
 }
 
 static void
@@ -8992,82 +4539,6 @@ vl_api_flow_classify_dump_t_handler (vl_api_flow_classify_dump_t * mp)
     }
 }
 
-static void
-send_ipsec_spd_details (ipsec_policy_t * p, unix_shared_memory_queue_t * q,
-                       u32 context)
-{
-  vl_api_ipsec_spd_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IPSEC_SPD_DETAILS);
-  mp->context = context;
-
-  mp->spd_id = htonl (p->id);
-  mp->priority = htonl (p->priority);
-  mp->is_outbound = p->is_outbound;
-  mp->is_ipv6 = p->is_ipv6;
-  if (p->is_ipv6)
-    {
-      memcpy (mp->local_start_addr, &p->laddr.start.ip6, 16);
-      memcpy (mp->local_stop_addr, &p->laddr.stop.ip6, 16);
-      memcpy (mp->remote_start_addr, &p->raddr.start.ip6, 16);
-      memcpy (mp->remote_stop_addr, &p->raddr.stop.ip6, 16);
-    }
-  else
-    {
-      memcpy (mp->local_start_addr, &p->laddr.start.ip4, 4);
-      memcpy (mp->local_stop_addr, &p->laddr.stop.ip4, 4);
-      memcpy (mp->remote_start_addr, &p->raddr.start.ip4, 4);
-      memcpy (mp->remote_stop_addr, &p->raddr.stop.ip4, 4);
-    }
-  mp->local_start_port = htons (p->lport.start);
-  mp->local_stop_port = htons (p->lport.stop);
-  mp->remote_start_port = htons (p->rport.start);
-  mp->remote_stop_port = htons (p->rport.stop);
-  mp->protocol = p->protocol;
-  mp->policy = p->policy;
-  mp->sa_id = htonl (p->sa_id);
-  mp->bytes = clib_host_to_net_u64 (p->counter.bytes);
-  mp->packets = clib_host_to_net_u64 (p->counter.packets);
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_ipsec_spd_dump_t_handler (vl_api_ipsec_spd_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  ipsec_main_t *im = &ipsec_main;
-  ipsec_policy_t *policy;
-  ipsec_spd_t *spd;
-  uword *p;
-  u32 spd_index;
-#if IPSEC > 0
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  p = hash_get (im->spd_index_by_spd_id, ntohl (mp->spd_id));
-  if (!p)
-    return;
-
-  spd_index = p[0];
-  spd = pool_elt_at_index (im->spds, spd_index);
-
-  /* *INDENT-OFF* */
-  pool_foreach (policy, spd->policies,
-  ({
-    if (mp->sa_id == ~(0) || ntohl (mp->sa_id) == policy->sa_id)
-      send_ipsec_spd_details (policy, q,
-                              mp->context);}
-    ));
-  /* *INDENT-ON* */
-#else
-  clib_warning ("unimplemented");
-#endif
-}
-
 static void
 vl_api_feature_enable_disable_t_handler (vl_api_feature_enable_disable_t * mp)
 {
@@ -9193,7 +4664,7 @@ vpe_api_hookup (vlib_main_t * vm)
   /*
    * Trace space for 8 MPLS encap labels, classifier mask+match
    */
-  am->api_trace_cfg[VL_API_MPLS_ADD_DEL_ENCAP].size += 8 * sizeof (u32);
+  am->api_trace_cfg[VL_API_MPLS_TUNNEL_ADD_DEL].size += 8 * sizeof (u32);
   am->api_trace_cfg[VL_API_CLASSIFY_ADD_DEL_TABLE].size += 5 * sizeof (u32x4);
   am->api_trace_cfg[VL_API_CLASSIFY_ADD_DEL_SESSION].size
     += 5 * sizeof (u32x4);
@@ -9228,6 +4699,7 @@ vpe_api_init (vlib_main_t * vm)
   am->to_netconf_client_registration_hash = hash_create (0, sizeof (uword));
   am->from_netconf_client_registration_hash = hash_create (0, sizeof (uword));
   am->oam_events_registration_hash = hash_create (0, sizeof (uword));
+  am->bfd_events_registration_hash = hash_create (0, sizeof (uword));
 
   vl_api_init (vm);
   vl_set_memory_region_name ("/vpe-api");