API: Use string type instead of u8.
[vpp.git] / src / vpp / api / api.c
index 14ccd86..1f376dc 100644 (file)
@@ -2,7 +2,7 @@
  *------------------------------------------------------------------
  * api.c - message handler registration
  *
- * Copyright (c) 2010-2016 Cisco and/or its affiliates.
+ * Copyright (c) 2010-2018 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
 
 #include <vnet/api_errno.h>
 #include <vnet/vnet.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/l2_bd.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ip/ip6.h>
-#include <vnet/ip/ip6_neighbor.h>
-#if WITH_LIBSSL > 0
-#include <vnet/sr/sr.h>
-#endif
+
 #include <vlib/vlib.h>
 #include <vlib/unix/unix.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vnet/classify/input_acl.h>
-#include <vnet/l2/l2_classify.h>
-#include <vnet/map/map.h>
-#include <vnet/ip/ip6_hop_by_hop.h>
-#include <vnet/ip/ip_source_and_port_range_check.h>
-#include <vnet/ip/punt.h>
-#include <vnet/feature/feature.h>
 
 #undef BIHASH_TYPE
 #undef __included_bihash_template_h__
-#include <vnet/l2/l2_fib.h>
 
-#include <vpp/stats/stats.h>
-#include <vpp/oam/oam.h>
+#include <vnet/ip/format.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
 #include <vpp/api/vpe_all_api_h.h>
 #undef vl_printfun
 #include <vlibapi/api_helper_macros.h>
+
 #define foreach_vpe_api_msg                                             \
-_(WANT_OAM_EVENTS, want_oam_events)                                     \
-_(OAM_ADD_DEL, oam_add_del)                                             \
-_(IS_ADDRESS_REACHABLE, is_address_reachable)                           \
-_(SW_INTERFACE_SET_MPLS_ENABLE, sw_interface_set_mpls_enable)           \
-_(SW_INTERFACE_SET_VPATH, sw_interface_set_vpath)                       \
-_(SW_INTERFACE_SET_L2_XCONNECT, sw_interface_set_l2_xconnect)           \
-_(SW_INTERFACE_SET_L2_BRIDGE, sw_interface_set_l2_bridge)               \
-_(CREATE_VLAN_SUBIF, create_vlan_subif)                                 \
-_(CREATE_SUBIF, create_subif)                                           \
-_(PROXY_ARP_ADD_DEL, proxy_arp_add_del)                                 \
-_(PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable)       \
-_(VNET_GET_SUMMARY_STATS, vnet_get_summary_stats)                      \
-_(RESET_FIB, reset_fib)                                                        \
-_(CREATE_LOOPBACK, create_loopback)                                    \
-_(CREATE_LOOPBACK_INSTANCE, create_loopback_instance)                  \
 _(CONTROL_PING, control_ping)                                           \
-_(CLI_REQUEST, cli_request)                                             \
+_(CLI, cli)                                                             \
 _(CLI_INBAND, cli_inband)                                              \
-_(SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit)                      \
-_(L2_PATCH_ADD_DEL, l2_patch_add_del)                                  \
-_(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)                                                \
-_(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter)                     \
 _(SHOW_VERSION, show_version)                                          \
-_(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)                     \
-_(DELETE_LOOPBACK, delete_loopback)                                     \
-_(BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del)                                 \
+_(SHOW_THREADS, show_threads)                                          \
 _(GET_NODE_GRAPH, get_node_graph)                                       \
-_(IOAM_ENABLE, ioam_enable)                                             \
-_(IOAM_DISABLE, ioam_disable)                                           \
 _(GET_NEXT_INDEX, get_next_index)                                       \
-_(PG_CREATE_INTERFACE, pg_create_interface)                             \
-_(PG_CAPTURE, pg_capture)                                               \
-_(PG_ENABLE_DISABLE, pg_enable_disable)                                 \
-_(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)                     \
-_(DELETE_SUBIF, delete_subif)                                           \
-_(PUNT, punt)                                                           \
-_(FEATURE_ENABLE_DISABLE, feature_enable_disable)
 
 #define QUOTE_(x) #x
 #define QUOTE(x) QUOTE_(x)
+
 typedef enum
 {
   RESOLVE_IP4_ADD_DEL_ROUTE = 1,
   RESOLVE_IP6_ADD_DEL_ROUTE,
 } resolve_t;
 
-static vlib_node_registration_t vpe_resolver_process_node;
 extern 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 */
 static clib_error_t *
 memclnt_delete_callback (u32 client_index)
@@ -188,880 +120,6 @@ memclnt_delete_callback (u32 client_index)
 
 VL_MSG_API_REAPER_FUNCTION (memclnt_delete_callback);
 
