API:fix arp/ND event messages - remove context
[vpp.git] / src / vpp / api / api.c
index 3d6905d..de9a247 100644 (file)
 #include <vnet/ip/ip.h>
 #include <vnet/ip/ip6.h>
 #include <vnet/ip/ip6_neighbor.h>
-#include <vnet/dhcp/proxy.h>
-#include <vnet/dhcp/client.h>
-#if IPV6SR > 0
-#include <vnet/sr/sr.h>
+#if WITH_LIBSSL > 0
+#include <vnet/srv6/sr.h>
 #endif
-#include <vnet/dhcpv6/proxy.h>
 #include <vlib/vlib.h>
 #include <vlib/unix/unix.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vnet/classify/vnet_classify.h>
 #include <vnet/classify/input_acl.h>
-#include <vnet/classify/policer_classify.h>
-#include <vnet/classify/flow_classify.h>
 #include <vnet/l2/l2_classify.h>
-#include <vnet/vxlan/vxlan.h>
-#include <vnet/l2/l2_vtr.h>
-#include <vnet/vxlan-gpe/vxlan_gpe.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/policer/policer.h>
-#include <vnet/flow/flow_report.h>
-#include <vnet/flow/flow_report_classify.h>
 #include <vnet/ip/punt.h>
 #include <vnet/feature/feature.h>
 
@@ -94,8 +81,6 @@
 #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>
 #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_VXLAN_BYPASS, sw_interface_set_vxlan_bypass)         \
 _(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)                                 \
@@ -129,55 +112,28 @@ _(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)                                                        \
-_(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)                              \
 _(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_ADD_DEL_TABLE, classify_add_del_table)                      \
-_(CLASSIFY_ADD_DEL_SESSION, classify_add_del_session)                  \
 _(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)                                                \
-_(VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel)                           \
-_(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump)                                 \
 _(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter)                     \
-_(L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite)         \
 _(SHOW_VERSION, show_version)                                          \
-_(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel)                   \
-_(VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump)                         \
 _(INTERFACE_NAME_RENUMBER, interface_name_renumber)                    \
 _(WANT_IP4_ARP_EVENTS, want_ip4_arp_events)                             \
 _(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)                                 \
-_(COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable)          \
-_(COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable)          \
 _(GET_NODE_GRAPH, get_node_graph)                                       \
 _(IOAM_ENABLE, ioam_enable)                                             \
 _(IOAM_DISABLE, ioam_disable)                                           \
-_(POLICER_ADD_DEL, policer_add_del)                                     \
-_(POLICER_DUMP, policer_dump)                                           \
-_(POLICER_CLASSIFY_SET_INTERFACE, policer_classify_set_interface)       \
-_(POLICER_CLASSIFY_DUMP, policer_classify_dump)                         \
-_(CLASSIFY_TABLE_IDS,classify_table_ids)                                \
-_(CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface)             \
-_(CLASSIFY_TABLE_INFO,classify_table_info)                              \
-_(CLASSIFY_SESSION_DUMP,classify_session_dump)                          \
-_(CLASSIFY_SESSION_DETAILS,classify_session_details)                    \
-_(SET_IPFIX_EXPORTER, set_ipfix_exporter)                               \
-_(IPFIX_EXPORTER_DUMP, ipfix_exporter_dump)                             \
-_(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)                 \
 _(GET_NEXT_INDEX, get_next_index)                                       \
 _(PG_CREATE_INTERFACE, pg_create_interface)                             \
 _(PG_CAPTURE, pg_capture)                                               \
@@ -187,10 +143,7 @@ _(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)                                           \
-_(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)                               \
 _(FEATURE_ENABLE_DISABLE, feature_enable_disable)
 
 #define QUOTE_(x) #x
@@ -202,14 +155,14 @@ typedef enum
 } resolve_t;
 
 static vlib_node_registration_t vpe_resolver_process_node;
-vpe_api_main_t vpe_api_main;
+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 */
-int
-vl_api_memclnt_delete_callback (u32 client_index)
+static clib_error_t *
+memclnt_delete_callback (u32 client_index)
 {
   vpe_api_main_t *vam = &vpe_api_main;
   vpe_client_registration_t *rp;
@@ -230,6 +183,8 @@ vl_api_memclnt_delete_callback (u32 client_index)
   return 0;
 }
 
+VL_MSG_API_REAPER_FUNCTION (memclnt_delete_callback);
+
 pub_sub_handler (oam_events, OAM_EVENTS);
 
 #define RESOLUTION_EVENT 1
@@ -241,7 +196,7 @@ 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
+static void
 handle_ip4_arp_event (u32 pool_index)
 {
   vpe_api_main_t *vam = &vpe_api_main;
@@ -415,29 +370,6 @@ vl_api_sw_interface_set_vpath_t_handler (vl_api_sw_interface_set_vpath_t * mp)
   REPLY_MACRO (VL_API_SW_INTERFACE_SET_VPATH_REPLY);
 }
 
-static void
-  vl_api_sw_interface_set_vxlan_bypass_t_handler
-  (vl_api_sw_interface_set_vxlan_bypass_t * mp)
-{
-  vl_api_sw_interface_set_vxlan_bypass_reply_t *rmp;
-  int rv = 0;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  if (mp->is_ipv6)
-    {
-      /* not yet implemented */
-    }
-  else
-    vnet_feature_enable_disable ("ip4-unicast", "ip4-vxlan-bypass",
-                                sw_if_index, mp->enable, 0, 0);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_VXLAN_BYPASS_REPLY);
-}
-
 static void
   vl_api_sw_interface_set_l2_xconnect_t_handler
   (vl_api_sw_interface_set_l2_xconnect_t * mp)
@@ -475,21 +407,20 @@ static void
   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);
+  u32 rx_sw_if_index = ntohl (mp->rx_sw_if_index);
 
-  bd_index = bd_find_or_add_bd_index (bdm, bd_id);
 
   if (mp->enable)
     {
-      //VALIDATE_TX_SW_IF_INDEX(mp);
+      VALIDATE_BD_ID (mp);
+      u32 bd_id = ntohl (mp->bd_id);
+      u32 bd_index = bd_find_or_add_bd_index (bdm, bd_id);
+      u32 bvi = mp->bvi;
+      u8 shg = mp->shg;
       rv = set_int_l2_mode (vm, vnm, MODE_L2_BRIDGE,
                            rx_sw_if_index, bd_index, bvi, shg, 0);
     }
@@ -499,6 +430,7 @@ static void
     }
 
   BAD_RX_SW_IF_INDEX_LABEL;
+  BAD_BD_ID_LABEL;
 
   REPLY_MACRO (VL_API_SW_INTERFACE_SET_L2_BRIDGE_REPLY);
 }
@@ -513,6 +445,12 @@ vl_api_bd_ip_mac_add_del_t_handler (vl_api_bd_ip_mac_add_del_t * mp)
   u32 bd_index;
   uword *p;
 