-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
-
-int ip4_add_del_route_t_handler (vl_api_ip_add_del_route_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)
-{
-  vpe_api_main_t *vam = &vpe_api_main;
-  vnet_main_t *vnm = vam->vnet_main;
-  vlib_main_t *vm = vam->vlib_main;
-  vl_api_ip4_arp_event_t *event;
-  vl_api_ip4_arp_event_t *mp;
-  unix_shared_memory_queue_t *q;
-
-  /* Client can cancel, die, etc. */
-  if (pool_is_free_index (vam->arp_events, pool_index))
-    return;
-
-  event = pool_elt_at_index (vam->arp_events, pool_index);
-
-  q = vl_api_client_index_to_input_queue (event->client_index);
-  if (!q)
-    {
-      (void) vnet_add_del_ip4_arp_change_event
-       (vnm, arp_change_delete_callback,
-        event->pid, &event->address,
-        vpe_resolver_process_node.index, IP4_ARP_EVENT,
-        ~0 /* pool index, notused */ , 0 /* is_add */ );
-      return;
-    }
-
-  if (q->cursize < q->maxsize)
-    {
-      mp = vl_msg_api_alloc (sizeof (*mp));
-      clib_memcpy (mp, event, sizeof (*mp));
-      vl_msg_api_send_shmem (q, (u8 *) & mp);
-    }
-  else
-    {
-      static f64 last_time;
-      /*
-       * Throttle syslog msgs.
-       * It's pretty tempting to just revoke the registration...
-       */
-      if (vlib_time_now (vm) > last_time + 10.0)
-       {
-         clib_warning ("arp event for %U to pid %d: queue stuffed!",
-                       format_ip4_address, &event->address, event->pid);
-         last_time = vlib_time_now (vm);
-       }
-    }
-}
-
-void
-handle_ip6_nd_event (u32 pool_index)
-{
-  vpe_api_main_t *vam = &vpe_api_main;
-  vnet_main_t *vnm = vam->vnet_main;
-  vlib_main_t *vm = vam->vlib_main;
-  vl_api_ip6_nd_event_t *event;
-  vl_api_ip6_nd_event_t *mp;
-  unix_shared_memory_queue_t *q;
-
-  /* Client can cancel, die, etc. */
-  if (pool_is_free_index (vam->nd_events, pool_index))
-    return;
-
-  event = pool_elt_at_index (vam->nd_events, pool_index);
-
-  q = vl_api_client_index_to_input_queue (event->client_index);
-  if (!q)
-    {
-      (void) vnet_add_del_ip6_nd_change_event
-       (vnm, nd_change_delete_callback,
-        event->pid, &event->address,
-        vpe_resolver_process_node.index, IP6_ND_EVENT,
-        ~0 /* pool index, notused */ , 0 /* is_add */ );
-      return;
-    }
-
-  if (q->cursize < q->maxsize)
-    {
-      mp = vl_msg_api_alloc (sizeof (*mp));
-      clib_memcpy (mp, event, sizeof (*mp));
-      vl_msg_api_send_shmem (q, (u8 *) & mp);
-    }
-  else
-    {
-      static f64 last_time;
-      /*
-       * Throttle syslog msgs.
-       * It's pretty tempting to just revoke the registration...
-       */
-      if (vlib_time_now (vm) > last_time + 10.0)
-       {
-         clib_warning ("ip6 nd event for %U to pid %d: queue stuffed!",
-                       format_ip6_address, &event->address, event->pid);
-         last_time = vlib_time_now (vm);
-       }
-    }
-}
-
-static uword
-resolver_process (vlib_main_t * vm,
-                 vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  uword event_type;
-  uword *event_data = 0;
-  f64 timeout = 100.0;
-  int i;
-
-  while (1)
-    {
-      vlib_process_wait_for_event_or_clock (vm, timeout);
-
-      event_type = vlib_process_get_events (vm, &event_data);
-
-      switch (event_type)
-       {
-       case RESOLUTION_PENDING_EVENT:
-         timeout = 1.0;
-         break;
-
-       case RESOLUTION_EVENT:
-         clib_warning ("resolver: BOGUS TYPE");
-         break;
-
-       case IP4_ARP_EVENT:
-         for (i = 0; i < vec_len (event_data); i++)
-           handle_ip4_arp_event (event_data[i]);
-         break;
-
-       case IP6_ND_EVENT:
-         for (i = 0; i < vec_len (event_data); i++)
-           handle_ip6_nd_event (event_data[i]);
-         break;
-
-       case ~0:                /* timeout */
-         break;
-       }
-
-      vec_reset_length (event_data);
-    }
-  return 0;                    /* or not */
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (vpe_resolver_process_node,static) = {
-  .function = resolver_process,
-  .type = VLIB_NODE_TYPE_PROCESS,
-  .name = "vpe-route-resolver-process",
-};
-/* *INDENT-ON* */
-
-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);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_VPATH, mp->enable);
-  vnet_feature_enable_disable ("ip4-unicast", "vpath-input-ip4",
-                              sw_if_index, mp->enable, 0, 0);
-  vnet_feature_enable_disable ("ip4-multicast", "vpath-input-ip4",
-                              sw_if_index, mp->enable, 0, 0);
-  vnet_feature_enable_disable ("ip6-unicast", "vpath-input-ip6",
-                              sw_if_index, mp->enable, 0, 0);
-  vnet_feature_enable_disable ("ip6-multicast", "vpath-input-ip6",
-                              sw_if_index, mp->enable, 0, 0);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_VPATH_REPLY);
-}
-
-static void
-  vl_api_sw_interface_set_l2_xconnect_t_handler
-  (vl_api_sw_interface_set_l2_xconnect_t * mp)
-{
-  vl_api_sw_interface_set_l2_xconnect_reply_t *rmp;
-  int rv = 0;
-  u32 rx_sw_if_index = ntohl (mp->rx_sw_if_index);
-  u32 tx_sw_if_index = ntohl (mp->tx_sw_if_index);
-  vlib_main_t *vm = vlib_get_main ();
-  vnet_main_t *vnm = vnet_get_main ();
-
-  VALIDATE_RX_SW_IF_INDEX (mp);
-
-  if (mp->enable)
-    {
-      VALIDATE_TX_SW_IF_INDEX (mp);
-      rv = set_int_l2_mode (vm, vnm, MODE_L2_XC,
-                           rx_sw_if_index, 0, 0, 0, tx_sw_if_index);
-    }
-  else
-    {
-      rv = set_int_l2_mode (vm, vnm, MODE_L3, rx_sw_if_index, 0, 0, 0, 0);
-    }
-
-  BAD_RX_SW_IF_INDEX_LABEL;
-  BAD_TX_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_L2_XCONNECT_REPLY);
-}
-
-static void
-  vl_api_sw_interface_set_l2_bridge_t_handler
-  (vl_api_sw_interface_set_l2_bridge_t * mp)
-{
-  bd_main_t *bdm = &bd_main;
-  vl_api_sw_interface_set_l2_bridge_reply_t *rmp;
-  int rv = 0;
-  u32 rx_sw_if_index = ntohl (mp->rx_sw_if_index);
-  u32 bd_id = ntohl (mp->bd_id);
-  u32 bd_index;
-  u32 bvi = mp->bvi;
-  u8 shg = mp->shg;
-  vlib_main_t *vm = vlib_get_main ();
-  vnet_main_t *vnm = vnet_get_main ();
-
-  VALIDATE_RX_SW_IF_INDEX (mp);
-
-  bd_index = bd_find_or_add_bd_index (bdm, bd_id);
-
-  if (mp->enable)
-    {
-      //VALIDATE_TX_SW_IF_INDEX(mp);
-      rv = set_int_l2_mode (vm, vnm, MODE_L2_BRIDGE,
-                           rx_sw_if_index, bd_index, bvi, shg, 0);
-    }
-  else
-    {
-      rv = set_int_l2_mode (vm, vnm, MODE_L3, rx_sw_if_index, 0, 0, 0, 0);
-    }
-
-  BAD_RX_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_L2_BRIDGE_REPLY);
-}
-
-static void
-vl_api_bd_ip_mac_add_del_t_handler (vl_api_bd_ip_mac_add_del_t * mp)
-{
-  bd_main_t *bdm = &bd_main;
-  vl_api_bd_ip_mac_add_del_reply_t *rmp;
-  int rv = 0;
-  u32 bd_id = ntohl (mp->bd_id);
-  u32 bd_index;
-  uword *p;
-
-  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-  if (p == 0)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_ENTRY;
-      goto out;
-    }
-
-  bd_index = p[0];
-  if (bd_add_del_ip_mac (bd_index, mp->ip_address,
-                        mp->mac_address, mp->is_ipv6, mp->is_add))
-    rv = VNET_API_ERROR_UNSPECIFIED;
-
-out:
-  REPLY_MACRO (VL_API_BD_IP_MAC_ADD_DEL_REPLY);
-}
-
-static void
-vl_api_create_vlan_subif_t_handler (vl_api_create_vlan_subif_t * mp)
-{
-  vl_api_create_vlan_subif_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 sw_if_index = (u32) ~ 0;
-  vnet_hw_interface_t *hi;
-  int rv = 0;
-  u32 id;
-  vnet_sw_interface_t template;
-  uword *p;
-  vnet_interface_main_t *im = &vnm->interface_main;
-  u64 sup_and_sub_key;
-  unix_shared_memory_queue_t *q;
-  clib_error_t *error;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  hi = vnet_get_sup_hw_interface (vnm, ntohl (mp->sw_if_index));
-
-  if (hi->bond_info == VNET_HW_INTERFACE_BOND_INFO_SLAVE)
-    {
-      rv = VNET_API_ERROR_BOND_SLAVE_NOT_ALLOWED;
-      goto out;
-    }
-
-  id = ntohl (mp->vlan_id);
-  if (id == 0 || id > 4095)
-    {
-      rv = VNET_API_ERROR_INVALID_VLAN;
-      goto out;
-    }
-
-  sup_and_sub_key = ((u64) (hi->sw_if_index) << 32) | (u64) id;
-
-  p = hash_get_mem (im->sw_if_index_by_sup_and_sub, &sup_and_sub_key);
-  if (p)
-    {
-      rv = VNET_API_ERROR_VLAN_ALREADY_EXISTS;
-      goto out;
-    }
-
-  memset (&template, 0, sizeof (template));
-  template.type = VNET_SW_INTERFACE_TYPE_SUB;
-  template.sup_sw_if_index = hi->sw_if_index;
-  template.sub.id = id;
-  template.sub.eth.raw_flags = 0;
-  template.sub.eth.flags.one_tag = 1;
-  template.sub.eth.outer_vlan_id = id;
-  template.sub.eth.flags.exact_match = 1;
-
-  error = vnet_create_sw_interface (vnm, &template, &sw_if_index);
-  if (error)
-    {
-      clib_error_report (error);
-      rv = VNET_API_ERROR_INVALID_REGISTRATION;
-      goto out;
-    }
-
-  u64 *kp = clib_mem_alloc (sizeof (*kp));
-  *kp = sup_and_sub_key;
-
-  hash_set (hi->sub_interface_sw_if_index_by_id, id, sw_if_index);
-  hash_set_mem (im->sw_if_index_by_sup_and_sub, kp, sw_if_index);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-out:
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  rmp->_vl_msg_id = htons (VL_API_CREATE_VLAN_SUBIF_REPLY);
-  rmp->context = mp->context;
-  rmp->retval = htonl (rv);
-  rmp->sw_if_index = htonl (sw_if_index);
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_create_subif_t_handler (vl_api_create_subif_t * mp)
-{
-  vl_api_create_subif_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 sw_if_index = ~0;
-  int rv = 0;
-  u32 sub_id;
-  vnet_sw_interface_t *si;
-  vnet_hw_interface_t *hi;
-  vnet_sw_interface_t template;
-  uword *p;
-  vnet_interface_main_t *im = &vnm->interface_main;
-  u64 sup_and_sub_key;
-  clib_error_t *error;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  si = vnet_get_sup_sw_interface (vnm, ntohl (mp->sw_if_index));
-  hi = vnet_get_sup_hw_interface (vnm, ntohl (mp->sw_if_index));
-
-  if (hi->bond_info == VNET_HW_INTERFACE_BOND_INFO_SLAVE)
-    {
-      rv = VNET_API_ERROR_BOND_SLAVE_NOT_ALLOWED;
-      goto out;
-    }
-
-  sw_if_index = si->sw_if_index;
-  sub_id = ntohl (mp->sub_id);
-
-  sup_and_sub_key = ((u64) (sw_if_index) << 32) | (u64) sub_id;
-
-  p = hash_get_mem (im->sw_if_index_by_sup_and_sub, &sup_and_sub_key);
-  if (p)
-    {
-      if (CLIB_DEBUG > 0)
-       clib_warning ("sup sw_if_index %d, sub id %d already exists\n",
-                     sw_if_index, sub_id);
-      rv = VNET_API_ERROR_SUBIF_ALREADY_EXISTS;
-      goto out;
-    }
-
-  memset (&template, 0, sizeof (template));
-  template.type = VNET_SW_INTERFACE_TYPE_SUB;
-  template.sup_sw_if_index = sw_if_index;
-  template.sub.id = sub_id;
-  template.sub.eth.flags.no_tags = mp->no_tags;
-  template.sub.eth.flags.one_tag = mp->one_tag;
-  template.sub.eth.flags.two_tags = mp->two_tags;
-  template.sub.eth.flags.dot1ad = mp->dot1ad;
-  template.sub.eth.flags.exact_match = mp->exact_match;
-  template.sub.eth.flags.default_sub = mp->default_sub;
-  template.sub.eth.flags.outer_vlan_id_any = mp->outer_vlan_id_any;
-  template.sub.eth.flags.inner_vlan_id_any = mp->inner_vlan_id_any;
-  template.sub.eth.outer_vlan_id = ntohs (mp->outer_vlan_id);
-  template.sub.eth.inner_vlan_id = ntohs (mp->inner_vlan_id);
-
-  error = vnet_create_sw_interface (vnm, &template, &sw_if_index);
-  if (error)
-    {
-      clib_error_report (error);
-      rv = VNET_API_ERROR_SUBIF_CREATE_FAILED;
-      goto out;
-    }
-
-  u64 *kp = clib_mem_alloc (sizeof (*kp));
-  *kp = sup_and_sub_key;
-
-  hash_set (hi->sub_interface_sw_if_index_by_id, sub_id, sw_if_index);
-  hash_set_mem (im->sw_if_index_by_sup_and_sub, kp, sw_if_index);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-out:
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_CREATE_SUBIF_REPLY,
-  ({
-    rmp->sw_if_index = ntohl(sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_proxy_arp_add_del_t_handler (vl_api_proxy_arp_add_del_t * mp)
-{
-  vl_api_proxy_arp_add_del_reply_t *rmp;
-  u32 fib_index;
-  int rv;
-  ip4_main_t *im = &ip4_main;
-  stats_main_t *sm = &stats_main;
-  int vnet_proxy_arp_add_del (ip4_address_t * lo_addr,
-                             ip4_address_t * hi_addr,
-                             u32 fib_index, int is_del);
-  uword *p;
-
-  dslock (sm, 1 /* release hint */ , 6 /* tag */ );
-
-  p = hash_get (im->fib_index_by_table_id, ntohl (mp->vrf_id));
-
-  if (!p)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_FIB;
-      goto out;
-    }
-
-  fib_index = p[0];
-
-  rv = vnet_proxy_arp_add_del ((ip4_address_t *) mp->low_address,
-                              (ip4_address_t *) mp->hi_address,
-                              fib_index, mp->is_add == 0);
-
-out:
-  dsunlock (sm);
-  REPLY_MACRO (VL_API_PROXY_ARP_ADD_DEL_REPLY);
-}
-
-static void
-  vl_api_proxy_arp_intfc_enable_disable_t_handler
-  (vl_api_proxy_arp_intfc_enable_disable_t * mp)
-{
-  int rv = 0;
-  vnet_main_t *vnm = vnet_get_main ();
-  vl_api_proxy_arp_intfc_enable_disable_reply_t *rmp;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  vnet_sw_interface_t *si =
-    vnet_get_sw_interface (vnm, ntohl (mp->sw_if_index));
-
-  ASSERT (si);
-
-  if (mp->enable_disable)
-    si->flags |= VNET_SW_INTERFACE_FLAG_PROXY_ARP;
-  else
-    si->flags &= ~VNET_SW_INTERFACE_FLAG_PROXY_ARP;
-
-  BAD_SW_IF_INDEX_LABEL;
-
-out:
-  REPLY_MACRO (VL_API_PROXY_ARP_INTFC_ENABLE_DISABLE_REPLY);
-}
-
-static void
-vl_api_is_address_reachable_t_handler (vl_api_is_address_reachable_t * mp)
-{
-#if 0
-  vpe_main_t *rm = &vpe_main;
-  ip4_main_t *im4 = &ip4_main;
-  ip6_main_t *im6 = &ip6_main;
-  ip_lookup_main_t *lm;
-  union
-  {
-    ip4_address_t ip4;
-    ip6_address_t ip6;
-  } addr;
-  u32 adj_index, sw_if_index;
-  vl_api_is_address_reachable_t *rmp;
-  ip_adjacency_t *adj;
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    {
-      increment_missing_api_client_counter (rm->vlib_main);
-      return;
-    }
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  clib_memcpy (rmp, mp, sizeof (*rmp));
-
-  sw_if_index = mp->next_hop_sw_if_index;
-  clib_memcpy (&addr, mp->address, sizeof (addr));
-  if (mp->is_ipv6)
-    {
-      lm = &im6->lookup_main;
-      adj_index = ip6_fib_lookup (im6, sw_if_index, &addr.ip6);
-    }
-  else
-    {
-      lm = &im4->lookup_main;
-      // FIXME NOT an ADJ
-      adj_index = ip4_fib_lookup (im4, sw_if_index, &addr.ip4);
-    }
-  if (adj_index == ~0)
-    {
-      rmp->is_error = 1;
-      goto send;
-    }
-  adj = ip_get_adjacency (lm, adj_index);
-
-  if (adj->lookup_next_index == IP_LOOKUP_NEXT_REWRITE
-      && adj->rewrite_header.sw_if_index == sw_if_index)
-    {
-      rmp->is_known = 1;
-    }
-  else
-    {
-      if (adj->lookup_next_index == IP_LOOKUP_NEXT_ARP
-         && adj->rewrite_header.sw_if_index == sw_if_index)
-       {
-         if (mp->is_ipv6)
-           ip6_probe_neighbor (rm->vlib_main, &addr.ip6, sw_if_index);
-         else
-           ip4_probe_neighbor (rm->vlib_main, &addr.ip4, sw_if_index);
-       }
-      else if (adj->lookup_next_index == IP_LOOKUP_NEXT_DROP)
-       {
-         rmp->is_known = 1;
-         goto send;
-       }
-      rmp->is_known = 0;
-    }
-
-send:
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-#endif
-}
-
-static void
-  vl_api_sw_interface_set_mpls_enable_t_handler
-  (vl_api_sw_interface_set_mpls_enable_t * mp)
-{
-  vl_api_sw_interface_set_mpls_enable_reply_t *rmp;
-  int rv = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  mpls_sw_interface_enable_disable (&mpls_main,
-                                   ntohl (mp->sw_if_index), mp->enable);
-
-  BAD_SW_IF_INDEX_LABEL;
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_MPLS_ENABLE_REPLY);
-}
-
-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)
-{
-  stats_main_t *sm = &stats_main;
-  vnet_interface_main_t *im = sm->interface_main;
-  vl_api_vnet_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];
-
-  unix_shared_memory_queue_t *q =
-    vl_api_client_index_to_input_queue (mp->client_index);
-
-  if (!q)
-    return;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_VNET_SUMMARY_STATS_REPLY);
-  rmp->context = mp->context;
-  rmp->retval = 0;
-
-  memset (total_pkts, 0, sizeof (total_pkts));
-  memset (total_bytes, 0, sizeof (total_bytes));
-
-  vnet_interface_counter_lock (im);
-
-  vec_foreach (cm, im->combined_sw_if_counters)
-  {
-    which = cm - im->combined_sw_if_counters;
-
-    for (i = 0; i < vlib_combined_counter_n_counters (cm); i++)
-      {
-       vlib_get_combined_counter (cm, i, &v);
-       total_pkts[which] += v.packets;
-       total_bytes[which] += v.bytes;
-      }
-  }
-  vnet_interface_counter_unlock (im);
-
-  rmp->total_pkts[VLIB_RX] = clib_host_to_net_u64 (total_pkts[VLIB_RX]);
-  rmp->total_bytes[VLIB_RX] = clib_host_to_net_u64 (total_bytes[VLIB_RX]);
-  rmp->total_pkts[VLIB_TX] = clib_host_to_net_u64 (total_pkts[VLIB_TX]);
-  rmp->total_bytes[VLIB_TX] = clib_host_to_net_u64 (total_bytes[VLIB_TX]);
-  rmp->vector_rate =
-    clib_host_to_net_u64 (vlib_last_vector_length_per_node (sm->vlib_main));
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  ip4_address_t address;
-  u32 address_length: 6;
-  u32 index:26;
-}) ip4_route_t;
-/* *INDENT-ON* */
-
-static int
-ip4_reset_fib_t_handler (vl_api_reset_fib_t * mp)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  ip4_main_t *im4 = &ip4_main;
-  static u32 *sw_if_indices_to_shut;
-  stats_main_t *sm = &stats_main;
-  fib_table_t *fib_table;
-  ip4_fib_t *fib;
-  u32 sw_if_index;
-  int i;
-  int rv = VNET_API_ERROR_NO_SUCH_FIB;
-  u32 target_fib_id = ntohl (mp->vrf_id);
-
-  dslock (sm, 1 /* release hint */ , 8 /* tag */ );
-
-  /* *INDENT-OFF* */
-  pool_foreach (fib_table, im4->fibs,
-  ({
-    fib = &fib_table->v4;
-    vnet_sw_interface_t * si;
-
-    if (fib->table_id != target_fib_id)
-      continue;
-
-    /* remove any mpls encap/decap labels */
-    mpls_fib_reset_labels (fib->table_id);
-
-    /* remove any proxy arps in this fib */
-    vnet_proxy_arp_fib_reset (fib->table_id);
-
-    /* Set the flow hash for this fib to the default */
-    vnet_set_ip4_flow_hash (fib->table_id, IP_FLOW_HASH_DEFAULT);
-
-    vec_reset_length (sw_if_indices_to_shut);
-
-    /* Shut down interfaces in this FIB / clean out intfc routes */
-    pool_foreach (si, im->sw_interfaces,
-    ({
-      u32 sw_if_index = si->sw_if_index;
-
-      if (sw_if_index < vec_len (im4->fib_index_by_sw_if_index)
-          && (im4->fib_index_by_sw_if_index[si->sw_if_index] ==
-              fib->index))
-        vec_add1 (sw_if_indices_to_shut, si->sw_if_index);
-    }));
-
-    for (i = 0; i < vec_len (sw_if_indices_to_shut); i++) {
-      sw_if_index = sw_if_indices_to_shut[i];
-
-      u32 flags = vnet_sw_interface_get_flags (vnm, sw_if_index);
-      flags &= ~(VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-      vnet_sw_interface_set_flags (vnm, sw_if_index, flags);
-    }
-
-    fib_table_flush(fib->index, FIB_PROTOCOL_IP4, FIB_SOURCE_API);
-
-    rv = 0;
-    break;
-    })); /* pool_foreach (fib) */
-    /* *INDENT-ON* */
-
-  dsunlock (sm);
-  return rv;
-}
-
-static int
-ip6_reset_fib_t_handler (vl_api_reset_fib_t * mp)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  ip6_main_t *im6 = &ip6_main;
-  stats_main_t *sm = &stats_main;
-  static u32 *sw_if_indices_to_shut;
-  fib_table_t *fib_table;
-  ip6_fib_t *fib;
-  u32 sw_if_index;
-  int i;
-  int rv = VNET_API_ERROR_NO_SUCH_FIB;
-  u32 target_fib_id = ntohl (mp->vrf_id);
-
-  dslock (sm, 1 /* release hint */ , 9 /* tag */ );
-
-  /* *INDENT-OFF* */
-  pool_foreach (fib_table, im6->fibs,
-  ({
-    vnet_sw_interface_t * si;
-    fib = &(fib_table->v6);
-
-    if (fib->table_id != target_fib_id)
-      continue;
-
-    vec_reset_length (sw_if_indices_to_shut);
-
-    /* Shut down interfaces in this FIB / clean out intfc routes */
-    pool_foreach (si, im->sw_interfaces,
-    ({
-      if (im6->fib_index_by_sw_if_index[si->sw_if_index] ==
-          fib->index)
-        vec_add1 (sw_if_indices_to_shut, si->sw_if_index);
-    }));
-
-    for (i = 0; i < vec_len (sw_if_indices_to_shut); i++) {
-      sw_if_index = sw_if_indices_to_shut[i];
-
-      u32 flags = vnet_sw_interface_get_flags (vnm, sw_if_index);
-      flags &= ~(VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-      vnet_sw_interface_set_flags (vnm, sw_if_index, flags);
-    }
-
-    fib_table_flush(fib->index, FIB_PROTOCOL_IP6, FIB_SOURCE_API);
-
-    rv = 0;
-    break;
-  })); /* pool_foreach (fib) */
-  /* *INDENT-ON* */
-
-  dsunlock (sm);
-  return rv;
-}
-
-static void
-vl_api_reset_fib_t_handler (vl_api_reset_fib_t * mp)
-{
-  int rv;
-  vl_api_reset_fib_reply_t *rmp;
-
-  if (mp->is_ipv6)
-    rv = ip6_reset_fib_t_handler (mp);
-  else
-    rv = ip4_reset_fib_t_handler (mp);
-
-  REPLY_MACRO (VL_API_RESET_FIB_REPLY);
-}
-
-static void
-vl_api_create_loopback_t_handler (vl_api_create_loopback_t * mp)
-{
-  vl_api_create_loopback_reply_t *rmp;
-  u32 sw_if_index;
-  int rv;
-
-  rv = vnet_create_loopback_interface (&sw_if_index, mp->mac_address, 0, 0);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_CREATE_LOOPBACK_REPLY,
-  ({
-    rmp->sw_if_index = ntohl (sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void vl_api_create_loopback_instance_t_handler
-  (vl_api_create_loopback_instance_t * mp)
-{
-  vl_api_create_loopback_instance_reply_t *rmp;
-  u32 sw_if_index;
-  u8 is_specified = mp->is_specified;
-  u32 user_instance = ntohl (mp->user_instance);
-  int rv;
-
-  rv = vnet_create_loopback_interface (&sw_if_index, mp->mac_address,
-                                      is_specified, user_instance);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_CREATE_LOOPBACK_INSTANCE_REPLY,
-  ({
-    rmp->sw_if_index = ntohl (sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_delete_loopback_t_handler (vl_api_delete_loopback_t * mp)
-{
-  vl_api_delete_loopback_reply_t *rmp;
-  u32 sw_if_index;
-  int rv;
-
-  sw_if_index = ntohl (mp->sw_if_index);
-  rv = vnet_delete_loopback_interface (sw_if_index);
-
-  REPLY_MACRO (VL_API_DELETE_LOOPBACK_REPLY);
-}
-
 static void
 vl_api_control_ping_t_handler (vl_api_control_ping_t * mp)
 {
@@ -1104,19 +162,19 @@ shmem_cli_output (uword arg, u8 * buffer, uword buffer_bytes)
 
 
 static void
-vl_api_cli_request_t_handler (vl_api_cli_request_t * mp)
+vl_api_cli_t_handler (vl_api_cli_t * mp)
 {
   vl_api_cli_reply_t *rp;
-  unix_shared_memory_queue_t *q;
+  vl_api_registration_t *reg;
   vlib_main_t *vm = vlib_get_main ();
   api_main_t *am = &api_main;
   unformat_input_t input;
   u8 *shmem_vec = 0;
   void *oldheap;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
+    return;;
 
   rp = vl_msg_api_alloc (sizeof (*rp));
   rp->_vl_msg_id = ntohs (VL_API_CLI_REPLY);
@@ -1136,7 +194,7 @@ vl_api_cli_request_t_handler (vl_api_cli_request_t * mp)
 
   rp->reply_in_shmem = (uword) shmem_vec;
 
-  vl_msg_api_send_shmem (q, (u8 *) & rp);
+  vl_api_send_msg (reg, (u8 *) rp);
 }
 
 static void
@@ -1156,167 +214,123 @@ vl_api_cli_inband_t_handler (vl_api_cli_inband_t * mp)
 {
   vl_api_cli_inband_reply_t *rmp;
   int rv = 0;
-  unix_shared_memory_queue_t *q;
   vlib_main_t *vm = vlib_get_main ();
   unformat_input_t input;
   u8 *out_vec = 0;
+  u32 len = 0;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
+  if (vl_msg_api_get_msg_length (mp) < vl_api_string_len (&mp->cmd))
+    {
+      rv = -1;
+      goto error;
+    }
 
-  unformat_init_string (&input, (char *) mp->cmd, ntohl (mp->length));
+  unformat_init_string (&input, (char *) vl_api_from_api_string (&mp->cmd),
+                       vl_api_string_len (&mp->cmd));
   vlib_cli_input (vm, &input, inband_cli_output, (uword) & out_vec);
 
-  u32 len = vec_len (out_vec);
+  len = vec_len (out_vec);
+
+error:
   /* *INDENT-OFF* */
   REPLY_MACRO3(VL_API_CLI_INBAND_REPLY, len,
   ({
-    rmp->length = htonl (len);
-    clib_memcpy (rmp->reply, out_vec, len);
+    vl_api_to_api_string(len, (const char *)out_vec, &rmp->reply);
   }));
   /* *INDENT-ON* */
   vec_free (out_vec);
 }
 
 static void
-vl_api_set_arp_neighbor_limit_t_handler (vl_api_set_arp_neighbor_limit_t * mp)
-{
-  int rv;
-  vl_api_set_arp_neighbor_limit_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error;
-
-  vnm->api_errno = 0;
-
-  if (mp->is_ipv6)
-    error = ip6_set_neighbor_limit (ntohl (mp->arp_neighbor_limit));
-  else
-    error = ip4_set_arp_limit (ntohl (mp->arp_neighbor_limit));
-
-  if (error)
-    {
-      clib_error_report (error);
-      rv = VNET_API_ERROR_UNSPECIFIED;
-    }
-  else
-    {
-      rv = vnm->api_errno;
-    }
-
-  REPLY_MACRO (VL_API_SET_ARP_NEIGHBOR_LIMIT_REPLY);
-}
-
-static void vl_api_classify_set_interface_ip_table_t_handler
-  (vl_api_classify_set_interface_ip_table_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_classify_set_interface_ip_table_reply_t *rmp;
-  int rv;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  u32 table_index = ntohl (mp->table_index);
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-
-  if (mp->is_ipv6)
-    rv = vnet_set_ip6_classify_intfc (vm, sw_if_index, table_index);
-  else
-    rv = vnet_set_ip4_classify_intfc (vm, sw_if_index, table_index);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_CLASSIFY_SET_INTERFACE_IP_TABLE_REPLY);
-}
-
-static void vl_api_classify_set_interface_l2_tables_t_handler
-  (vl_api_classify_set_interface_l2_tables_t * mp)
+vl_api_show_version_t_handler (vl_api_show_version_t * mp)
 {
-  vl_api_classify_set_interface_l2_tables_reply_t *rmp;
-  int rv;
-  u32 sw_if_index, ip4_table_index, ip6_table_index, other_table_index;
-  int enable;
-
-  ip4_table_index = ntohl (mp->ip4_table_index);
-  ip6_table_index = ntohl (mp->ip6_table_index);
-  other_table_index = ntohl (mp->other_table_index);
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  if (mp->is_input)
-    rv = vnet_l2_input_classify_set_tables (sw_if_index, ip4_table_index,
-                                           ip6_table_index,
-                                           other_table_index);
-  else
-    rv = vnet_l2_output_classify_set_tables (sw_if_index, ip4_table_index,
-                                            ip6_table_index,
-                                            other_table_index);
-
-  if (rv == 0)
-    {
-      if (ip4_table_index != ~0 || ip6_table_index != ~0
-         || other_table_index != ~0)
-       enable = 1;
-      else
-       enable = 0;
+  vl_api_show_version_reply_t *rmp;
+  int rv = 0;
+  char *vpe_api_get_build_directory (void);
+  char *vpe_api_get_version (void);
+  char *vpe_api_get_build_date (void);
 
-      if (mp->is_input)
-       vnet_l2_input_classify_enable_disable (sw_if_index, enable);
-      else
-       vnet_l2_output_classify_enable_disable (sw_if_index, enable);
-    }
+  u32 program_len = strnlen_s ("vpe", 32) + 1;
+  u32 version_len = strnlen_s (vpe_api_get_version (), 32) + 1;
+  u32 build_date_len = strnlen_s (vpe_api_get_build_date (), 32) + 1;
+  u32 build_directory_len =
+    strnlen_s (vpe_api_get_build_directory (), 256) + 1;
 
-  BAD_SW_IF_INDEX_LABEL;
+  u32 n = program_len + version_len + build_date_len + build_directory_len;
 
-  REPLY_MACRO (VL_API_CLASSIFY_SET_INTERFACE_L2_TABLES_REPLY);
+  /* *INDENT-OFF* */
+  REPLY_MACRO3(VL_API_SHOW_VERSION_REPLY, n,
+  ({
+    char *p = (char *)&rmp->program;
+    p += vl_api_to_api_string(program_len, "vpe", (vl_api_string_t *)p);
+    p += vl_api_to_api_string(version_len, vpe_api_get_version(), (vl_api_string_t *)p);
+    p += vl_api_to_api_string(build_date_len, vpe_api_get_build_date(), (vl_api_string_t *)p);
+    vl_api_to_api_string(build_directory_len, vpe_api_get_build_directory(), (vl_api_string_t *)p);
+  }));
+  /* *INDENT-ON* */
 }
 
-extern void l2_efp_filter_configure (vnet_main_t * vnet_main,
-                                    u32 sw_if_index, u32 enable);
-
 static void
-vl_api_l2_interface_efp_filter_t_handler (vl_api_l2_interface_efp_filter_t *
-                                         mp)
+get_thread_data (vl_api_thread_data_t * td, int index)
 {
-  int rv;
-  vl_api_l2_interface_efp_filter_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-
-  // enable/disable the feature
-  l2_efp_filter_configure (vnm, mp->sw_if_index, mp->enable_disable);
-  rv = vnm->api_errno;
-
-  REPLY_MACRO (VL_API_L2_INTERFACE_EFP_FILTER_REPLY);
+  vlib_worker_thread_t *w = vlib_worker_threads + index;
+  td->id = htonl (index);
+  if (w->name)
+    strncpy ((char *) td->name, (char *) w->name, ARRAY_LEN (td->name) - 1);
+  if (w->registration)
+    strncpy ((char *) td->type, (char *) w->registration->name,
+            ARRAY_LEN (td->type) - 1);
+  td->pid = htonl (w->lwp);
+  td->cpu_id = htonl (w->cpu_id);
+  td->core = htonl (w->core_id);
+  td->cpu_socket = htonl (w->socket_id);
 }
 
 static void
-vl_api_show_version_t_handler (vl_api_show_version_t * mp)
-{
-  vl_api_show_version_reply_t *rmp;
-  int rv = 0;
-  char *vpe_api_get_build_directory (void);
-  char *vpe_api_get_version (void);
-  char *vpe_api_get_build_date (void);
-
-  unix_shared_memory_queue_t *q =
-    vl_api_client_index_to_input_queue (mp->client_index);
+vl_api_show_threads_t_handler (vl_api_show_threads_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  int rv = 0, count = 0;
+
+#if !defined(__powerpc64__)
+  vl_api_registration_t *reg;
+  vl_api_show_threads_reply_t *rmp;
+  vl_api_thread_data_t *td;
+  int i, msg_size = 0;
+  count = vec_len (vlib_worker_threads);
+  if (!count)
+    return;
 
-  if (!q)
+  msg_size = sizeof (*rmp) + sizeof (rmp->thread_data[0]) * count;
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
+  rmp = vl_msg_api_alloc (msg_size);
+  clib_memset (rmp, 0, msg_size);
+  rmp->_vl_msg_id = htons (VL_API_SHOW_THREADS_REPLY);
+  rmp->context = mp->context;
+  rmp->count = htonl (count);
+  td = rmp->thread_data;
+
+  for (i = 0; i < count; i++)
+    {
+      get_thread_data (&td[i], i);
+    }
+
+  vl_api_send_msg (reg, (u8 *) rmp);
+#else
+
+  /* unimplemented support */
+  rv = -9;
+  clib_warning ("power pc does not support show threads api");
   /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_SHOW_VERSION_REPLY,
+  REPLY_MACRO2(VL_API_SHOW_THREADS_REPLY,
   ({
-    strncpy ((char *) rmp->program, "vpe", ARRAY_LEN(rmp->program)-1);
-    strncpy ((char *) rmp->build_directory, vpe_api_get_build_directory(),
-             ARRAY_LEN(rmp->build_directory)-1);
-    strncpy ((char *) rmp->version, vpe_api_get_version(),
-             ARRAY_LEN(rmp->version)-1);
-    strncpy ((char *) rmp->build_date, vpe_api_get_build_date(),
-             ARRAY_LEN(rmp->build_date)-1);
+    rmp->count = htonl(count);
   }));
   /* *INDENT-ON* */
+#endif
 }
 
 static void
@@ -1423,249 +437,6 @@ out:
   /* *INDENT-ON* */
 }
 
-static void
-vl_api_l2_patch_add_del_t_handler (vl_api_l2_patch_add_del_t * mp)
-{
-  extern int vnet_l2_patch_add_del (u32 rx_sw_if_index, u32 tx_sw_if_index,
-                                   int is_add);
-  vl_api_l2_patch_add_del_reply_t *rmp;
-  int vnet_l2_patch_add_del (u32 rx_sw_if_index, u32 tx_sw_if_index,
-                            int is_add);
-  int rv = 0;
-
-  VALIDATE_RX_SW_IF_INDEX (mp);
-  VALIDATE_TX_SW_IF_INDEX (mp);
-
-  rv = vnet_l2_patch_add_del (ntohl (mp->rx_sw_if_index),
-                             ntohl (mp->tx_sw_if_index),
-                             (int) (mp->is_add != 0));
-
-  BAD_RX_SW_IF_INDEX_LABEL;
-  BAD_TX_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_L2_PATCH_ADD_DEL_REPLY);
-}
-
-static void
-vl_api_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 == ntohl(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 = htonl (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 == ntohl(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 = htonl (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)
-    {
-      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 */ );
-
-      if (rv)
-       goto out;
-      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;
-    }
-  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 */ );
-    }
-out:
-  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;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  u32 ip4_table_index = ntohl (mp->ip4_table_index);
-  u32 ip6_table_index = ntohl (mp->ip6_table_index);
-  u32 l2_table_index = ntohl (mp->l2_table_index);
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-
-  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_get_node_graph_t_handler (vl_api_get_node_graph_t * mp)
 {
@@ -1675,6 +446,8 @@ vl_api_get_node_graph_t_handler (vl_api_get_node_graph_t * mp)
   vlib_main_t *vm = vlib_get_main ();
   void *oldheap;
   vl_api_get_node_graph_reply_t *rmp;
+  static vlib_node_t ***node_dups;
+  static vlib_main_t **stat_vms;
 
   pthread_mutex_lock (&am->vlib_rp->mutex);
   oldheap = svm_push_data_heap (am->vlib_rp);
@@ -1685,10 +458,11 @@ vl_api_get_node_graph_t_handler (vl_api_get_node_graph_t * mp)
   vec_validate (vector, 16384);
   vec_reset_length (vector);
 
-  /* $$$$ FIXME */
-  vector = vlib_node_serialize (&vm->node_main, vector,
-                               (u32) ~ 0 /* all threads */ ,
-                               1 /* include nexts */ ,
+  vlib_node_get_nodes (vm, 0 /* main threads */ ,
+                      0 /* include stats */ ,
+                      1 /* barrier sync */ ,
+                      &node_dups, &stat_vms);
+  vector = vlib_node_serialize (vm, node_dups, vector, 1 /* include nexts */ ,
                                1 /* include stats */ );
 
   svm_pop_heap (oldheap);
@@ -1702,352 +476,13 @@ vl_api_get_node_graph_t_handler (vl_api_get_node_graph_t * mp)
   /* *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_pg_create_interface_t_handler (vl_api_pg_create_interface_t * mp)
-{
-  vl_api_pg_create_interface_reply_t *rmp;
-  int rv = 0;
-
-  pg_main_t *pg = &pg_main;
-  u32 pg_if_id = pg_interface_add_or_get (pg, ntohl (mp->interface_id));
-  pg_interface_t *pi = pool_elt_at_index (pg->interfaces, pg_if_id);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_PG_CREATE_INTERFACE_REPLY,
-  ({
-    rmp->sw_if_index = ntohl(pi->sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_pg_capture_t_handler (vl_api_pg_capture_t * mp)
-{
-  vl_api_pg_capture_reply_t *rmp;
-  int rv = 0;
-
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vnet_hw_interface_t *hi = 0;
-
-  u8 *intf_name = format (0, "pg%d", ntohl (mp->interface_id), 0);
-  u32 hw_if_index = ~0;
-  uword *p = hash_get_mem (im->hw_interface_by_name, intf_name);
-  if (p)
-    hw_if_index = *p;
-  vec_free (intf_name);
-
-  if (hw_if_index != ~0)
-    {
-      pg_capture_args_t _a, *a = &_a;
-
-      u32 len = ntohl (mp->pcap_name_length);
-      u8 *pcap_file_name = vec_new (u8, len);
-      clib_memcpy (pcap_file_name, mp->pcap_file_name, len);
-
-      hi = vnet_get_sup_hw_interface (vnm, hw_if_index);
-      a->hw_if_index = hw_if_index;
-      a->dev_instance = hi->dev_instance;
-      a->is_enabled = mp->is_enabled;
-      a->pcap_file_name = pcap_file_name;
-      a->count = ntohl (mp->count);
-
-      clib_error_t *e = pg_capture (a);
-      if (e)
-       {
-         clib_error_report (e);
-         rv = VNET_API_ERROR_CANNOT_CREATE_PCAP_FILE;
-       }
-
-      vec_free (pcap_file_name);
-    }
-  REPLY_MACRO (VL_API_PG_CAPTURE_REPLY);
-}
-
-static void
-vl_api_pg_enable_disable_t_handler (vl_api_pg_enable_disable_t * mp)
-{
-  vl_api_pg_enable_disable_reply_t *rmp;
-  int rv = 0;
-
-  pg_main_t *pg = &pg_main;
-  u32 stream_index = ~0;
-
-  int is_enable = mp->is_enabled != 0;
-  u32 len = ntohl (mp->stream_name_length) - 1;
-
-  if (len > 0)
-    {
-      u8 *stream_name = vec_new (u8, len);
-      clib_memcpy (stream_name, mp->stream_name, len);
-      uword *p = hash_get_mem (pg->stream_index_by_name, stream_name);
-      if (p)
-       stream_index = *p;
-      vec_free (stream_name);
-    }
-
-  pg_enable_disable (stream_index, is_enable);
-
-  REPLY_MACRO (VL_API_PG_ENABLE_DISABLE_REPLY);
-}
-
-static void
-  vl_api_ip_source_and_port_range_check_add_del_t_handler
-  (vl_api_ip_source_and_port_range_check_add_del_t * mp)
-{
-  vl_api_ip_source_and_port_range_check_add_del_reply_t *rmp;
-  int rv = 0;
-
-  u8 is_ipv6 = mp->is_ipv6;
-  u8 is_add = mp->is_add;
-  u8 mask_length = mp->mask_length;
-  ip4_address_t ip4_addr;
-  ip6_address_t ip6_addr;
-  u16 *low_ports = 0;
-  u16 *high_ports = 0;
-  u32 vrf_id;
-  u16 tmp_low, tmp_high;
-  u8 num_ranges;
-  int i;
-
-  // Validate port range
-  num_ranges = mp->number_of_ranges;
-  if (num_ranges > 32)
-    {                          // This is size of array in VPE.API
-      rv = VNET_API_ERROR_EXCEEDED_NUMBER_OF_RANGES_CAPACITY;
-      goto reply;
-    }
-
-  vec_reset_length (low_ports);
-  vec_reset_length (high_ports);
-
-  for (i = 0; i < num_ranges; i++)
-    {
-      tmp_low = mp->low_ports[i];
-      tmp_high = mp->high_ports[i];
-      // If tmp_low <= tmp_high then only need to check tmp_low = 0
-      // If tmp_low <= tmp_high then only need to check tmp_high > 65535
-      if (tmp_low > tmp_high || tmp_low == 0 || tmp_high > 65535)
-       {
-         rv = VNET_API_ERROR_INVALID_VALUE;
-         goto reply;
-       }
-      vec_add1 (low_ports, tmp_low);
-      vec_add1 (high_ports, tmp_high + 1);
-    }
-
-  // Validate mask_length
-  if ((is_ipv6 && mask_length > 128) || (!is_ipv6 && mask_length > 32))
-    {
-      rv = VNET_API_ERROR_ADDRESS_LENGTH_MISMATCH;
-      goto reply;
-    }
-
-  vrf_id = ntohl (mp->vrf_id);
-
-  if (vrf_id < 1)
-    {
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto reply;
-    }
-
-
-  if (is_ipv6)
-    {
-      clib_memcpy (ip6_addr.as_u8, mp->address, sizeof (ip6_addr.as_u8));
-      rv = ip6_source_and_port_range_check_add_del (&ip6_addr,
-                                                   mask_length,
-                                                   vrf_id,
-                                                   low_ports,
-                                                   high_ports, is_add);
-    }
-  else
-    {
-      clib_memcpy (ip4_addr.data, mp->address, sizeof (ip4_addr));
-      rv = ip4_source_and_port_range_check_add_del (&ip4_addr,
-                                                   mask_length,
-                                                   vrf_id,
-                                                   low_ports,
-                                                   high_ports, is_add);
-    }
-
-reply:
-  vec_free (low_ports);
-  vec_free (high_ports);
-  REPLY_MACRO (VL_API_IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL_REPLY);
-}
-
-static void
-  vl_api_ip_source_and_port_range_check_interface_add_del_t_handler
-  (vl_api_ip_source_and_port_range_check_interface_add_del_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_ip_source_and_port_range_check_interface_add_del_reply_t *rmp;
-  ip4_main_t *im = &ip4_main;
-  int rv;
-  u32 sw_if_index;
-  u32 fib_index[IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS];
-  u32 vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS];
-  uword *p = 0;
-  int i;
-
-  vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_OUT] =
-    ntohl (mp->tcp_out_vrf_id);
-  vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_OUT] =
-    ntohl (mp->udp_out_vrf_id);
-  vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_IN] =
-    ntohl (mp->tcp_in_vrf_id);
-  vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_IN] =
-    ntohl (mp->udp_in_vrf_id);
-
-
-  for (i = 0; i < IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS; i++)
-    {
-      if (vrf_id[i] != 0 && vrf_id[i] != ~0)
-       {
-         p = hash_get (im->fib_index_by_table_id, vrf_id[i]);
-
-         if (p == 0)
-           {
-             rv = VNET_API_ERROR_INVALID_VALUE;
-             goto reply;
-           }
-
-         fib_index[i] = p[0];
-       }
-      else
-       fib_index[i] = ~0;
-    }
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv =
-    set_ip_source_and_port_range_check (vm, fib_index, sw_if_index,
-                                       mp->is_add);
-
-  BAD_SW_IF_INDEX_LABEL;
-reply:
-
-  REPLY_MACRO (VL_API_IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL_REPLY);
-}
-
-static void
-vl_api_delete_subif_t_handler (vl_api_delete_subif_t * mp)
-{
-  vl_api_delete_subif_reply_t *rmp;
-  int rv;
-
-  rv = vnet_delete_sub_interface (ntohl (mp->sw_if_index));
-
-  REPLY_MACRO (VL_API_DELETE_SUBIF_REPLY);
-}
-
-static void
-vl_api_punt_t_handler (vl_api_punt_t * mp)
-{
-  vl_api_punt_reply_t *rmp;
-  vlib_main_t *vm = vlib_get_main ();
-  int rv = 0;
-  clib_error_t *error;
-
-  error = vnet_punt_add_del (vm, mp->ipv, mp->l4_protocol,
-                            ntohs (mp->l4_port), mp->is_add);
-  if (error)
-    {
-      rv = -1;
-      clib_error_report (error);
-    }
-
-  REPLY_MACRO (VL_API_PUNT_REPLY);
-}
-
-static void
-vl_api_feature_enable_disable_t_handler (vl_api_feature_enable_disable_t * mp)
-{
-  vl_api_feature_enable_disable_reply_t *rmp;
-  int rv = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  u8 *arc_name = format (0, "%s%c", mp->arc_name, 0);
-  u8 *feature_name = format (0, "%s%c", mp->feature_name, 0);
-
-  vnet_feature_registration_t *reg =
-    vnet_get_feature_reg ((const char *) arc_name,
-                         (const char *) feature_name);
-  if (reg == 0)
-    rv = VNET_API_ERROR_INVALID_VALUE;
-  else
-    {
-      u32 sw_if_index = ntohl (mp->sw_if_index);
-      clib_error_t *error = 0;
-
-      if (reg->enable_disable_cb)
-       error = reg->enable_disable_cb (sw_if_index, mp->enable);
-      if (!error)
-       vnet_feature_enable_disable ((const char *) arc_name,
-                                    (const char *) feature_name,
-                                    sw_if_index, mp->enable, 0, 0);
-      else
-       {
-         clib_error_report (error);
-         rv = VNET_API_ERROR_CANNOT_ENABLE_DISABLE_FEATURE;
-       }
-    }
-
-  vec_free (feature_name);
-  vec_free (arc_name);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_FEATURE_ENABLE_DISABLE_REPLY);
-}
-
 #define BOUNCE_HANDLER(nn)                                              \
 static void vl_api_##nn##_t_handler (                                   \
     vl_api_##nn##_t *mp)                                                \
 {                                                                       \
     vpe_client_registration_t *reg;                                     \
     vpe_api_main_t * vam = &vpe_api_main;                               \
-    unix_shared_memory_queue_t * q;                                     \
+    svm_queue_t * q;                                     \
                                                                         \
     /* One registration only... */                                      \
     pool_foreach(reg, vam->nn##_registrations,                          \
@@ -2076,7 +511,7 @@ static void setup_message_id_table (api_main_t * am);
 /*
  * vpe_api_hookup
  * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../open-repo/vlib/memclnt_vlib.c:memclnt_process()
  */
@@ -2118,30 +553,24 @@ vpe_api_hookup (vlib_main_t * vm)
 
 VLIB_API_INIT_FUNCTION (vpe_api_hookup);
 
-static clib_error_t *
+clib_error_t *
 vpe_api_init (vlib_main_t * vm)
 {
   vpe_api_main_t *am = &vpe_api_main;
 
   am->vlib_main = vm;
   am->vnet_main = vnet_get_main ();
-  am->interface_events_registration_hash = hash_create (0, sizeof (uword));
-  am->to_netconf_server_registration_hash = hash_create (0, sizeof (uword));
-  am->from_netconf_server_registration_hash = hash_create (0, sizeof (uword));
-  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));
+#define _(a)                                                    \
+  am->a##_registration_hash = hash_create (0, sizeof (uword));
+  foreach_registration_hash;
+#undef _
 
   vl_set_memory_region_name ("/vpe-api");
-  vl_enable_disable_memory_api (vm, 1 /* enable it */ );
+  vl_mem_api_enable_disable (vm, 1 /* enable it */ );
 
   return 0;
 }
 
-VLIB_INIT_FUNCTION (vpe_api_init);
-
-
 static clib_error_t *
 api_segment_config (vlib_main_t * vm, unformat_input_t * input)
 {
@@ -2272,10 +701,7 @@ format_arp_event (u8 * s, va_list * args)
   vl_api_ip4_arp_event_t *event = va_arg (*args, vl_api_ip4_arp_event_t *);
 
   s = format (s, "pid %d: ", ntohl (event->pid));
-  if (event->mac_ip)
-    s = format (s, "bd mac/ip4 binding events");
-  else
-    s = format (s, "resolution for %U", format_ip4_address, &event->address);
+  s = format (s, "resolution for %U", format_ip4_address, &event->address);
   return s;
 }
 
@@ -2285,10 +711,7 @@ format_nd_event (u8 * s, va_list * args)
   vl_api_ip6_nd_event_t *event = va_arg (*args, vl_api_ip6_nd_event_t *);
 
   s = format (s, "pid %d: ", ntohl (event->pid));
-  if (event->mac_ip)
-    s = format (s, "bd mac/ip6 binding events");
-  else
-    s = format (s, "resolution for %U", format_ip6_address, event->address);
+  s = format (s, "resolution for %U", format_ip6_address, event->address);
   return s;
 }
 
@@ -2300,7 +723,9 @@ show_ip_arp_nd_events_fn (vlib_main_t * vm,
   vl_api_ip4_arp_event_t *arp_event;
   vl_api_ip6_nd_event_t *nd_event;
 
-  if ((pool_elts (am->arp_events) == 0) && (pool_elts (am->nd_events) == 0))
+  if (pool_elts (am->arp_events) == 0 && pool_elts (am->nd_events) == 0 &&
+      pool_elts (am->wc_ip4_arp_events_registrations) == 0 &&
+      pool_elts (am->wc_ip6_nd_events_registrations) == 0)
     {
       vlib_cli_output (vm, "No active arp or nd event registrations");
       return 0;
@@ -2312,10 +737,23 @@ show_ip_arp_nd_events_fn (vlib_main_t * vm,
     vlib_cli_output (vm, "%U", format_arp_event, arp_event);
   }));
 
+  vpe_client_registration_t *reg;
+  pool_foreach(reg, am->wc_ip4_arp_events_registrations,
+  ({
+    vlib_cli_output (vm, "pid %d: bd mac/ip4 binding events",
+                     ntohl (reg->client_pid));
+  }));
+
   pool_foreach (nd_event, am->nd_events,
   ({
     vlib_cli_output (vm, "%U", format_nd_event, nd_event);
   }));
+
+  pool_foreach(reg, am->wc_ip6_nd_events_registrations,
+  ({
+    vlib_cli_output (vm, "pid %d: bd mac/ip6 binding events",
+                     ntohl (reg->client_pid));
+  }));
   /* *INDENT-ON* */
 
   return 0;
@@ -2340,6 +778,11 @@ setup_message_id_table (api_main_t * am)
   foreach_vl_msg_name_crc_memclnt;
   foreach_vl_msg_name_crc_vpe;
 #undef _
+
+#define vl_api_version_tuple(n,mj, mi, p) \
+  vl_msg_api_add_version (am, #n, mj, mi, p);
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_api_version_tuple
 }