+  if (bd_id == 0)
+    {
+      rv = VNET_API_ERROR_BD_NOT_MODIFIABLE;
+      goto out;
+    }
+
   p = hash_get (bdm->bd_index_by_bd_id, bd_id);
   if (p == 0)
     {
@@ -534,7 +472,7 @@ 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 hw_if_index, sw_if_index = (u32) ~ 0;
+  u32 sw_if_index = (u32) ~ 0;
   vnet_hw_interface_t *hi;
   int rv = 0;
   u32 id;
@@ -542,14 +480,18 @@ vl_api_create_vlan_subif_t_handler (vl_api_create_vlan_subif_t * mp)
   uword *p;
   vnet_interface_main_t *im = &vnm->interface_main;
   u64 sup_and_sub_key;
-  u64 *kp;
   unix_shared_memory_queue_t *q;
   clib_error_t *error;
 
   VALIDATE_SW_IF_INDEX (mp);
 
-  hw_if_index = ntohl (mp->sw_if_index);
-  hi = vnet_get_hw_interface (vnm, hw_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;
+    }
 
   id = ntohl (mp->vlan_id);
   if (id == 0 || id > 4095)
@@ -567,9 +509,6 @@ vl_api_create_vlan_subif_t_handler (vl_api_create_vlan_subif_t * mp)
       goto out;
     }
 
-  kp = clib_mem_alloc (sizeof (*kp));
-  *kp = sup_and_sub_key;
-
   memset (&template, 0, sizeof (template));
   template.type = VNET_SW_INTERFACE_TYPE_SUB;
   template.sup_sw_if_index = hi->sw_if_index;
@@ -586,6 +525,10 @@ vl_api_create_vlan_subif_t_handler (vl_api_create_vlan_subif_t * mp)
       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);
 
@@ -597,10 +540,10 @@ out:
     return;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_CREATE_VLAN_SUBIF_REPLY);
+  rmp->_vl_msg_id = htons (VL_API_CREATE_VLAN_SUBIF_REPLY);
   rmp->context = mp->context;
-  rmp->retval = ntohl (rv);
-  rmp->sw_if_index = ntohl (sw_if_index);
+  rmp->retval = htonl (rv);
+  rmp->sw_if_index = htonl (sw_if_index);
   vl_msg_api_send_shmem (q, (u8 *) & rmp);
 }
 
@@ -618,7 +561,6 @@ vl_api_create_subif_t_handler (vl_api_create_subif_t * mp)
   uword *p;
   vnet_interface_main_t *im = &vnm->interface_main;
   u64 sup_and_sub_key;
-  u64 *kp;
   clib_error_t *error;
 
   VALIDATE_SW_IF_INDEX (mp);
@@ -647,9 +589,6 @@ vl_api_create_subif_t_handler (vl_api_create_subif_t * mp)
       goto out;
     }
 
-  kp = clib_mem_alloc (sizeof (*kp));
-  *kp = sup_and_sub_key;
-
   memset (&template, 0, sizeof (template));
   template.type = VNET_SW_INTERFACE_TYPE_SUB;
   template.sup_sw_if_index = sw_if_index;
@@ -673,6 +612,9 @@ vl_api_create_subif_t_handler (vl_api_create_subif_t * mp)
       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);
 
@@ -729,20 +671,11 @@ static void
   int rv = 0;
   vnet_main_t *vnm = vnet_get_main ();
   vl_api_proxy_arp_intfc_enable_disable_reply_t *rmp;
-  vnet_sw_interface_t *si;
-  u32 sw_if_index;
 
   VALIDATE_SW_IF_INDEX (mp);
 
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
-    {
-      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
-      goto out;
-    }
-
-  si = vnet_get_sw_interface (vnm, sw_if_index);
+  vnet_sw_interface_t *si =
+    vnet_get_sw_interface (vnm, ntohl (mp->sw_if_index));
 
   ASSERT (si);
 
@@ -757,82 +690,6 @@ 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)
@@ -892,7 +749,7 @@ 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;
+  vl_api_vnet_get_summary_stats_reply_t *rmp;
   vlib_combined_counter_main_t *cm;
   vlib_counter_t v;
   int i, which;
@@ -906,7 +763,7 @@ vl_api_vnet_get_summary_stats_t_handler (vl_api_vnet_get_summary_stats_t * mp)
     return;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_VNET_SUMMARY_STATS_REPLY);
+  rmp->_vl_msg_id = ntohs (VL_API_VNET_GET_SUMMARY_STATS_REPLY);
   rmp->context = mp->context;
   rmp->retval = 0;
 
@@ -919,7 +776,7 @@ vl_api_vnet_get_summary_stats_t_handler (vl_api_vnet_get_summary_stats_t * mp)
   {
     which = cm - im->combined_sw_if_counters;
 
-    for (i = 0; i < vec_len (cm->maxi); i++)
+    for (i = 0; i < vlib_combined_counter_n_counters (cm); i++)
       {
        vlib_get_combined_counter (cm, i, &v);
        total_pkts[which] += v.packets;
@@ -966,9 +823,10 @@ ip4_reset_fib_t_handler (vl_api_reset_fib_t * mp)
   /* *INDENT-OFF* */
   pool_foreach (fib_table, im4->fibs,
   ({
-    fib = &fib_table->v4;
     vnet_sw_interface_t * si;
 
+    fib = pool_elt_at_index (im4->v4_fibs, fib_table->ft_index);
+
     if (fib->table_id != target_fib_id)
       continue;
 
@@ -996,7 +854,6 @@ ip4_reset_fib_t_handler (vl_api_reset_fib_t * mp)
 
     for (i = 0; i < vec_len (sw_if_indices_to_shut); i++) {
       sw_if_index = sw_if_indices_to_shut[i];
-      // vec_foreach (sw_if_index, sw_if_indices_to_shut) {
 
       u32 flags = vnet_sw_interface_get_flags (vnm, sw_if_index);
       flags &= ~(VNET_SW_INTERFACE_FLAG_ADMIN_UP);
@@ -1004,7 +861,6 @@ ip4_reset_fib_t_handler (vl_api_reset_fib_t * mp)
     }
 
     fib_table_flush(fib->index, FIB_PROTOCOL_IP4, FIB_SOURCE_API);
-    fib_table_flush(fib->index, FIB_PROTOCOL_IP4, FIB_SOURCE_INTERFACE);
 
     rv = 0;
     break;
@@ -1036,24 +892,27 @@ ip6_reset_fib_t_handler (vl_api_reset_fib_t * mp)
   pool_foreach (fib_table, im6->fibs,
   ({
     vnet_sw_interface_t * si;
-    fib = &(fib_table->v6);
+
+    fib = pool_elt_at_index (im6->v6_fibs, fib_table->ft_index);
 
     if (fib->table_id != target_fib_id)
       continue;
 
     vec_reset_length (sw_if_indices_to_shut);
 
+    /* Set the flow hash for this fib to the default */
+    vnet_set_ip6_flow_hash (fib->table_id, IP_FLOW_HASH_DEFAULT);
+
     /* 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);
-                  }));
+    ({
+      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];
-      // vec_foreach (sw_if_index, sw_if_indices_to_shut) {
 
       u32 flags = vnet_sw_interface_get_flags (vnm, sw_if_index);
       flags &= ~(VNET_SW_INTERFACE_FLAG_ADMIN_UP);
@@ -1061,7 +920,6 @@ ip6_reset_fib_t_handler (vl_api_reset_fib_t * mp)
     }
 
     fib_table_flush(fib->index, FIB_PROTOCOL_IP6, FIB_SOURCE_API);
-    fib_table_flush(fib->index, FIB_PROTOCOL_IP6, FIB_SOURCE_INTERFACE);
 
     rv = 0;
     break;
@@ -1086,168 +944,37 @@ vl_api_reset_fib_t_handler (vl_api_reset_fib_t * mp)
   REPLY_MACRO (VL_API_RESET_FIB_REPLY);
 }
 
-
-static void
-dhcpv4_proxy_config (vl_api_dhcp_proxy_config_t * mp)
-{
-  vl_api_dhcp_proxy_config_reply_t *rmp;
-  int rv;
-
-  rv = dhcp_proxy_set_server ((ip4_address_t *) (&mp->dhcp_server),
-                             (ip4_address_t *) (&mp->dhcp_src_address),
-                             (u32) ntohl (mp->vrf_id),
-                             (int) mp->insert_circuit_id,
-                             (int) (mp->is_add == 0));
-
-  REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_REPLY);
-}
-
-
-static void
-dhcpv6_proxy_config (vl_api_dhcp_proxy_config_t * mp)
-{
-  vl_api_dhcp_proxy_config_reply_t *rmp;
-  int rv = -1;
-
-  rv = dhcpv6_proxy_set_server ((ip6_address_t *) (&mp->dhcp_server),
-                               (ip6_address_t *) (&mp->dhcp_src_address),
-                               (u32) ntohl (mp->vrf_id),
-                               (int) mp->insert_circuit_id,
-                               (int) (mp->is_add == 0));
-
-  REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_REPLY);
-}
-
 static void
-dhcpv4_proxy_config_2 (vl_api_dhcp_proxy_config_2_t * mp)
-{
-  vl_api_dhcp_proxy_config_reply_t *rmp;
-  int rv;
-
-  rv = dhcp_proxy_set_server_2 ((ip4_address_t *) (&mp->dhcp_server),
-                               (ip4_address_t *) (&mp->dhcp_src_address),
-                               (u32) ntohl (mp->rx_vrf_id),
-                               (u32) ntohl (mp->server_vrf_id),
-                               (int) mp->insert_circuit_id,
-                               (int) (mp->is_add == 0));
-
-  REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_2_REPLY);
-}
-
-
-static void
-dhcpv6_proxy_config_2 (vl_api_dhcp_proxy_config_2_t * mp)
-{
-  vl_api_dhcp_proxy_config_reply_t *rmp;
-  int rv = -1;
-
-  rv = dhcpv6_proxy_set_server_2 ((ip6_address_t *) (&mp->dhcp_server),
-                                 (ip6_address_t *) (&mp->dhcp_src_address),
-                                 (u32) ntohl (mp->rx_vrf_id),
-                                 (u32) ntohl (mp->server_vrf_id),
-                                 (int) mp->insert_circuit_id,
-                                 (int) (mp->is_add == 0));
-
-  REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_2_REPLY);
-}
-
-
-static void
-vl_api_dhcp_proxy_set_vss_t_handler (vl_api_dhcp_proxy_set_vss_t * mp)
+vl_api_create_loopback_t_handler (vl_api_create_loopback_t * mp)
 {
-  vl_api_dhcp_proxy_set_vss_reply_t *rmp;
+  vl_api_create_loopback_reply_t *rmp;
+  u32 sw_if_index;
   int rv;
-  if (!mp->is_ipv6)
-    rv = dhcp_proxy_set_option82_vss (ntohl (mp->tbl_id),
-                                     ntohl (mp->oui),
-                                     ntohl (mp->fib_id),
-                                     (int) mp->is_add == 0);
-  else
-    rv = dhcpv6_proxy_set_vss (ntohl (mp->tbl_id),
-                              ntohl (mp->oui),
-                              ntohl (mp->fib_id), (int) mp->is_add == 0);
-
-  REPLY_MACRO (VL_API_DHCP_PROXY_SET_VSS_REPLY);
-}
-
-
-static void vl_api_dhcp_proxy_config_t_handler
-  (vl_api_dhcp_proxy_config_t * mp)
-{
-  if (mp->is_ipv6 == 0)
-    dhcpv4_proxy_config (mp);
-  else
-    dhcpv6_proxy_config (mp);
-}
-
-static void vl_api_dhcp_proxy_config_2_t_handler
-  (vl_api_dhcp_proxy_config_2_t * mp)
-{
-  if (mp->is_ipv6 == 0)
-    dhcpv4_proxy_config_2 (mp);
-  else
-    dhcpv6_proxy_config_2 (mp);
-}
-
-void
-dhcp_compl_event_callback (u32 client_index, u32 pid, u8 * hostname,
-                          u8 is_ipv6, u8 * host_address, u8 * router_address,
-                          u8 * host_mac)
-{
-  unix_shared_memory_queue_t *q;
-  vl_api_dhcp_compl_event_t *mp;
-
-  q = vl_api_client_index_to_input_queue (client_index);
-  if (!q)
-    return;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  mp->client_index = client_index;
-  mp->pid = pid;
-  mp->is_ipv6 = is_ipv6;
-  clib_memcpy (&mp->hostname, hostname, vec_len (hostname));
-  mp->hostname[vec_len (hostname) + 1] = '\n';
-  clib_memcpy (&mp->host_address[0], host_address, 16);
-  clib_memcpy (&mp->router_address[0], router_address, 16);
-
-  if (NULL != host_mac)
-    clib_memcpy (&mp->host_mac[0], host_mac, 6);
-
-  mp->_vl_msg_id = ntohs (VL_API_DHCP_COMPL_EVENT);
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void vl_api_dhcp_client_config_t_handler
-  (vl_api_dhcp_client_config_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_dhcp_client_config_reply_t *rmp;
-  int rv = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
 
-  rv = dhcp_client_config (vm, ntohl (mp->sw_if_index),
-                          mp->hostname, mp->is_add, mp->client_index,
-                          mp->want_dhcp_event ? dhcp_compl_event_callback :
-                          NULL, mp->pid);
+  rv = vnet_create_loopback_interface (&sw_if_index, mp->mac_address, 0, 0);
 
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_DHCP_CLIENT_CONFIG_REPLY);
+  /* *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_t_handler (vl_api_create_loopback_t * mp)
+static void vl_api_create_loopback_instance_t_handler
+  (vl_api_create_loopback_instance_t * mp)
 {
-  vl_api_create_loopback_reply_t *rmp;
+  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);
+  rv = vnet_create_loopback_interface (&sw_if_index, mp->mac_address,
+                                      is_specified, user_instance);
 
   /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_CREATE_LOOPBACK_REPLY,
+  REPLY_MACRO2(VL_API_CREATE_LOOPBACK_INSTANCE_REPLY,
   ({
     rmp->sw_if_index = ntohl (sw_if_index);
   }));
@@ -1309,7 +1036,7 @@ 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;
@@ -1412,112 +1139,18 @@ vl_api_set_arp_neighbor_limit_t_handler (vl_api_set_arp_neighbor_limit_t * mp)
   REPLY_MACRO (VL_API_SET_ARP_NEIGHBOR_LIMIT_REPLY);
 }
 
-#define foreach_classify_add_del_table_field    \
-_(table_index)                                  \
-_(nbuckets)                                     \
-_(memory_size)                                  \
-_(skip_n_vectors)                               \
-_(match_n_vectors)                              \
-_(next_table_index)                             \
-_(miss_next_index)                              \
-_(current_data_flag)                            \
-_(current_data_offset)
-
-static void vl_api_classify_add_del_table_t_handler
-  (vl_api_classify_add_del_table_t * mp)
-{
-  vl_api_classify_add_del_table_reply_t *rmp;
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  vnet_classify_table_t *t;
-  int rv;
-
-#define _(a) u32 a;
-  foreach_classify_add_del_table_field;
-#undef _
-
-#define _(a) a = ntohl(mp->a);
-  foreach_classify_add_del_table_field;
-#undef _
-
-  /* The underlying API fails silently, on purpose, so check here */
-  if (mp->is_add == 0)         /* delete */
-    {
-      if (pool_is_free_index (cm->tables, table_index))
-       {
-         rv = VNET_API_ERROR_NO_SUCH_TABLE;
-         goto out;
-       }
-    }
-  else                         /* add or update */
-    {
-      if (table_index != ~0 && pool_is_free_index (cm->tables, table_index))
-       table_index = ~0;
-    }
-
-  rv = vnet_classify_add_del_table
-    (cm, mp->mask, nbuckets, memory_size,
-     skip_n_vectors, match_n_vectors,
-     next_table_index, miss_next_index, &table_index,
-     current_data_flag, current_data_offset, mp->is_add, mp->del_chain);
-
-out:
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_CLASSIFY_ADD_DEL_TABLE_REPLY,
-  ({
-    if (rv == 0 && mp->is_add)
-      {
-        t = pool_elt_at_index (cm->tables, table_index);
-        rmp->skip_n_vectors = ntohl(t->skip_n_vectors);
-        rmp->match_n_vectors = ntohl(t->match_n_vectors);
-        rmp->new_table_index = ntohl(table_index);
-      }
-    else
-      {
-        rmp->skip_n_vectors = ~0;
-        rmp->match_n_vectors = ~0;
-        rmp->new_table_index = ~0;
-      }
-  }));
-  /* *INDENT-ON* */
-}
-
-static void vl_api_classify_add_del_session_t_handler
-  (vl_api_classify_add_del_session_t * mp)
-{
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  vl_api_classify_add_del_session_reply_t *rmp;
-  int rv;
-  u32 table_index, hit_next_index, opaque_index, metadata;
-  i32 advance;
-  u8 action;
-
-  table_index = ntohl (mp->table_index);
-  hit_next_index = ntohl (mp->hit_next_index);
-  opaque_index = ntohl (mp->opaque_index);
-  advance = ntohl (mp->advance);
-  action = mp->action;
-  metadata = ntohl (mp->metadata);
-
-  rv = vnet_classify_add_del_session
-    (cm, table_index, mp->match, hit_next_index, opaque_index,
-     advance, action, metadata, mp->is_add);
-
-  REPLY_MACRO (VL_API_CLASSIFY_ADD_DEL_SESSION_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;
-  u32 table_index, sw_if_index;
-
-  table_index = ntohl (mp->table_index);
-  sw_if_index = ntohl (mp->sw_if_index);
 
   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
@@ -1589,48 +1222,6 @@ vl_api_l2_interface_efp_filter_t_handler (vl_api_l2_interface_efp_filter_t *
   REPLY_MACRO (VL_API_L2_INTERFACE_EFP_FILTER_REPLY);
 }
 
-static void
-  vl_api_l2_interface_vlan_tag_rewrite_t_handler
-  (vl_api_l2_interface_vlan_tag_rewrite_t * mp)
-{
-  int rv = 0;
-  vl_api_l2_interface_vlan_tag_rewrite_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
-  u32 vtr_op;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  vtr_op = ntohl (mp->vtr_op);
-
-  /* The L2 code is unsuspicious */
-  switch (vtr_op)
-    {
-    case L2_VTR_DISABLED:
-    case L2_VTR_PUSH_1:
-    case L2_VTR_PUSH_2:
-    case L2_VTR_POP_1:
-    case L2_VTR_POP_2:
-    case L2_VTR_TRANSLATE_1_1:
-    case L2_VTR_TRANSLATE_1_2:
-    case L2_VTR_TRANSLATE_2_1:
-    case L2_VTR_TRANSLATE_2_2:
-      break;
-
-    default:
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto bad_sw_if_index;
-    }
-
-  rv = l2vtr_configure (vm, vnm, ntohl (mp->sw_if_index), vtr_op,
-                       ntohl (mp->push_dot1q), ntohl (mp->tag1),
-                       ntohl (mp->tag2));
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_L2_INTERFACE_VLAN_TAG_REWRITE_REPLY);
-}
-
 static void
 vl_api_show_version_t_handler (vl_api_show_version_t * mp)
 {
@@ -1764,303 +1355,29 @@ out:
   /* *INDENT-ON* */
 }
 
-static void vl_api_vxlan_add_del_tunnel_t_handler
-  (vl_api_vxlan_add_del_tunnel_t * mp)
+static void
+vl_api_l2_patch_add_del_t_handler (vl_api_l2_patch_add_del_t * mp)
 {
-  vl_api_vxlan_add_del_tunnel_reply_t *rmp;
+  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;
-  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;
 
-  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));
+  VALIDATE_RX_SW_IF_INDEX (mp);
+  VALIDATE_TX_SW_IF_INDEX (mp);
 
-  a->is_add = mp->is_add;
-  a->is_ip6 = mp->is_ipv6;
+  rv = vnet_l2_patch_add_del (ntohl (mp->rx_sw_if_index),
+                             ntohl (mp->tx_sw_if_index),
+                             (int) (mp->is_add != 0));
 
-  /* 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);
-  if (ip46_address_is_multicast (&a->dst) &&
-      pool_is_free_index (vnm->interface_main.sw_interfaces,
-                         a->mcast_sw_if_index))
-    {
-      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
-      goto out;
-    }
-  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* */
-  REPLY_MACRO2(VL_API_VXLAN_ADD_DEL_TUNNEL_REPLY,
-  ({
-    rmp->sw_if_index = ntohl (sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void send_vxlan_tunnel_details
-  (vxlan_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_vxlan_tunnel_details_t *rmp;
-  ip4_main_t *im4 = &ip4_main;
-  ip6_main_t *im6 = &ip6_main;
-  u8 is_ipv6 = !ip46_address_is_ip4 (&t->dst);
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_VXLAN_TUNNEL_DETAILS);
-  if (is_ipv6)
-    {
-      memcpy (rmp->src_address, t->src.ip6.as_u8, 16);
-      memcpy (rmp->dst_address, t->dst.ip6.as_u8, 16);
-      rmp->encap_vrf_id = htonl (im6->fibs[t->encap_fib_index].ft_table_id);
-    }
-  else
-    {
-      memcpy (rmp->src_address, t->src.ip4.as_u8, 4);
-      memcpy (rmp->dst_address, t->dst.ip4.as_u8, 4);
-      rmp->encap_vrf_id = htonl (im4->fibs[t->encap_fib_index].ft_table_id);
-    }
-  rmp->mcast_sw_if_index = htonl (t->mcast_sw_if_index);
-  rmp->vni = htonl (t->vni);
-  rmp->decap_next_index = htonl (t->decap_next_index);
-  rmp->sw_if_index = htonl (t->sw_if_index);
-  rmp->is_ipv6 = is_ipv6;
-  rmp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void vl_api_vxlan_tunnel_dump_t_handler
-  (vl_api_vxlan_tunnel_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  vxlan_main_t *vxm = &vxlan_main;
-  vxlan_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, vxm->tunnels,
-      ({
-        send_vxlan_tunnel_details(t, q, mp->context);
-      }));
-      /* *INDENT-ON* */
-    }
-  else
-    {
-      if ((sw_if_index >= vec_len (vxm->tunnel_index_by_sw_if_index)) ||
-         (~0 == vxm->tunnel_index_by_sw_if_index[sw_if_index]))
-       {
-         return;
-       }
-      t = &vxm->tunnels[vxm->tunnel_index_by_sw_if_index[sw_if_index]];
-      send_vxlan_tunnel_details (t, q, mp->context);
-    }
-}
-
-static void
-vl_api_l2_patch_add_del_t_handler (vl_api_l2_patch_add_del_t * mp)
-{
-  extern int vnet_l2_patch_add_del (u32 rx_sw_if_index, u32 tx_sw_if_index,
-                                   int is_add);
-  vl_api_l2_patch_add_del_reply_t *rmp;
-  int vnet_l2_patch_add_del (u32 rx_sw_if_index, u32 tx_sw_if_index,
-                            int is_add);
-  int rv = 0;
-
-  VALIDATE_RX_SW_IF_INDEX (mp);
-  VALIDATE_TX_SW_IF_INDEX (mp);
-
-  rv = vnet_l2_patch_add_del (ntohl (mp->rx_sw_if_index),
-                             ntohl (mp->tx_sw_if_index),
-                             (int) (mp->is_add != 0));
-
-  BAD_RX_SW_IF_INDEX_LABEL;
-  BAD_TX_SW_IF_INDEX_LABEL;
+  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_vxlan_gpe_add_del_tunnel_t_handler
-  (vl_api_vxlan_gpe_add_del_tunnel_t * mp)
-{
-  vl_api_vxlan_gpe_add_del_tunnel_reply_t *rmp;
-  int rv = 0;
-  vnet_vxlan_gpe_add_del_tunnel_args_t _a, *a = &_a;
-  u32 encap_fib_index, decap_fib_index;
-  u8 protocol;
-  uword *p;
-  ip4_main_t *im = &ip4_main;
-  u32 sw_if_index = ~0;
-
-
-  p = hash_get (im->fib_index_by_table_id, ntohl (mp->encap_vrf_id));
-  if (!p)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_FIB;
-      goto out;
-    }
-  encap_fib_index = p[0];
-
-  protocol = mp->protocol;
-
-  /* Interpret decap_vrf_id as an opaque if sending to other-than-ip4-input */
-  if (protocol == VXLAN_GPE_INPUT_NEXT_IP4_INPUT)
-    {
-      p = hash_get (im->fib_index_by_table_id, ntohl (mp->decap_vrf_id));
-      if (!p)
-       {
-         rv = VNET_API_ERROR_NO_SUCH_INNER_FIB;
-         goto out;
-       }
-      decap_fib_index = p[0];
-    }
-  else
-    {
-      decap_fib_index = ntohl (mp->decap_vrf_id);
-    }
-
-  /* Check src & dst are different */
-  if ((mp->is_ipv6 && memcmp (mp->local, mp->remote, 16) == 0) ||
-      (!mp->is_ipv6 && memcmp (mp->local, mp->remote, 4) == 0))
-    {
-      rv = VNET_API_ERROR_SAME_SRC_DST;
-      goto out;
-    }
-  memset (a, 0, sizeof (*a));
-
-  a->is_add = mp->is_add;
-  a->is_ip6 = mp->is_ipv6;
-  /* ip addresses sent in network byte order */
-  if (a->is_ip6)
-    {
-      clib_memcpy (&(a->local.ip6), mp->local, 16);
-      clib_memcpy (&(a->remote.ip6), mp->remote, 16);
-    }
-  else
-    {
-      clib_memcpy (&(a->local.ip4), mp->local, 4);
-      clib_memcpy (&(a->remote.ip4), mp->remote, 4);
-    }
-  a->encap_fib_index = encap_fib_index;
-  a->decap_fib_index = decap_fib_index;
-  a->protocol = protocol;
-  a->vni = ntohl (mp->vni);
-  rv = vnet_vxlan_gpe_add_del_tunnel (a, &sw_if_index);
-
-out:
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_VXLAN_GPE_ADD_DEL_TUNNEL_REPLY,
-  ({
-    rmp->sw_if_index = ntohl (sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void send_vxlan_gpe_tunnel_details
-  (vxlan_gpe_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_vxlan_gpe_tunnel_details_t *rmp;
-  ip4_main_t *im4 = &ip4_main;
-  ip6_main_t *im6 = &ip6_main;
-  u8 is_ipv6 = !(t->flags & VXLAN_GPE_TUNNEL_IS_IPV4);
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_VXLAN_GPE_TUNNEL_DETAILS);
-  if (is_ipv6)
-    {
-      memcpy (rmp->local, &(t->local.ip6), 16);
-      memcpy (rmp->remote, &(t->remote.ip6), 16);
-      rmp->encap_vrf_id = htonl (im6->fibs[t->encap_fib_index].ft_table_id);
-      rmp->decap_vrf_id = htonl (im6->fibs[t->decap_fib_index].ft_table_id);
-    }
-  else
-    {
-      memcpy (rmp->local, &(t->local.ip4), 4);
-      memcpy (rmp->remote, &(t->remote.ip4), 4);
-      rmp->encap_vrf_id = htonl (im4->fibs[t->encap_fib_index].ft_table_id);
-      rmp->decap_vrf_id = htonl (im4->fibs[t->decap_fib_index].ft_table_id);
-    }
-  rmp->vni = htonl (t->vni);
-  rmp->protocol = t->protocol;
-  rmp->sw_if_index = htonl (t->sw_if_index);
-  rmp->is_ipv6 = is_ipv6;
-  rmp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void vl_api_vxlan_gpe_tunnel_dump_t_handler
-  (vl_api_vxlan_gpe_tunnel_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  vxlan_gpe_main_t *vgm = &vxlan_gpe_main;
-  vxlan_gpe_tunnel_t *t;
-  u32 sw_if_index;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  if (~0 == sw_if_index)
-    {
-      /* *INDENT-OFF* */
-      pool_foreach (t, vgm->tunnels,
-      ({
-        send_vxlan_gpe_tunnel_details(t, q, mp->context);
-      }));
-      /* *INDENT-ON* */
-    }
-  else
-    {
-      if ((sw_if_index >= vec_len (vgm->tunnel_index_by_sw_if_index)) ||
-         (~0 == vgm->tunnel_index_by_sw_if_index[sw_if_index]))
-       {
-         return;
-       }
-      t = &vgm->tunnels[vgm->tunnel_index_by_sw_if_index[sw_if_index]];
-      send_vxlan_gpe_tunnel_details (t, q, mp->context);
-    }
-}
-
 static void
 vl_api_interface_name_renumber_t_handler (vl_api_interface_name_renumber_t *
                                          mp)
@@ -2099,7 +1416,7 @@ arp_change_data_callback (u32 pool_index, u8 * new_mac,
     }
   else
     {                          /* same mac */
-      if (sw_if_index == event->sw_if_index &&
+      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 &&
@@ -2109,7 +1426,7 @@ arp_change_data_callback (u32 pool_index, u8 * new_mac,
   /* *INDENT-ON* */
 
   arp_event_last_time = now;
-  event->sw_if_index = sw_if_index;
+  event->sw_if_index = htonl (sw_if_index);
   if (event->mac_ip)
     event->address = address;
   return 0;
@@ -2137,7 +1454,7 @@ nd_change_data_callback (u32 pool_index, u8 * new_mac,
     }
   else
     {                          /* same mac */
-      if (sw_if_index == event->sw_if_index &&
+      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,
@@ -2148,958 +1465,220 @@ nd_change_data_callback (u32 pool_index, u8 * new_mac,
   /* *INDENT-ON* */
 
   nd_event_last_time = now;
-  event->sw_if_index = sw_if_index;
+  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)
-    {
-      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_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_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_classify_table_ids_t_handler (vl_api_classify_table_ids_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  vnet_classify_table_t *t;
-  u32 *table_ids = 0;
-  u32 count;
-
-  /* *INDENT-OFF* */
-  pool_foreach (t, cm->tables,
-  ({
-    vec_add1 (table_ids, ntohl(t - cm->tables));
-  }));
-  /* *INDENT-ON* */
-  count = vec_len (table_ids);
-
-  vl_api_classify_table_ids_reply_t *rmp;
-  rmp = vl_msg_api_alloc_as_if_client (sizeof (*rmp) + count * sizeof (u32));
-  rmp->_vl_msg_id = ntohs (VL_API_CLASSIFY_TABLE_IDS_REPLY);
-  rmp->context = mp->context;
-  rmp->count = ntohl (count);
-  clib_memcpy (rmp->ids, table_ids, count * sizeof (u32));
-  rmp->retval = 0;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-
-  vec_free (table_ids);
-}
-
-static void
-  vl_api_classify_table_by_interface_t_handler
-  (vl_api_classify_table_by_interface_t * mp)
-{
-  vl_api_classify_table_by_interface_reply_t *rmp;
-  int rv = 0;
-
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  u32 *acl = 0;
-
-  vec_validate (acl, INPUT_ACL_N_TABLES - 1);
-  vec_set (acl, ~0);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  input_acl_main_t *am = &input_acl_main;
-
-  int if_idx;
-  u32 type;
-
-  for (type = 0; type < INPUT_ACL_N_TABLES; type++)
-    {
-      u32 *vec_tbl = am->classify_table_index_by_sw_if_index[type];
-      if (vec_len (vec_tbl))
-       {
-         for (if_idx = 0; if_idx < vec_len (vec_tbl); if_idx++)
-           {
-             if (vec_elt (vec_tbl, if_idx) == ~0 || sw_if_index != if_idx)
-               {
-                 continue;
-               }
-             acl[type] = vec_elt (vec_tbl, if_idx);
-           }
-       }
-    }
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_CLASSIFY_TABLE_BY_INTERFACE_REPLY,
-  ({
-    rmp->sw_if_index = ntohl(sw_if_index);
-    rmp->l2_table_id = ntohl(acl[INPUT_ACL_TABLE_L2]);
-    rmp->ip4_table_id = ntohl(acl[INPUT_ACL_TABLE_IP4]);
-    rmp->ip6_table_id = ntohl(acl[INPUT_ACL_TABLE_IP6]);
-  }));
-  /* *INDENT-ON* */
-  vec_free (acl);
-}
-
-static void
-vl_api_classify_table_info_t_handler (vl_api_classify_table_info_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  vl_api_classify_table_info_reply_t *rmp = 0;
-
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  u32 table_id = ntohl (mp->table_id);
-  vnet_classify_table_t *t;
-
-  /* *INDENT-OFF* */
-  pool_foreach (t, cm->tables,
-  ({
-    if (table_id == t - cm->tables)
-      {
-        rmp = vl_msg_api_alloc_as_if_client
-          (sizeof (*rmp) + t->match_n_vectors * sizeof (u32x4));
-        rmp->_vl_msg_id = ntohs (VL_API_CLASSIFY_TABLE_INFO_REPLY);
-        rmp->context = mp->context;
-        rmp->table_id = ntohl(table_id);
-        rmp->nbuckets = ntohl(t->nbuckets);
-        rmp->match_n_vectors = ntohl(t->match_n_vectors);
-        rmp->skip_n_vectors = ntohl(t->skip_n_vectors);
-        rmp->active_sessions = ntohl(t->active_elements);
-        rmp->next_table_index = ntohl(t->next_table_index);
-        rmp->miss_next_index = ntohl(t->miss_next_index);
-        rmp->mask_length = ntohl(t->match_n_vectors * sizeof (u32x4));
-        clib_memcpy(rmp->mask, t->mask, t->match_n_vectors * sizeof(u32x4));
-        rmp->retval = 0;
-        break;
-      }
-  }));
-  /* *INDENT-ON* */
-
-  if (rmp == 0)
-    {
-      rmp = vl_msg_api_alloc (sizeof (*rmp));
-      rmp->_vl_msg_id = ntohs ((VL_API_CLASSIFY_TABLE_INFO_REPLY));
-      rmp->context = mp->context;
-      rmp->retval = ntohl (VNET_API_ERROR_CLASSIFY_TABLE_NOT_FOUND);
-    }
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_classify_session_details_t_handler (vl_api_classify_session_details_t *
-                                          mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-send_classify_session_details (unix_shared_memory_queue_t * q,
-                              u32 table_id,
-                              u32 match_length,
-                              vnet_classify_entry_t * e, u32 context)
-{
-  vl_api_classify_session_details_t *rmp;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_CLASSIFY_SESSION_DETAILS);
-  rmp->context = context;
-  rmp->table_id = ntohl (table_id);
-  rmp->hit_next_index = ntohl (e->next_index);
-  rmp->advance = ntohl (e->advance);
-  rmp->opaque_index = ntohl (e->opaque_index);
-  rmp->match_length = ntohl (match_length);
-  clib_memcpy (rmp->match, e->key, match_length);
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_classify_session_dump_t_handler (vl_api_classify_session_dump_t * mp)
-{
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  unix_shared_memory_queue_t *q;
-
-  u32 table_id = ntohl (mp->table_id);
-  vnet_classify_table_t *t;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
-
-  /* *INDENT-OFF* */
-  pool_foreach (t, cm->tables,
-  ({
-    if (table_id == t - cm->tables)
-      {
-        vnet_classify_bucket_t * b;
-        vnet_classify_entry_t * v, * save_v;
-        int i, j, k;
-
-        for (i = 0; i < t->nbuckets; i++)
-          {
-            b = &t->buckets [i];
-            if (b->offset == 0)
-              continue;
-
-            save_v = vnet_classify_get_entry (t, b->offset);
-            for (j = 0; j < (1<<b->log2_pages); j++)
-              {
-                for (k = 0; k < t->entries_per_page; k++)
-                  {
-                    v = vnet_classify_entry_at_index
-                      (t, save_v, j*t->entries_per_page + k);
-                    if (vnet_classify_entry_is_free (v))
-                      continue;
-
-                    send_classify_session_details
-                      (q, table_id, t->match_n_vectors * sizeof (u32x4),
-                       v, mp->context);
-                  }
-              }
-          }
-        break;
-      }
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_set_ipfix_exporter_t_handler (vl_api_set_ipfix_exporter_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  flow_report_main_t *frm = &flow_report_main;
-  vl_api_set_ipfix_exporter_reply_t *rmp;
-  ip4_address_t collector, src;
-  u16 collector_port = UDP_DST_PORT_ipfix;
-  u32 path_mtu;
-  u32 template_interval;
-  u8 udp_checksum;
-  u32 fib_id;
-  u32 fib_index = ~0;
-  int rv = 0;
-
-  memcpy (collector.data, mp->collector_address, sizeof (collector.data));
-  collector_port = ntohs (mp->collector_port);
-  if (collector_port == (u16) ~ 0)
-    collector_port = UDP_DST_PORT_ipfix;
-  memcpy (src.data, mp->src_address, sizeof (src.data));
-  fib_id = ntohl (mp->vrf_id);
-
-  ip4_main_t *im = &ip4_main;
-  if (fib_id == ~0)
-    {
-      fib_index = ~0;
-    }
-  else
-    {
-      uword *p = hash_get (im->fib_index_by_table_id, fib_id);
-      if (!p)
-       {
-         rv = VNET_API_ERROR_NO_SUCH_FIB;
-         goto out;
-       }
-      fib_index = p[0];
-    }
-
-  path_mtu = ntohl (mp->path_mtu);
-  if (path_mtu == ~0)
-    path_mtu = 512;            // RFC 7011 section 10.3.3.
-  template_interval = ntohl (mp->template_interval);
-  if (template_interval == ~0)
-    template_interval = 20;
-  udp_checksum = mp->udp_checksum;
-
-  if (collector.as_u32 == 0)
-    {
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto out;
-    }
-
-  if (src.as_u32 == 0)
-    {
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto out;
-    }
-
-  if (path_mtu > 1450 /* vpp does not support fragmentation */ )
-    {
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto out;
-    }
-
-  if (path_mtu < 68)
-    {
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto out;
-    }
-
-  /* Reset report streams if we are reconfiguring IP addresses */
-  if (frm->ipfix_collector.as_u32 != collector.as_u32 ||
-      frm->src_address.as_u32 != src.as_u32 ||
-      frm->collector_port != collector_port)
-    vnet_flow_reports_reset (frm);
-
-  frm->ipfix_collector.as_u32 = collector.as_u32;
-  frm->collector_port = collector_port;
-  frm->src_address.as_u32 = src.as_u32;
-  frm->fib_index = fib_index;
-  frm->path_mtu = path_mtu;
-  frm->template_interval = template_interval;
-  frm->udp_checksum = udp_checksum;
-
-  /* Turn on the flow reporting process */
-  vlib_process_signal_event (vm, flow_report_process_node.index, 1, 0);
-
-out:
-  REPLY_MACRO (VL_API_SET_IPFIX_EXPORTER_REPLY);
+    clib_memcpy (event->address, address, sizeof (event->address));
+  return 0;
 }
 
-static void
-vl_api_ipfix_exporter_dump_t_handler (vl_api_ipfix_exporter_dump_t * mp)
+static int
+arp_change_delete_callback (u32 pool_index, u8 * notused)
 {
-  flow_report_main_t *frm = &flow_report_main;
-  unix_shared_memory_queue_t *q;
-  vl_api_ipfix_exporter_details_t *rmp;
-  ip4_main_t *im = &ip4_main;
-  u32 vrf_id;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
+  vpe_api_main_t *am = &vpe_api_main;
 
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_IPFIX_EXPORTER_DETAILS);
-  rmp->context = mp->context;
-  memcpy (rmp->collector_address, frm->ipfix_collector.data,
-         sizeof (frm->ipfix_collector.data));
-  rmp->collector_port = htons (frm->collector_port);
-  memcpy (rmp->src_address, frm->src_address.data,
-         sizeof (frm->src_address.data));
-  if (frm->fib_index == ~0)
-    vrf_id = ~0;
-  else
-    vrf_id = im->fibs[frm->fib_index].ft_table_id;
-  rmp->vrf_id = htonl (vrf_id);
-  rmp->path_mtu = htonl (frm->path_mtu);
-  rmp->template_interval = htonl (frm->template_interval);
-  rmp->udp_checksum = (frm->udp_checksum != 0);
+  if (pool_is_free_index (am->arp_events, pool_index))
+    return 1;
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+  pool_put_index (am->arp_events, pool_index);
+  return 0;
 }
 
-static void
-  vl_api_set_ipfix_classify_stream_t_handler
-  (vl_api_set_ipfix_classify_stream_t * mp)
-{
-  vl_api_set_ipfix_classify_stream_reply_t *rmp;
-  flow_report_classify_main_t *fcm = &flow_report_classify_main;
-  flow_report_main_t *frm = &flow_report_main;
-  u32 domain_id = 0;
-  u32 src_port = UDP_DST_PORT_ipfix;
-  int rv = 0;
-
-  domain_id = ntohl (mp->domain_id);
-  src_port = ntohs (mp->src_port);
-
-  if (fcm->src_port != 0 &&
-      (fcm->domain_id != domain_id || fcm->src_port != (u16) src_port))
-    {
-      int rv = vnet_stream_change (frm, fcm->domain_id, fcm->src_port,
-                                  domain_id, (u16) src_port);
-      ASSERT (rv == 0);
-    }
+static int
+nd_change_delete_callback (u32 pool_index, u8 * notused)
+{
+  vpe_api_main_t *am = &vpe_api_main;
 
-  fcm->domain_id = domain_id;
-  fcm->src_port = (u16) src_port;
+  if (pool_is_free_index (am->nd_events, pool_index))
+    return 1;
 
-  REPLY_MACRO (VL_API_SET_IPFIX_CLASSIFY_STREAM_REPLY);
+  pool_put_index (am->nd_events, pool_index);
+  return 0;
 }
 
 static void
-  vl_api_ipfix_classify_stream_dump_t_handler
-  (vl_api_ipfix_classify_stream_dump_t * mp)
+vl_api_want_ip4_arp_events_t_handler (vl_api_want_ip4_arp_events_t * mp)
 {
-  flow_report_classify_main_t *fcm = &flow_report_classify_main;
-  unix_shared_memory_queue_t *q;
-  vl_api_ipfix_classify_stream_details_t *rmp;
+  vpe_api_main_t *am = &vpe_api_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  vl_api_want_ip4_arp_events_reply_t *rmp;
+  int rv;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
+  if (mp->enable_disable)
+    {
+      vl_api_ip4_arp_event_t *event;
+      pool_get (am->arp_events, event);
+      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 */ );
 
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_IPFIX_CLASSIFY_STREAM_DETAILS);
-  rmp->context = mp->context;
-  rmp->domain_id = htonl (fcm->domain_id);
-  rmp->src_port = htons (fcm->src_port);
+      if (rv)
+       {
+         pool_put (am->arp_events, event);
+         goto out;
+       }
+      memset (event, 0, sizeof (*event));
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+      /* Python API expects events to have no context */
+      event->_vl_msg_id = ntohs (VL_API_IP4_ARP_EVENT);
+      event->client_index = mp->client_index;
+      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_ipfix_classify_table_add_del_t_handler
-  (vl_api_ipfix_classify_table_add_del_t * mp)
-{
-  vl_api_ipfix_classify_table_add_del_reply_t *rmp;
-  flow_report_classify_main_t *fcm = &flow_report_classify_main;
-  flow_report_main_t *frm = &flow_report_main;
-  vnet_flow_report_add_del_args_t args;
-  ipfix_classify_table_t *table;
-  int is_add;
-  u32 classify_table_index;
-  u8 ip_version;
-  u8 transport_protocol;
-  int rv = 0;
-
-  classify_table_index = ntohl (mp->table_id);
-  ip_version = mp->ip_version;
-  transport_protocol = mp->transport_protocol;
-  is_add = mp->is_add;
+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;
+  int rv;
 
-  if (fcm->src_port == 0)
+  if (mp->enable_disable)
     {
-      /* call set_ipfix_classify_stream first */
-      rv = VNET_API_ERROR_UNSPECIFIED;
-      goto out;
-    }
-
-  memset (&args, 0, sizeof (args));
+      vl_api_ip6_nd_event_t *event;
+      pool_get (am->nd_events, event);
 
-  table = 0;
-  int i;
-  for (i = 0; i < vec_len (fcm->tables); i++)
-    if (ipfix_classify_table_index_valid (i))
-      if (fcm->tables[i].classify_table_index == classify_table_index)
-       {
-         table = &fcm->tables[i];
-         break;
-       }
+      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 */ );
 
-  if (is_add)
-    {
-      if (table)
+      if (rv)
        {
-         rv = VNET_API_ERROR_VALUE_EXIST;
+         pool_put (am->nd_events, event);
          goto out;
        }
-      table = ipfix_classify_add_table ();
-      table->classify_table_index = classify_table_index;
+      memset (event, 0, sizeof (*event));
+
+      event->_vl_msg_id = ntohs (VL_API_IP6_ND_EVENT);
+      event->client_index = mp->client_index;
+      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;
+
     }
   else
     {
-      if (!table)
-       {
-         rv = VNET_API_ERROR_NO_SUCH_ENTRY;
-         goto out;
-       }
+      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 */ );
     }
+out:
+  REPLY_MACRO (VL_API_WANT_IP6_ND_EVENTS_REPLY);
+}
 
-  table->ip_version = ip_version;
-  table->transport_protocol = transport_protocol;
+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);
 
-  args.opaque.as_uword = table - fcm->tables;
-  args.rewrite_callback = ipfix_classify_template_rewrite;
-  args.flow_data_callback = ipfix_classify_send_flows;
-  args.is_add = is_add;
-  args.domain_id = fcm->domain_id;
-  args.src_port = fcm->src_port;
+  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_flow_report_add_del (frm, &args);
+  rv = vnet_set_input_acl_intfc (vm, sw_if_index, ip4_table_index,
+                                ip6_table_index, l2_table_index, mp->is_add);
 
-  /* If deleting, or add failed */
-  if (is_add == 0 || (rv && is_add))
-    ipfix_classify_delete_table (table - fcm->tables);
+  BAD_SW_IF_INDEX_LABEL;
 
-out:
-  REPLY_MACRO (VL_API_SET_IPFIX_CLASSIFY_STREAM_REPLY);
+  REPLY_MACRO (VL_API_INPUT_ACL_SET_INTERFACE_REPLY);
 }
 
 static void
-send_ipfix_classify_table_details (u32 table_index,
-                                  unix_shared_memory_queue_t * q,
-                                  u32 context)
+vl_api_get_node_graph_t_handler (vl_api_get_node_graph_t * mp)
 {
-  flow_report_classify_main_t *fcm = &flow_report_classify_main;
-  vl_api_ipfix_classify_table_details_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* */
+}
 
-  ipfix_classify_table_t *table = &fcm->tables[table_index];
+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;
 
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IPFIX_CLASSIFY_TABLE_DETAILS);
-  mp->context = context;
-  mp->table_id = htonl (table->classify_table_index);
-  mp->ip_version = table->ip_version;
-  mp->transport_protocol = table->transport_protocol;
+  /* 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);
+    }
 
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
+  REPLY_MACRO (VL_API_IOAM_ENABLE_REPLY);
 }
 
 static void
-  vl_api_ipfix_classify_table_dump_t_handler
-  (vl_api_ipfix_classify_table_dump_t * mp)
+vl_api_ioam_disable_t_handler (vl_api_ioam_disable_t * mp)
 {
-  flow_report_classify_main_t *fcm = &flow_report_classify_main;
-  unix_shared_memory_queue_t *q;
-  u32 i;
+  int rv = 0;
+  vl_api_ioam_disable_reply_t *rmp;
+  clib_error_t *error;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
+  error = clear_ioam_rewrite_fn ();
+  if (error)
+    {
+      clib_error_report (error);
+      rv = clib_error_get_code (error);
+    }
 
-  for (i = 0; i < vec_len (fcm->tables); i++)
-    if (ipfix_classify_table_index_valid (i))
-      send_ipfix_classify_table_details (i, q, mp->context);
+  REPLY_MACRO (VL_API_IOAM_DISABLE_REPLY);
 }
 
 static void
@@ -3343,43 +1922,6 @@ vl_api_delete_subif_t_handler (vl_api_delete_subif_t * mp)
   REPLY_MACRO (VL_API_DELETE_SUBIF_REPLY);
 }
 
-static void
-  vl_api_l2_interface_pbb_tag_rewrite_t_handler
-  (vl_api_l2_interface_pbb_tag_rewrite_t * mp)
-{
-  vl_api_l2_interface_pbb_tag_rewrite_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
-  u32 vtr_op;
-  int rv = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  vtr_op = ntohl (mp->vtr_op);
-
-  switch (vtr_op)
-    {
-    case L2_VTR_DISABLED:
-    case L2_VTR_PUSH_2:
-    case L2_VTR_POP_2:
-    case L2_VTR_TRANSLATE_2_1:
-      break;
-
-    default:
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto bad_sw_if_index;
-    }
-
-  rv = l2pbb_configure (vm, vnm, ntohl (mp->sw_if_index), vtr_op,
-                       mp->b_dmac, mp->b_smac, ntohs (mp->b_vlanid),
-                       ntohl (mp->i_sid), ntohs (mp->outer_tag));
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_L2_INTERFACE_PBB_TAG_REWRITE_REPLY);
-
-}
-
 static void
 vl_api_punt_t_handler (vl_api_punt_t * mp)
 {
@@ -3399,97 +1941,27 @@ vl_api_punt_t_handler (vl_api_punt_t * mp)
   REPLY_MACRO (VL_API_PUNT_REPLY);
 }
 
-static void
-  vl_api_flow_classify_set_interface_t_handler
-  (vl_api_flow_classify_set_interface_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_flow_classify_set_interface_reply_t *rmp;
-  int rv;
-  u32 sw_if_index, ip4_table_index, ip6_table_index;
-
-  ip4_table_index = ntohl (mp->ip4_table_index);
-  ip6_table_index = ntohl (mp->ip6_table_index);
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = vnet_set_flow_classify_intfc (vm, sw_if_index, ip4_table_index,
-                                    ip6_table_index, mp->is_add);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_FLOW_CLASSIFY_SET_INTERFACE_REPLY);
-}
-
-static void
-send_flow_classify_details (u32 sw_if_index,
-                           u32 table_index,
-                           unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_flow_classify_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_FLOW_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_flow_classify_dump_t_handler (vl_api_flow_classify_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  flow_classify_main_t *pcm = &flow_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_flow_classify_details (i, vec_elt (vec_tbl, i), q,
-                                     mp->context);
-       }
-    }
-}
-
 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;
-  u8 *arc_name, *feature_name;
 
   VALIDATE_SW_IF_INDEX (mp);
 
-  arc_name = format (0, "%s%c", mp->arc_name, 0);
-  feature_name = format (0, "%s%c", mp->feature_name, 0);
+  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;
-  reg =
+  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;
+      u32 sw_if_index = ntohl (mp->sw_if_index);
       clib_error_t *error = 0;
 
-      sw_if_index = ntohl (mp->sw_if_index);
       if (reg->enable_disable_cb)
        error = reg->enable_disable_cb (sw_if_index, mp->enable);
       if (!error)
@@ -3571,7 +2043,6 @@ vpe_api_hookup (vlib_main_t * vm)
   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);
-  am->api_trace_cfg[VL_API_VXLAN_ADD_DEL_TUNNEL].size += 16 * sizeof (u32);
 
   /*
    * Thread-safe API messages
@@ -3604,7 +2075,6 @@ vpe_api_init (vlib_main_t * vm)
   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");
   vl_enable_disable_memory_api (vm, 1 /* enable it */ );
 
@@ -3743,7 +2213,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: ", event->pid);
+  s = format (s, "pid %d: ", ntohl (event->pid));
   if (event->mac_ip)
     s = format (s, "bd mac/ip4 binding events");
   else
@@ -3756,7 +2226,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: ", event->pid);
+  s = format (s, "pid %d: ", ntohl (event->pid));
   if (event->mac_ip)
     s = format (s, "bd mac/ip6 binding events");
   else