ip: Router ID included in flow hash
[vpp.git] / src / vnet / ip / ip_api.c
index fd4c152..3bf404b 100644 (file)
@@ -25,9 +25,7 @@
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/ethernet/ethernet_types_api.h>
 #include <vnet/ip/ip.h>
-#include <vnet/ip/ip_neighbor.h>
 #include <vnet/ip/ip_types_api.h>
-#include <vnet/ip/ip6_neighbor.h>
 #include <vnet/ip/ip_punt_drop.h>
 #include <vnet/ip/ip_types_api.h>
 #include <vnet/fib/fib_table.h>
 #include <vnet/mfib/mfib_entry.h>
 #include <vnet/mfib/mfib_api.h>
 #include <vnet/ip/ip_source_and_port_range_check.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/ip6_fib.h>
 #include <vnet/fib/fib_path_list.h>
 #include <vnet/ip/ip6_hop_by_hop.h>
-#include <vnet/ip/ip4_reassembly.h>
-#include <vnet/ip/ip6_reassembly.h>
-#include <vnet/ethernet/arp.h>
-#include <vnet/ip/ip_types_api.h>
+#include <vnet/ip/ip6_link.h>
+#include <vnet/ip/reass/ip4_sv_reass.h>
+#include <vnet/ip/reass/ip4_full_reass.h>
+#include <vnet/ip/reass/ip6_sv_reass.h>
+#include <vnet/ip/reass/ip6_full_reass.h>
+#include <vnet/ip/ip_table.h>
+#include <vnet/ip/ip_container_proxy.h>
 
 #include <vnet/vnet_msg_enum.h>
 
 
 #include <vlibapi/api_helper_macros.h>
 
-
-#define foreach_ip_api_msg                                              \
-_(IP_TABLE_DUMP, ip_table_dump)                                         \
-_(IP_ROUTE_DUMP, ip_route_dump)                                         \
-_(IP_MTABLE_DUMP, ip_mtable_dump)                                       \
-_(IP_MROUTE_DUMP, ip_mroute_dump)                                       \
-_(IP_NEIGHBOR_DUMP, ip_neighbor_dump)                                   \
-_(IP_MROUTE_ADD_DEL, ip_mroute_add_del)                                 \
-_(MFIB_SIGNAL_DUMP, mfib_signal_dump)                                   \
-_(IP_ADDRESS_DUMP, ip_address_dump)                                     \
-_(IP_UNNUMBERED_DUMP, ip_unnumbered_dump)                               \
-_(IP_DUMP, ip_dump)                                                     \
-_(IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del)                             \
-_(SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit)                      \
-_(IP_PROBE_NEIGHBOR, ip_probe_neighbor)                                \
-_(IP_SCAN_NEIGHBOR_ENABLE_DISABLE, ip_scan_neighbor_enable_disable)     \
-_(WANT_IP4_ARP_EVENTS, want_ip4_arp_events)                             \
-_(WANT_IP6_ND_EVENTS, want_ip6_nd_events)                               \
-_(WANT_IP6_RA_EVENTS, want_ip6_ra_events)                               \
-_(PROXY_ARP_ADD_DEL, proxy_arp_add_del)                                 \
-_(PROXY_ARP_DUMP, proxy_arp_dump)                                       \
-_(PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable)       \
- _(PROXY_ARP_INTFC_DUMP, proxy_arp_intfc_dump)                          \
-_(RESET_FIB, reset_fib)                                                        \
-_(IP_ROUTE_ADD_DEL, ip_route_add_del)                                   \
-_(IP_TABLE_ADD_DEL, ip_table_add_del)                                   \
-_(IP_PUNT_POLICE, ip_punt_police)                                       \
-_(IP_PUNT_REDIRECT, ip_punt_redirect)                                   \
-_(SET_IP_FLOW_HASH,set_ip_flow_hash)                                    \
-_(SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config)           \
-_(SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix)           \
-_(IP6ND_PROXY_ADD_DEL, ip6nd_proxy_add_del)                             \
-_(IP6ND_PROXY_DUMP, ip6nd_proxy_dump)                                   \
-_(IP6ND_SEND_ROUTER_SOLICITATION, ip6nd_send_router_solicitation)       \
-_(SW_INTERFACE_IP6_ENABLE_DISABLE, sw_interface_ip6_enable_disable )    \
-_(IP_CONTAINER_PROXY_ADD_DEL, ip_container_proxy_add_del)               \
-_(IP_CONTAINER_PROXY_DUMP, ip_container_proxy_dump)                     \
-_(IOAM_ENABLE, ioam_enable)                                             \
-_(IOAM_DISABLE, ioam_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)                     \
-_(IP_SOURCE_CHECK_INTERFACE_ADD_DEL,                                    \
-  ip_source_check_interface_add_del)                                    \
-_(IP_REASSEMBLY_SET, ip_reassembly_set)                                 \
-_(IP_REASSEMBLY_GET, ip_reassembly_get)                                 \
-_(IP_REASSEMBLY_ENABLE_DISABLE, ip_reassembly_enable_disable)           \
-_(IP_PUNT_REDIRECT_DUMP, ip_punt_redirect_dump)
-
-
-static vl_api_ip_neighbor_flags_t
-ip_neighbor_flags_encode (ip_neighbor_flags_t f)
-{
-  vl_api_ip_neighbor_flags_t v = IP_API_NEIGHBOR_FLAG_NONE;
-
-  if (f & IP_NEIGHBOR_FLAG_STATIC)
-    v |= IP_API_NEIGHBOR_FLAG_STATIC;
-  if (f & IP_NEIGHBOR_FLAG_NO_FIB_ENTRY)
-    v |= IP_API_NEIGHBOR_FLAG_NO_FIB_ENTRY;
-
-  return (clib_host_to_net_u32 (v));
-}
-
-static void
-send_ip_neighbor_details (u32 sw_if_index,
-                         const ip46_address_t * ip_address,
-                         const mac_address_t * mac,
-                         ip_neighbor_flags_t flags,
-                         vl_api_registration_t * reg, u32 context)
-{
-  vl_api_ip_neighbor_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  clib_memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IP_NEIGHBOR_DETAILS);
-  mp->context = context;
-  mp->neighbor.sw_if_index = htonl (sw_if_index);
-  mp->neighbor.flags = ip_neighbor_flags_encode (flags);
-
-  ip_address_encode (ip_address, IP46_TYPE_ANY, &mp->neighbor.ip_address);
-  mac_address_encode (mac, mp->neighbor.mac_address);
-
-  vl_api_send_msg (reg, (u8 *) mp);
-}
+#include <vnet/format_fns.h>
+
+#define foreach_ip_api_msg                                                    \
+  _ (SW_INTERFACE_IP6_ENABLE_DISABLE, sw_interface_ip6_enable_disable)        \
+  _ (IP_TABLE_DUMP, ip_table_dump)                                            \
+  _ (IP_ROUTE_DUMP, ip_route_dump)                                            \
+  _ (IP_MTABLE_DUMP, ip_mtable_dump)                                          \
+  _ (IP_MROUTE_DUMP, ip_mroute_dump)                                          \
+  _ (IP_MROUTE_ADD_DEL, ip_mroute_add_del)                                    \
+  _ (MFIB_SIGNAL_DUMP, mfib_signal_dump)                                      \
+  _ (IP_ADDRESS_DUMP, ip_address_dump)                                        \
+  _ (IP_UNNUMBERED_DUMP, ip_unnumbered_dump)                                  \
+  _ (IP_DUMP, ip_dump)                                                        \
+  _ (IP_TABLE_REPLACE_BEGIN, ip_table_replace_begin)                          \
+  _ (IP_TABLE_REPLACE_END, ip_table_replace_end)                              \
+  _ (IP_TABLE_FLUSH, ip_table_flush)                                          \
+  _ (IP_ROUTE_ADD_DEL, ip_route_add_del)                                      \
+  _ (IP_ROUTE_LOOKUP, ip_route_lookup)                                        \
+  _ (IP_TABLE_ADD_DEL, ip_table_add_del)                                      \
+  _ (IP_PUNT_POLICE, ip_punt_police)                                          \
+  _ (IP_PUNT_REDIRECT, ip_punt_redirect)                                      \
+  _ (SET_IP_FLOW_HASH, set_ip_flow_hash)                                      \
+  _ (SET_IP_FLOW_HASH_V2, set_ip_flow_hash_v2)                                \
+  _ (SET_IP_FLOW_HASH_ROUTER_ID, set_ip_flow_hash_router_id)                  \
+  _ (IP_CONTAINER_PROXY_ADD_DEL, ip_container_proxy_add_del)                  \
+  _ (IP_CONTAINER_PROXY_DUMP, ip_container_proxy_dump)                        \
+  _ (IOAM_ENABLE, ioam_enable)                                                \
+  _ (IOAM_DISABLE, ioam_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)                        \
+  _ (SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS,                                 \
+     sw_interface_ip6_set_link_local_address)                                 \
+  _ (SW_INTERFACE_IP6_GET_LINK_LOCAL_ADDRESS,                                 \
+     sw_interface_ip6_get_link_local_address)                                 \
+  _ (IP_REASSEMBLY_SET, ip_reassembly_set)                                    \
+  _ (IP_REASSEMBLY_GET, ip_reassembly_get)                                    \
+  _ (IP_REASSEMBLY_ENABLE_DISABLE, ip_reassembly_enable_disable)              \
+  _ (IP_PUNT_REDIRECT_DUMP, ip_punt_redirect_dump)
 
 static void
-vl_api_ip_neighbor_dump_t_handler (vl_api_ip_neighbor_dump_t * mp)
+  vl_api_sw_interface_ip6_enable_disable_t_handler
+  (vl_api_sw_interface_ip6_enable_disable_t * mp)
 {
-  vl_api_registration_t *reg;
-
-  reg = vl_api_client_index_to_registration (mp->client_index);
-  if (!reg)
-    return;
-
-  u32 sw_if_index = ntohl (mp->sw_if_index);
+  vl_api_sw_interface_ip6_enable_disable_reply_t *rmp;
+  int rv = 0;
 
-  if (mp->is_ipv6)
-    {
-      ip6_neighbor_t *n, *ns;
+  VALIDATE_SW_IF_INDEX (mp);
 
-      ns = ip6_neighbors_entries (sw_if_index);
-      /* *INDENT-OFF* */
-      vec_foreach (n, ns)
-      {
-        ip46_address_t nh = {
-          .ip6 = {
-            .as_u64[0] = n->key.ip6_address.as_u64[0],
-            .as_u64[1] = n->key.ip6_address.as_u64[1],
-          },
-        };
-        send_ip_neighbor_details (n->key.sw_if_index, &nh,
-                                  &n->mac, n->flags,
-                                  reg, mp->context);
-      }
-      /* *INDENT-ON* */
-      vec_free (ns);
-    }
-  else
-    {
-      ethernet_arp_ip4_entry_t *n, *ns;
+  rv = ((mp->enable == 1) ?
+       ip6_link_enable (ntohl (mp->sw_if_index), NULL) :
+       ip6_link_disable (ntohl (mp->sw_if_index)));
 
-      ns = ip4_neighbor_entries (sw_if_index);
-      /* *INDENT-OFF* */
-      vec_foreach (n, ns)
-      {
-        ip46_address_t nh = {
-          .ip4 = {
-            .as_u32 = n->ip4_address.as_u32,
-          },
-        };
+  BAD_SW_IF_INDEX_LABEL;
 
-        send_ip_neighbor_details (n->sw_if_index, &nh,
-                                  &n->mac, n->flags,
-                                  reg, mp->context);
-      }
-      /* *INDENT-ON* */
-      vec_free (ns);
-    }
+  REPLY_MACRO (VL_API_SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY);
 }
 
 static void
@@ -241,17 +158,17 @@ vl_api_ip_table_dump_t_handler (vl_api_ip_table_dump_t * mp)
     return;
 
   /* *INDENT-OFF* */
-  pool_foreach (fib_table, ip4_main.fibs,
-  ({
+  pool_foreach (fib_table, ip4_main.fibs)
+   {
     send_ip_table_details(am, reg, mp->context, fib_table);
-  }));
-  pool_foreach (fib_table, ip6_main.fibs,
-  ({
+  }
+  pool_foreach (fib_table, ip6_main.fibs)
+   {
     /* don't send link locals */
     if (fib_table->ft_flags & FIB_TABLE_FLAG_IP6_LL)
       continue;
     send_ip_table_details(am, reg, mp->context, fib_table);
-  }));
+  }
   /* *INDENT-ON* */
 }
 
@@ -310,6 +227,7 @@ send_ip_route_details (vpe_api_main_t * am,
   }
 
   vl_api_send_msg (reg, (u8 *) mp);
+  vec_free (rpaths);
 }
 
 typedef struct apt_ip6_fib_show_ctx_t_
@@ -380,14 +298,14 @@ vl_api_ip_mtable_dump_t_handler (vl_api_ip_mtable_dump_t * mp)
     return;
 
   /* *INDENT-OFF* */
-  pool_foreach (mfib_table, ip4_main.mfibs,
-  ({
+  pool_foreach (mfib_table, ip4_main.mfibs)
+   {
       send_ip_mtable_details (reg, mp->context, mfib_table);
-  }));
-  pool_foreach (mfib_table, ip6_main.mfibs,
-  ({
+  }
+  pool_foreach (mfib_table, ip6_main.mfibs)
+   {
       send_ip_mtable_details (reg, mp->context, mfib_table);
-  }));
+  }
   /* *INDENT-ON* */
 }
 
@@ -396,14 +314,14 @@ typedef struct vl_api_ip_mfib_dump_ctx_t_
   fib_node_index_t *entries;
 } vl_api_ip_mfib_dump_ctx_t;
 
-static int
+static walk_rc_t
 mfib_route_dump_walk (fib_node_index_t fei, void *arg)
 {
   vl_api_ip_mfib_dump_ctx_t *ctx = arg;
 
   vec_add1 (ctx->entries, fei);
 
-  return (0);
+  return (WALK_CONTINUE);
 }
 
 static void
@@ -415,7 +333,7 @@ send_ip_mroute_details (vpe_api_main_t * am,
   vl_api_ip_mroute_details_t *mp;
   const mfib_prefix_t *pfx;
   vl_api_mfib_path_t *fp;
-  int path_count;
+  u8 path_count;
 
   rpaths = NULL;
   pfx = mfib_entry_get_prefix (mfib_entry_index);
@@ -433,7 +351,7 @@ send_ip_mroute_details (vpe_api_main_t * am,
   mp->route.table_id =
     htonl (mfib_table_get_table_id
           (mfib_entry_get_fib_index (mfib_entry_index), pfx->fp_proto));
-  mp->route.n_paths = htonl (path_count);
+  mp->route.n_paths = path_count;
   fp = mp->route.paths;
   vec_foreach (rpath, rpaths)
   {
@@ -538,65 +456,37 @@ vl_api_ip_punt_redirect_t_handler (vl_api_ip_punt_redirect_t * mp,
   REPLY_MACRO (VL_API_IP_PUNT_REDIRECT_REPLY);
 }
 
-static ip_neighbor_flags_t
-ip_neighbor_flags_decode (vl_api_ip_neighbor_flags_t v)
-{
-  ip_neighbor_flags_t f = IP_NEIGHBOR_FLAG_NONE;
-
-  v = clib_net_to_host_u32 (v);
-
-  if (v & IP_API_NEIGHBOR_FLAG_STATIC)
-    f |= IP_NEIGHBOR_FLAG_STATIC;
-  if (v & IP_API_NEIGHBOR_FLAG_NO_FIB_ENTRY)
-    f |= IP_NEIGHBOR_FLAG_NO_FIB_ENTRY;
-
-  return (f);
-}
-
-static void
-vl_api_ip_neighbor_add_del_t_handler (vl_api_ip_neighbor_add_del_t * mp,
-                                     vlib_main_t * vm)
+static clib_error_t *
+call_elf_section_ip_table_callbacks (vnet_main_t * vnm, u32 table_id,
+                                    u32 flags,
+                                    _vnet_ip_table_function_list_elt_t **
+                                    elts)
 {
-  vl_api_ip_neighbor_add_del_reply_t *rmp;
-  ip_neighbor_flags_t flags;
-  u32 stats_index = ~0;
-  ip46_address_t ip;
-  mac_address_t mac;
-  ip46_type_t type;
-  int rv;
-
-  VALIDATE_SW_IF_INDEX ((&mp->neighbor));
-
-  flags = ip_neighbor_flags_decode (mp->neighbor.flags);
-  type = ip_address_decode (&mp->neighbor.ip_address, &ip);
-  mac_address_decode (mp->neighbor.mac_address, &mac);
-
-  /*
-   * there's no validation here of the ND/ARP entry being added.
-   * The expectation is that the FIB will ensure that nothing bad
-   * will come of adding bogus entries.
-   */
-  if (mp->is_add)
-    rv = ip_neighbor_add (&ip, type, &mac,
-                         ntohl (mp->neighbor.sw_if_index),
-                         flags, &stats_index);
-  else
-    rv = ip_neighbor_del (&ip, type, ntohl (mp->neighbor.sw_if_index));
+  _vnet_ip_table_function_list_elt_t *elt;
+  vnet_ip_table_function_priority_t prio;
+  clib_error_t *error = 0;
 
-  BAD_SW_IF_INDEX_LABEL;
+  for (prio = VNET_IP_TABLE_FUNC_PRIORITY_LOW;
+       prio <= VNET_IP_TABLE_FUNC_PRIORITY_HIGH; prio++)
+    {
+      elt = elts[prio];
 
-  /* *INDENT-OFF* */
-  REPLY_MACRO2 (VL_API_IP_NEIGHBOR_ADD_DEL_REPLY,
-  ({
-    rmp->stats_index = htonl (stats_index);
-  }));
-  /* *INDENT-ON* */
+      while (elt)
+       {
+         error = elt->fp (vnm, table_id, flags);
+         if (error)
+           return error;
+         elt = elt->next_ip_table_function;
+       }
+    }
+  return error;
 }
 
 void
 ip_table_delete (fib_protocol_t fproto, u32 table_id, u8 is_api)
 {
   u32 fib_index, mfib_index;
+  vnet_main_t *vnm = vnet_get_main ();
 
   /*
    * ignore action on the default table - this is always present
@@ -615,6 +505,10 @@ ip_table_delete (fib_protocol_t fproto, u32 table_id, u8 is_api)
       fib_index = fib_table_find (fproto, table_id);
       mfib_index = mfib_table_find (fproto, table_id);
 
+      if ((~0 != fib_index) || (~0 != mfib_index))
+       call_elf_section_ip_table_callbacks (vnm, table_id, 0 /* is_add */ ,
+                                            vnm->ip_table_add_del_functions);
+
       if (~0 != fib_index)
        {
          fib_table_unlock (fib_index, fproto,
@@ -715,11 +609,68 @@ vl_api_ip_route_add_del_t_handler (vl_api_ip_route_add_del_t * mp)
   /* *INDENT-ON* */
 }
 
+void
+vl_api_ip_route_lookup_t_handler (vl_api_ip_route_lookup_t * mp)
+{
+  vl_api_ip_route_lookup_reply_t *rmp = NULL;
+  fib_route_path_t *rpaths = NULL, *rpath;
+  const fib_prefix_t *pfx = NULL;
+  fib_prefix_t lookup;
+  vl_api_fib_path_t *fp;
+  fib_node_index_t fib_entry_index;
+  u32 fib_index;
+  int npaths = 0;
+  int rv;
+
+  ip_prefix_decode (&mp->prefix, &lookup);
+  rv = fib_api_table_id_decode (lookup.fp_proto, ntohl (mp->table_id),
+                               &fib_index);
+  if (PREDICT_TRUE (!rv))
+    {
+      if (mp->exact)
+       fib_entry_index = fib_table_lookup_exact_match (fib_index, &lookup);
+      else
+       fib_entry_index = fib_table_lookup (fib_index, &lookup);
+      if (fib_entry_index == FIB_NODE_INDEX_INVALID)
+       rv = VNET_API_ERROR_NO_SUCH_ENTRY;
+      else
+       {
+         pfx = fib_entry_get_prefix (fib_entry_index);
+         rpaths = fib_entry_encode (fib_entry_index);
+         npaths = vec_len (rpaths);
+       }
+    }
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO3_ZERO(VL_API_IP_ROUTE_LOOKUP_REPLY,
+                    npaths * sizeof (*fp),
+  ({
+    if (!rv)
+      {
+        ip_prefix_encode (pfx, &rmp->route.prefix);
+        rmp->route.table_id = mp->table_id;
+        rmp->route.n_paths = npaths;
+        rmp->route.stats_index = fib_table_entry_get_stats_index (fib_index, pfx);
+        rmp->route.stats_index = htonl (rmp->route.stats_index);
+
+        fp = rmp->route.paths;
+        vec_foreach (rpath, rpaths)
+          {
+            fib_api_path_encode (rpath, fp);
+            fp++;
+          }
+      }
+  }));
+  /* *INDENT-ON* */
+  vec_free (rpaths);
+}
+
 void
 ip_table_create (fib_protocol_t fproto,
                 u32 table_id, u8 is_api, const u8 * name)
 {
   u32 fib_index, mfib_index;
+  vnet_main_t *vnm = vnet_get_main ();
 
   /*
    * ignore action on the default table - this is always present
@@ -752,6 +703,10 @@ ip_table_create (fib_protocol_t fproto,
                                                      MFIB_SOURCE_API :
                                                      MFIB_SOURCE_CLI), name);
        }
+
+      if ((~0 == fib_index) || (~0 == mfib_index))
+       call_elf_section_ip_table_callbacks (vnm, table_id, 1 /* is_add */ ,
+                                            vnm->ip_table_add_del_functions);
     }
 }
 
@@ -795,6 +750,7 @@ api_mroute_add_del_t_handler (vl_api_ip_mroute_add_del_t * mp,
 {
   fib_route_path_t *rpath, *rpaths = NULL;
   fib_node_index_t mfib_entry_index;
+  mfib_entry_flags_t eflags;
   mfib_prefix_t pfx;
   u32 fib_index;
   int rv;
@@ -819,10 +775,11 @@ api_mroute_add_del_t_handler (vl_api_ip_mroute_add_del_t * mp,
        goto out;
     }
 
+  eflags = mfib_api_path_entry_flags_decode (mp->route.entry_flags);
   mfib_entry_index = mroute_add_del_handler (mp->is_add,
                                             mp->is_add,
                                             fib_index, &pfx,
-                                            ntohl (mp->route.entry_flags),
+                                            eflags,
                                             ntohl (mp->route.rpf_id),
                                             rpaths);
 
@@ -986,7 +943,7 @@ vl_api_ip_unnumbered_dump_t_handler (vl_api_ip_unnumbered_dump_t * mp)
 
       si = vnet_get_sw_interface (vnm, ntohl (mp->sw_if_index));
 
-      if (!(si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED))
+      if (si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
        {
          send_ip_unnumbered_details (am, reg,
                                      sw_if_index,
@@ -997,8 +954,8 @@ vl_api_ip_unnumbered_dump_t_handler (vl_api_ip_unnumbered_dump_t * mp)
   else
     {
       /* *INDENT-OFF* */
-      pool_foreach (si, im->sw_interfaces,
-      ({
+      pool_foreach (si, im->sw_interfaces)
+       {
         if ((si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED))
           {
             send_ip_unnumbered_details(am, reg,
@@ -1006,7 +963,7 @@ vl_api_ip_unnumbered_dump_t_handler (vl_api_ip_unnumbered_dump_t * mp)
                                        si->unnumbered_sw_if_index,
                                        mp->context);
           }
-      }));
+      }
       /* *INDENT-ON* */
     }
 
@@ -1018,7 +975,7 @@ vl_api_ip_dump_t_handler (vl_api_ip_dump_t * mp)
 {
   vpe_api_main_t *am = &vpe_api_main;
   vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
+  //vlib_main_t *vm = vlib_get_main ();
   vnet_interface_main_t *im = &vnm->interface_main;
   vl_api_registration_t *reg;
   vnet_sw_interface_t *si, *sorted_sis;
@@ -1032,47 +989,30 @@ vl_api_ip_dump_t_handler (vl_api_ip_dump_t * mp)
   sorted_sis = vec_new (vnet_sw_interface_t, pool_elts (im->sw_interfaces));
   _vec_len (sorted_sis) = 0;
   /* *INDENT-OFF* */
-  pool_foreach (si, im->sw_interfaces,
-  ({
+  pool_foreach (si, im->sw_interfaces)
+   {
     vec_add1 (sorted_sis, si[0]);
-  }));
+  }
   /* *INDENT-ON* */
 
   vec_foreach (si, sorted_sis)
   {
     if (!(si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED))
       {
-       if (mp->is_ipv6 && !ip6_interface_enabled (vm, si->sw_if_index))
-         {
-           continue;
-         }
+       /* if (mp->is_ipv6 && !ip6_interface_enabled (vm, si->sw_if_index)) */
+       /*   { */
+       /*     continue; */
+       /*   } */
        sw_if_index = si->sw_if_index;
        send_ip_details (am, reg, sw_if_index, mp->is_ipv6, mp->context);
       }
   }
-}
 
-static void
-set_ip6_flow_hash (vl_api_set_ip_flow_hash_t * mp)
-{
-  vl_api_set_ip_flow_hash_reply_t *rmp;
-  int rv;
-  u32 table_id;
-  flow_hash_config_t flow_hash_config = 0;
-
-  table_id = ntohl (mp->vrf_id);
-
-#define _(a,b) if (mp->a) flow_hash_config |= b;
-  foreach_flow_hash_bit;
-#undef _
-
-  rv = vnet_set_ip6_flow_hash (table_id, flow_hash_config);
-
-  REPLY_MACRO (VL_API_SET_IP_FLOW_HASH_REPLY);
+  vec_free (sorted_sis);
 }
 
 static void
-set_ip4_flow_hash (vl_api_set_ip_flow_hash_t * mp)
+vl_api_set_ip_flow_hash_t_handler (vl_api_set_ip_flow_hash_t *mp)
 {
   vl_api_set_ip_flow_hash_reply_t *rmp;
   int rv;
@@ -1082,345 +1022,145 @@ set_ip4_flow_hash (vl_api_set_ip_flow_hash_t * mp)
   table_id = ntohl (mp->vrf_id);
 
 #define _(a,b) if (mp->a) flow_hash_config |= b;
-  foreach_flow_hash_bit;
+  foreach_flow_hash_bit_v1;
 #undef _
 
-  rv = vnet_set_ip4_flow_hash (table_id, flow_hash_config);
+  rv = ip_flow_hash_set ((mp->is_ipv6 ? AF_IP6 : AF_IP4), table_id,
+                        flow_hash_config);
 
   REPLY_MACRO (VL_API_SET_IP_FLOW_HASH_REPLY);
 }
 
-
-static void
-vl_api_set_ip_flow_hash_t_handler (vl_api_set_ip_flow_hash_t * mp)
-{
-  if (mp->is_ipv6 == 0)
-    set_ip4_flow_hash (mp);
-  else
-    set_ip6_flow_hash (mp);
-}
-
 static void
-  vl_api_sw_interface_ip6nd_ra_config_t_handler
-  (vl_api_sw_interface_ip6nd_ra_config_t * mp)
+vl_api_set_ip_flow_hash_v2_t_handler (vl_api_set_ip_flow_hash_v2_t *mp)
 {
-  vl_api_sw_interface_ip6nd_ra_config_reply_t *rmp;
-  vlib_main_t *vm = vlib_get_main ();
-  int rv = 0;
-  u8 is_no, suppress, managed, other, ll_option, send_unicast, cease,
-    default_router;
-
-  is_no = mp->is_no == 1;
-  suppress = mp->suppress == 1;
-  managed = mp->managed == 1;
-  other = mp->other == 1;
-  ll_option = mp->ll_option == 1;
-  send_unicast = mp->send_unicast == 1;
-  cease = mp->cease == 1;
-  default_router = mp->default_router == 1;
-
-  VALIDATE_SW_IF_INDEX (mp);
+  vl_api_set_ip_flow_hash_v2_reply_t *rmp;
+  ip_address_family_t af;
+  int rv;
 
-  rv = ip6_neighbor_ra_config (vm, ntohl (mp->sw_if_index),
-                              suppress, managed, other,
-                              ll_option, send_unicast, cease,
-                              default_router, ntohl (mp->lifetime),
-                              ntohl (mp->initial_count),
-                              ntohl (mp->initial_interval),
-                              ntohl (mp->max_interval),
-                              ntohl (mp->min_interval), is_no);
+  rv = ip_address_family_decode (mp->af, &af);
 
-  BAD_SW_IF_INDEX_LABEL;
+  if (!rv)
+    rv = ip_flow_hash_set (af, htonl (mp->table_id),
+                          htonl (mp->flow_hash_config));
 
-  REPLY_MACRO (VL_API_SW_INTERFACE_IP6ND_RA_CONFIG_REPLY);
+  REPLY_MACRO (VL_API_SET_IP_FLOW_HASH_V2_REPLY);
 }
 
 static void
-  vl_api_sw_interface_ip6nd_ra_prefix_t_handler
-  (vl_api_sw_interface_ip6nd_ra_prefix_t * mp)
+vl_api_set_ip_flow_hash_router_id_t_handler (
+  vl_api_set_ip_flow_hash_router_id_t *mp)
 {
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_sw_interface_ip6nd_ra_prefix_reply_t *rmp;
-  fib_prefix_t pfx;
+  vl_api_set_ip_flow_hash_router_id_reply_t *rmp;
   int rv = 0;
-  u8 is_no, use_default, no_advertise, off_link, no_autoconfig, no_onlink;
 
-  VALIDATE_SW_IF_INDEX (mp);
-
-  ip_prefix_decode (&mp->prefix, &pfx);
-  is_no = mp->is_no == 1;
-  use_default = mp->use_default == 1;
-  no_advertise = mp->no_advertise == 1;
-  off_link = mp->off_link == 1;
-  no_autoconfig = mp->no_autoconfig == 1;
-  no_onlink = mp->no_onlink == 1;
-
-  rv = ip6_neighbor_ra_prefix (vm, ntohl (mp->sw_if_index),
-                              &pfx.fp_addr.ip6,
-                              pfx.fp_len, use_default,
-                              ntohl (mp->val_lifetime),
-                              ntohl (mp->pref_lifetime), no_advertise,
-                              off_link, no_autoconfig, no_onlink, is_no);
+  ip_flow_hash_router_id_set (ntohl (mp->router_id));
 
-  BAD_SW_IF_INDEX_LABEL;
-  REPLY_MACRO (VL_API_SW_INTERFACE_IP6ND_RA_PREFIX_REPLY);
+  REPLY_MACRO (VL_API_SET_IP_FLOW_HASH_ROUTER_ID_REPLY);
 }
 
-static void
-send_ip6nd_proxy_details (vl_api_registration_t * reg,
-                         u32 context,
-                         const ip46_address_t * addr, u32 sw_if_index)
+void
+vl_mfib_signal_send_one (vl_api_registration_t * reg,
+                        u32 context, const mfib_signal_t * mfs)
 {
-  vl_api_ip6nd_proxy_details_t *mp;
+  vl_api_mfib_signal_details_t *mp;
+  const mfib_prefix_t *prefix;
+  mfib_table_t *mfib;
+  mfib_itf_t *mfi;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
+
   clib_memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IP6ND_PROXY_DETAILS);
+  mp->_vl_msg_id = ntohs (VL_API_MFIB_SIGNAL_DETAILS);
   mp->context = context;
-  mp->sw_if_index = htonl (sw_if_index);
-
-  ip6_address_encode (&addr->ip6, mp->ip);
 
-  vl_api_send_msg (reg, (u8 *) mp);
-}
+  mfi = mfib_itf_get (mfs->mfs_itf);
+  prefix = mfib_entry_get_prefix (mfs->mfs_entry);
+  mfib = mfib_table_get (mfib_entry_get_fib_index (mfs->mfs_entry),
+                        prefix->fp_proto);
+  mp->table_id = ntohl (mfib->mft_table_id);
+  mp->sw_if_index = ntohl (mfi->mfi_sw_if_index);
 
-typedef struct api_ip6nd_proxy_fib_table_walk_ctx_t_
-{
-  u32 *indices;
-} api_ip6nd_proxy_fib_table_walk_ctx_t;
+  ip_mprefix_encode (prefix, &mp->prefix);
 
-static fib_table_walk_rc_t
-api_ip6nd_proxy_fib_table_walk (fib_node_index_t fei, void *arg)
-{
-  api_ip6nd_proxy_fib_table_walk_ctx_t *ctx = arg;
+  if (0 != mfs->mfs_buffer_len)
+    {
+      mp->ip_packet_len = ntohs (mfs->mfs_buffer_len);
 
-  if (fib_entry_is_sourced (fei, FIB_SOURCE_IP6_ND_PROXY))
+      memcpy (mp->ip_packet_data, mfs->mfs_buffer, mfs->mfs_buffer_len);
+    }
+  else
     {
-      vec_add1 (ctx->indices, fei);
+      mp->ip_packet_len = 0;
     }
 
-  return (FIB_TABLE_WALK_CONTINUE);
+  vl_api_send_msg (reg, (u8 *) mp);
 }
 
 static void
-vl_api_ip6nd_proxy_dump_t_handler (vl_api_ip6nd_proxy_dump_t * mp)
+vl_api_mfib_signal_dump_t_handler (vl_api_mfib_signal_dump_t * mp)
 {
-  ip6_main_t *im6 = &ip6_main;
-  fib_table_t *fib_table;
-  api_ip6nd_proxy_fib_table_walk_ctx_t ctx = {
-    .indices = NULL,
-  };
-  fib_node_index_t *feip;
-  const fib_prefix_t *pfx;
   vl_api_registration_t *reg;
 
   reg = vl_api_client_index_to_registration (mp->client_index);
   if (!reg)
     return;
 
-  /* *INDENT-OFF* */
-  pool_foreach (fib_table, im6->fibs,
-  ({
-    fib_table_walk(fib_table->ft_index,
-                   FIB_PROTOCOL_IP6,
-                   api_ip6nd_proxy_fib_table_walk,
-                   &ctx);
-  }));
-  /* *INDENT-ON* */
-
-  vec_sort_with_function (ctx.indices, fib_entry_cmp_for_sort);
-
-  vec_foreach (feip, ctx.indices)
-  {
-    pfx = fib_entry_get_prefix (*feip);
-
-    send_ip6nd_proxy_details (reg,
-                             mp->context,
-                             &pfx->fp_addr,
-                             fib_entry_get_resolving_interface (*feip));
-  }
-
-  vec_free (ctx.indices);
+  while (vl_api_can_send_msg (reg) && mfib_signal_send_one (reg, mp->context))
+    ;
 }
 
 static void
-vl_api_ip6nd_proxy_add_del_t_handler (vl_api_ip6nd_proxy_add_del_t * mp)
+  vl_api_ip_container_proxy_add_del_t_handler
+  (vl_api_ip_container_proxy_add_del_t * mp)
 {
-  vl_api_ip6nd_proxy_add_del_reply_t *rmp;
-  ip6_address_t ip6;
+  vl_api_ip_container_proxy_add_del_reply_t *rmp;
+  vnet_ip_container_proxy_args_t args;
   int rv = 0;
+  clib_error_t *error;
 
-  VALIDATE_SW_IF_INDEX (mp);
+  clib_memset (&args, 0, sizeof (args));
 
-  ip6_address_decode (mp->ip, &ip6);
-  rv = ip6_neighbor_proxy_add_del (ntohl (mp->sw_if_index), &ip6, mp->is_del);
+  ip_prefix_decode (&mp->pfx, &args.prefix);
 
-  BAD_SW_IF_INDEX_LABEL;
-  REPLY_MACRO (VL_API_IP6ND_PROXY_ADD_DEL_REPLY);
+  args.sw_if_index = clib_net_to_host_u32 (mp->sw_if_index);
+  args.is_add = mp->is_add;
+  if ((error = vnet_ip_container_proxy_add_del (&args)))
+    {
+      rv = clib_error_get_code (error);
+      clib_error_report (error);
+    }
+
+  REPLY_MACRO (VL_API_IP_CONTAINER_PROXY_ADD_DEL_REPLY);
 }
 
-static void
-  vl_api_ip6nd_send_router_solicitation_t_handler
-  (vl_api_ip6nd_send_router_solicitation_t * mp)
+typedef struct ip_container_proxy_walk_ctx_t_
 {
-  vl_api_ip6nd_send_router_solicitation_reply_t *rmp;
-  icmp6_send_router_solicitation_params_t params;
-  vlib_main_t *vm = vlib_get_main ();
-  int rv = 0;
+  vl_api_registration_t *reg;
+  u32 context;
+} ip_container_proxy_walk_ctx_t;
 
-  VALIDATE_SW_IF_INDEX (mp);
+static int
+ip_container_proxy_send_details (const fib_prefix_t * pfx, u32 sw_if_index,
+                                void *args)
+{
+  vl_api_ip_container_proxy_details_t *mp;
+  ip_container_proxy_walk_ctx_t *ctx = args;
 
-  BAD_SW_IF_INDEX_LABEL;
-  REPLY_MACRO (VL_API_IP6ND_SEND_ROUTER_SOLICITATION_REPLY);
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  if (!mp)
+    return 1;
 
-  if (rv != 0)
-    return;
+  clib_memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_IP_CONTAINER_PROXY_DETAILS);
+  mp->context = ctx->context;
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  ip_prefix_encode (pfx, &mp->prefix);
 
-  params.irt = ntohl (mp->irt);
-  params.mrt = ntohl (mp->mrt);
-  params.mrc = ntohl (mp->mrc);
-  params.mrd = ntohl (mp->mrd);
+  vl_api_send_msg (ctx->reg, (u8 *) mp);
 
-  icmp6_send_router_solicitation (vm, ntohl (mp->sw_if_index), mp->stop,
-                                 &params);
-}
-
-static void
-  vl_api_sw_interface_ip6_enable_disable_t_handler
-  (vl_api_sw_interface_ip6_enable_disable_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_sw_interface_ip6_enable_disable_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  int rv = 0;
-  clib_error_t *error;
-
-  vnm->api_errno = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  error =
-    (mp->enable == 1) ? enable_ip6_interface (vm,
-                                             ntohl (mp->sw_if_index)) :
-    disable_ip6_interface (vm, ntohl (mp->sw_if_index));
-
-  if (error)
-    {
-      clib_error_report (error);
-      rv = VNET_API_ERROR_UNSPECIFIED;
-    }
-  else
-    {
-      rv = vnm->api_errno;
-    }
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY);
-}
-
-void
-vl_mfib_signal_send_one (vl_api_registration_t * reg,
-                        u32 context, const mfib_signal_t * mfs)
-{
-  vl_api_mfib_signal_details_t *mp;
-  const mfib_prefix_t *prefix;
-  mfib_table_t *mfib;
-  mfib_itf_t *mfi;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-
-  clib_memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_MFIB_SIGNAL_DETAILS);
-  mp->context = context;
-
-  mfi = mfib_itf_get (mfs->mfs_itf);
-  prefix = mfib_entry_get_prefix (mfs->mfs_entry);
-  mfib = mfib_table_get (mfib_entry_get_fib_index (mfs->mfs_entry),
-                        prefix->fp_proto);
-  mp->table_id = ntohl (mfib->mft_table_id);
-  mp->sw_if_index = ntohl (mfi->mfi_sw_if_index);
-
-  ip_mprefix_encode (prefix, &mp->prefix);
-
-  if (0 != mfs->mfs_buffer_len)
-    {
-      mp->ip_packet_len = ntohs (mfs->mfs_buffer_len);
-
-      memcpy (mp->ip_packet_data, mfs->mfs_buffer, mfs->mfs_buffer_len);
-    }
-  else
-    {
-      mp->ip_packet_len = 0;
-    }
-
-  vl_api_send_msg (reg, (u8 *) mp);
-}
-
-static void
-vl_api_mfib_signal_dump_t_handler (vl_api_mfib_signal_dump_t * mp)
-{
-  vl_api_registration_t *reg;
-
-  reg = vl_api_client_index_to_registration (mp->client_index);
-  if (!reg)
-    return;
-
-  while (vl_api_can_send_msg (reg) && mfib_signal_send_one (reg, mp->context))
-    ;
-}
-
-static void
-  vl_api_ip_container_proxy_add_del_t_handler
-  (vl_api_ip_container_proxy_add_del_t * mp)
-{
-  vl_api_ip_container_proxy_add_del_reply_t *rmp;
-  vnet_ip_container_proxy_args_t args;
-  int rv = 0;
-  clib_error_t *error;
-
-  clib_memset (&args, 0, sizeof (args));
-
-  ip_prefix_decode (&mp->pfx, &args.prefix);
-
-  args.sw_if_index = clib_net_to_host_u32 (mp->sw_if_index);
-  args.is_add = mp->is_add;
-  if ((error = vnet_ip_container_proxy_add_del (&args)))
-    {
-      rv = clib_error_get_code (error);
-      clib_error_report (error);
-    }
-
-  REPLY_MACRO (VL_API_IP_CONTAINER_PROXY_ADD_DEL_REPLY);
-}
-
-typedef struct ip_container_proxy_walk_ctx_t_
-{
-  vl_api_registration_t *reg;
-  u32 context;
-} ip_container_proxy_walk_ctx_t;
-
-static int
-ip_container_proxy_send_details (const fib_prefix_t * pfx, u32 sw_if_index,
-                                void *args)
-{
-  vl_api_ip_container_proxy_details_t *mp;
-  ip_container_proxy_walk_ctx_t *ctx = args;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  if (!mp)
-    return 1;
-
-  clib_memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IP_CONTAINER_PROXY_DETAILS);
-  mp->context = ctx->context;
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  ip_prefix_encode (pfx, &mp->prefix);
-
-  vl_api_send_msg (ctx->reg, (u8 *) mp);
-
-  return 1;
+  return 1;
 }
 
 static void
@@ -1609,1179 +1349,245 @@ reply:
   REPLY_MACRO (VL_API_IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL_REPLY);
 }
 
-typedef union
-{
-  u32 fib_index;
-} ip4_source_check_config_t;
-
 static void
-  vl_api_ip_source_check_interface_add_del_t_handler
-  (vl_api_ip_source_check_interface_add_del_t * mp)
+  vl_api_sw_interface_ip6_set_link_local_address_t_handler
+  (vl_api_sw_interface_ip6_set_link_local_address_t * mp)
 {
-  vl_api_ip_source_check_interface_add_del_reply_t *rmp;
+  vl_api_sw_interface_ip6_set_link_local_address_reply_t *rmp;
+  ip6_address_t ip;
   int rv;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  u8 is_add = mp->is_add;
-  char *feature_name =
-    mp->loose ? "ip4-source-check-via-any" : "ip4-source-check-via-rx";
-
-  ip4_source_check_config_t config;
 
   VALIDATE_SW_IF_INDEX (mp);
 
-  config.fib_index =
-    fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4, sw_if_index);
-  rv =
-    vnet_feature_enable_disable ("ip4-unicast", feature_name, sw_if_index,
-                                is_add, &config, sizeof (config));
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_IP_SOURCE_CHECK_INTERFACE_ADD_DEL_REPLY);
-}
+  ip6_address_decode (mp->ip, &ip);
 
-#define IP4_ARP_EVENT 3
-#define IP6_ND_EVENT 4
+  rv = ip6_link_set_local_address (ntohl (mp->sw_if_index), &ip);
 
-static vlib_node_registration_t ip_resolver_process_node;
+  BAD_SW_IF_INDEX_LABEL;
+  REPLY_MACRO (VL_API_SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS_REPLY);
+}
 
-static int
-arp_change_delete_callback (u32 pool_index,
-                           const mac_address_t * mac,
-                           u32 sw_if_index, const ip4_address_t * address)
+static void
+vl_api_sw_interface_ip6_get_link_local_address_t_handler (
+  vl_api_sw_interface_ip6_get_link_local_address_t *mp)
 {
-  vpe_api_main_t *am = &vpe_api_main;
+  vl_api_sw_interface_ip6_get_link_local_address_reply_t *rmp;
+  const ip6_address_t *ip = NULL;
+  int rv = 0;
 
-  if (pool_is_free_index (am->arp_events, pool_index))
-    return 1;
+  VALIDATE_SW_IF_INDEX (mp);
 
-  pool_put_index (am->arp_events, pool_index);
-  return 0;
+  ip = ip6_get_link_local_address (ntohl (mp->sw_if_index));
+  if (NULL == ip)
+    rv = VNET_API_ERROR_IP6_NOT_ENABLED;
+
+  BAD_SW_IF_INDEX_LABEL;
+  /* clang-format off */
+  REPLY_MACRO2 (VL_API_SW_INTERFACE_IP6_GET_LINK_LOCAL_ADDRESS_REPLY,
+  ({
+    if (!rv)
+      ip6_address_encode (ip, rmp->ip);
+  }))
+  /* clang-format on */
 }
 
 static void
-handle_ip4_arp_event (u32 pool_index)
+vl_api_ip_table_replace_begin_t_handler (vl_api_ip_table_replace_begin_t * mp)
 {
-  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;
-  vl_api_registration_t *reg;
-
-  /* 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);
+  vl_api_ip_table_replace_begin_reply_t *rmp;
+  fib_protocol_t fproto;
+  u32 fib_index;
+  int rv = 0;
 
-  reg = vl_api_client_index_to_registration (event->client_index);
-  if (!reg)
-    {
-      (void) vnet_add_del_ip4_arp_change_event
-       (vnm, arp_change_delete_callback,
-        event->pid, event->ip,
-        ip_resolver_process_node.index, IP4_ARP_EVENT,
-        ~0 /* pool index, notused */ , 0 /* is_add */ );
-      return;
-    }
+  fproto = (mp->table.is_ip6 ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4);
+  fib_index = fib_table_find (fproto, ntohl (mp->table.table_id));
 
-  if (vl_api_can_send_msg (reg))
-    {
-      mp = vl_msg_api_alloc (sizeof (*mp));
-      clib_memcpy (mp, event, sizeof (*mp));
-      vl_api_send_msg (reg, (u8 *) mp);
-    }
+  if (INDEX_INVALID == fib_index)
+    rv = VNET_API_ERROR_NO_SUCH_FIB;
   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->ip, event->pid);
-         last_time = vlib_time_now (vm);
-       }
+      fib_table_mark (fib_index, fproto, FIB_SOURCE_API);
+      mfib_table_mark (mfib_table_find (fproto, ntohl (mp->table.table_id)),
+                      fproto, MFIB_SOURCE_API);
     }
-}
-
-static int
-nd_change_delete_callback (u32 pool_index,
-                          const mac_address_t * mac,
-                          u32 sw_if_index, const ip6_address_t * addr)
-{
-  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;
+  REPLY_MACRO (VL_API_IP_TABLE_REPLACE_BEGIN_REPLY);
 }
 
 static void
-handle_ip6_nd_event (u32 pool_index)
+vl_api_ip_table_replace_end_t_handler (vl_api_ip_table_replace_end_t * mp)
 {
-  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;
-  vl_api_registration_t *reg;
-
-  /* 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);
+  vl_api_ip_table_replace_end_reply_t *rmp;
+  fib_protocol_t fproto;
+  u32 fib_index;
+  int rv = 0;
 
-  reg = vl_api_client_index_to_registration (event->client_index);
-  if (!reg)
-    {
-      (void) vnet_add_del_ip6_nd_change_event
-       (vnm, nd_change_delete_callback,
-        event->pid, event->ip,
-        ip_resolver_process_node.index, IP6_ND_EVENT,
-        ~0 /* pool index, notused */ , 0 /* is_add */ );
-      return;
-    }
+  fproto = (mp->table.is_ip6 ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4);
+  fib_index = fib_table_find (fproto, ntohl (mp->table.table_id));
 
-  if (vl_api_can_send_msg (reg))
-    {
-      mp = vl_msg_api_alloc (sizeof (*mp));
-      clib_memcpy (mp, event, sizeof (*mp));
-      vl_api_send_msg (reg, (u8 *) mp);
-    }
+  if (INDEX_INVALID == fib_index)
+    rv = VNET_API_ERROR_NO_SUCH_FIB;
   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->ip, event->pid);
-         last_time = vlib_time_now (vm);
-       }
+      fib_table_sweep (fib_index, fproto, FIB_SOURCE_API);
+      mfib_table_sweep (mfib_table_find
+                       (fproto, ntohl (mp->table.table_id)), fproto,
+                       MFIB_SOURCE_API);
     }
+  REPLY_MACRO (VL_API_IP_TABLE_REPLACE_END_REPLY);
 }
 
-static uword
-resolver_process (vlib_main_t * vm,
-                 vlib_node_runtime_t * rt, vlib_frame_t * f)
+static void
+vl_api_ip_table_flush_t_handler (vl_api_ip_table_flush_t * mp)
 {
-  volatile f64 timeout = 100.0;
-  volatile uword *event_data = 0;
-
-  while (1)
-    {
-      vlib_process_wait_for_event_or_clock (vm, timeout);
-
-      uword event_type =
-       vlib_process_get_events (vm, (uword **) & event_data);
-
-      int i;
-      switch (event_type)
-       {
-       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 */
-}
+  vl_api_ip_table_flush_reply_t *rmp;
+  fib_protocol_t fproto;
+  u32 fib_index;
+  int rv = 0;
 
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip_resolver_process_node,static) = {
-  .function = resolver_process,
-  .type = VLIB_NODE_TYPE_PROCESS,
-  .name = "ip-route-resolver-process",
-};
-/* *INDENT-ON* */
+  fproto = (mp->table.is_ip6 ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4);
+  fib_index = fib_table_find (fproto, ntohl (mp->table.table_id));
 
-static int
-nd_change_data_callback (u32 pool_index, const mac_address_t * new_mac,
-                        u32 sw_if_index, const ip6_address_t * address)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  vl_api_ip6_nd_event_t *event;
+  if (INDEX_INVALID == fib_index)
+    rv = VNET_API_ERROR_NO_SUCH_FIB;
+  else
+    {
+      vnet_main_t *vnm = vnet_get_main ();
+      vnet_interface_main_t *im = &vnm->interface_main;
+      vnet_sw_interface_t *si;
 
-  if (pool_is_free_index (am->nd_events, pool_index))
-    return 1;
+      /* Shut down interfaces in this FIB / clean out intfc routes */
+      /* *INDENT-OFF* */
+      pool_foreach (si, im->sw_interfaces)
+       {
+        if (fib_index == fib_table_get_index_for_sw_if_index (fproto,
+                                                              si->sw_if_index))
+          {
+            u32 flags = si->flags;
+            flags &= ~VNET_SW_INTERFACE_FLAG_ADMIN_UP;
+            vnet_sw_interface_set_flags (vnm, si->sw_if_index, flags);
+          }
+      }
+      /* *INDENT-ON* */
 
-  event = pool_elt_at_index (am->nd_events, pool_index);
-  if (ethernet_mac_address_equal (event->mac, new_mac->bytes) &&
-      sw_if_index == ntohl (event->sw_if_index))
-    {
-      return 1;
+      fib_table_flush (fib_index, fproto, FIB_SOURCE_API);
+      mfib_table_flush (mfib_table_find (fproto, ntohl (mp->table.table_id)),
+                       fproto, MFIB_SOURCE_API);
     }
 
-  mac_address_encode (new_mac, event->mac);
-  event->sw_if_index = htonl (sw_if_index);
-  return 0;
+  REPLY_MACRO (VL_API_IP_TABLE_FLUSH_REPLY);
 }
 
-static vlib_node_registration_t wc_arp_process_node;
-
-enum
-{ WC_ARP_REPORT, WC_ND_REPORT, RA_REPORT, REPORT_MAX };
-
-static uword
-wc_arp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
+void
+vl_api_ip_reassembly_set_t_handler (vl_api_ip_reassembly_set_t * mp)
 {
-  /* These cross the longjmp boundary (vlib_process_wait_for_event)
-   * and need to be volatile - to prevent them from being optimized into
-   * a register - which could change during suspension */
-
-  volatile wc_arp_report_t arp_prev = { 0 };
-  volatile wc_nd_report_t nd_prev = { 0 };
-  volatile f64 last_arp = vlib_time_now (vm);
-  volatile f64 last_nd = vlib_time_now (vm);
-
-  while (1)
+  vl_api_ip_reassembly_set_reply_t *rmp;
+  int rv = 0;
+  switch ((vl_api_ip_reass_type_t) clib_net_to_host_u32 (mp->type))
     {
-      vlib_process_wait_for_event (vm);
-      uword event_type = WC_ARP_REPORT;
-      void *event_data = vlib_process_get_event_data (vm, &event_type);
-
-      f64 now = vlib_time_now (vm);
-      int i;
-      if (event_type == WC_ARP_REPORT)
+    case IP_REASS_TYPE_FULL:
+      if (mp->is_ip6)
        {
-         wc_arp_report_t *arp_events = event_data;
-         for (i = 0; i < vec_len (arp_events); i++)
-           {
-             /* discard dup event - cast away volatile */
-             if (arp_prev.ip.as_u32 == arp_events[i].ip.as_u32 &&
-                 mac_address_equal ((const mac_address_t *) &arp_prev.mac,
-                                    &arp_events[i].mac) &&
-                 arp_prev.sw_if_index == arp_events[i].sw_if_index &&
-                 (now - last_arp) < 10.0)
-               {
-                 continue;
-               }
-             arp_prev = arp_events[i];
-             last_arp = now;
-             vpe_client_registration_t *reg;
-            /* *INDENT-OFF* */
-            pool_foreach(reg, vpe_api_main.wc_ip4_arp_events_registrations,
-            ({
-             vl_api_registration_t *vl_reg;
-              vl_reg = vl_api_client_index_to_registration (reg->client_index);
-              ASSERT (vl_reg != NULL);
-             if (reg && vl_api_can_send_msg (vl_reg))
-               {
-                 vl_api_ip4_arp_event_t * event = vl_msg_api_alloc (sizeof *event);
-                 clib_memset (event, 0, sizeof *event);
-                 event->_vl_msg_id = htons (VL_API_IP4_ARP_EVENT);
-                 event->client_index = reg->client_index;
-                 event->pid = reg->client_pid;
-                 event->mac_ip = 1;
-                 ip4_address_encode(&arp_events[i].ip, event->ip);
-                 event->sw_if_index = htonl(arp_events[i].sw_if_index);
-                 mac_address_encode(&arp_events[i].mac, event->mac);
-                 vl_api_send_msg (vl_reg, (u8 *) event);
-               }
-            }));
-            /* *INDENT-ON* */
-           }
+         rv = ip6_full_reass_set (clib_net_to_host_u32 (mp->timeout_ms),
+                                  clib_net_to_host_u32
+                                  (mp->max_reassemblies),
+                                  clib_net_to_host_u32
+                                  (mp->max_reassembly_length),
+                                  clib_net_to_host_u32
+                                  (mp->expire_walk_interval_ms));
+       }
+      else
+       {
+         rv = ip4_full_reass_set (clib_net_to_host_u32 (mp->timeout_ms),
+                                  clib_net_to_host_u32
+                                  (mp->max_reassemblies),
+                                  clib_net_to_host_u32
+                                  (mp->max_reassembly_length),
+                                  clib_net_to_host_u32
+                                  (mp->expire_walk_interval_ms));
        }
-      else if (event_type == WC_ND_REPORT)
+      break;
+    case IP_REASS_TYPE_SHALLOW_VIRTUAL:
+      if (mp->is_ip6)
        {
-         wc_nd_report_t *nd_events = event_data;
-         for (i = 0; i < vec_len (nd_events); i++)
-           {
-             /* discard dup event - cast away volatile */
-             if (ip6_address_is_equal ((const ip6_address_t *) &nd_prev.ip6,
-                                       &nd_events[i].ip6)
-                 && mac_address_equal ((const mac_address_t *) &nd_prev.mac,
-                                       &nd_events[i].mac)
-                 && nd_prev.sw_if_index == nd_events[i].sw_if_index
-                 && (now - last_nd) < 10.0)
-               {
-                 continue;
-               }
-             nd_prev = nd_events[i];
-             last_nd = now;
-             vpe_client_registration_t *reg;
-              /* *INDENT-OFF* */
-              pool_foreach(reg, vpe_api_main.wc_ip6_nd_events_registrations,
-              ({
-               vl_api_registration_t *vl_reg;
-                vl_reg = vl_api_client_index_to_registration (reg->client_index);
-               if (vl_reg && vl_api_can_send_msg (vl_reg))
-                 {
-                   vl_api_ip6_nd_event_t * event = vl_msg_api_alloc (sizeof *event);
-                   clib_memset (event, 0, sizeof *event);
-                   event->_vl_msg_id = htons (VL_API_IP6_ND_EVENT);
-                   event->client_index = reg->client_index;
-                   event->pid = reg->client_pid;
-                   event->mac_ip = 1;
-                   ip6_address_encode(&nd_events[i].ip6, event->ip);
-                   event->sw_if_index = htonl(nd_events[i].sw_if_index);
-                   mac_address_encode(&nd_events[i].mac, event->mac);
-                   vl_api_send_msg (vl_reg, (u8 *) event);
-                 }
-              }));
-            /* *INDENT-ON* */
-           }
+         rv =
+           ip6_sv_reass_set (clib_net_to_host_u32 (mp->timeout_ms),
+                             clib_net_to_host_u32 (mp->max_reassemblies),
+                             clib_net_to_host_u32
+                             (mp->max_reassembly_length),
+                             clib_net_to_host_u32
+                             (mp->expire_walk_interval_ms));
        }
-      else if (event_type == RA_REPORT)
+      else
        {
-         ra_report_t *ra_events = event_data;
-         for (i = 0; i < vec_len (ra_events); i++)
-           {
-             ip6_neighbor_public_main_t *npm = &ip6_neighbor_public_main;
-             call_ip6_neighbor_callbacks (&ra_events[i],
-                                          npm->ra_report_functions);
-
-             vpe_client_registration_t *reg;
-              /* *INDENT-OFF* */
-              pool_foreach(reg, vpe_api_main.ip6_ra_events_registrations,
-              ({
-               vl_api_registration_t *vl_reg;
-               vl_reg =
-                 vl_api_client_index_to_registration (reg->client_index);
-               if (vl_reg && vl_api_can_send_msg (vl_reg))
-                 {
-                   u32 event_size =
-                     sizeof (vl_api_ip6_ra_event_t) +
-                     vec_len (ra_events[i].prefixes) *
-                     sizeof (vl_api_ip6_ra_prefix_info_t);
-                   vl_api_ip6_ra_event_t *event =
-                     vl_msg_api_alloc (event_size);
-                   clib_memset (event, 0, event_size);
-                   event->_vl_msg_id = htons (VL_API_IP6_RA_EVENT);
-                   event->client_index = reg->client_index;
-                   event->pid = reg->client_pid;
-
-                   event->sw_if_index = clib_host_to_net_u32 (ra_events[i].sw_if_index);
-
-                   ip6_address_encode (&ra_events[i].router_address,
-                                        event->router_addr);
-
-                   event->current_hop_limit = ra_events[i].current_hop_limit;
-                   event->flags = ra_events[i].flags;
-                   event->router_lifetime_in_sec =
-                     clib_host_to_net_u16 (ra_events
-                                           [i].router_lifetime_in_sec);
-                   event->neighbor_reachable_time_in_msec =
-                     clib_host_to_net_u32 (ra_events
-                                           [i].neighbor_reachable_time_in_msec);
-                   event->time_in_msec_between_retransmitted_neighbor_solicitations
-                     =
-                     clib_host_to_net_u32 (ra_events
-                                           [i].time_in_msec_between_retransmitted_neighbor_solicitations);
-
-                   event->n_prefixes =
-                     clib_host_to_net_u32 (vec_len (ra_events[i].prefixes));
-                   vl_api_ip6_ra_prefix_info_t *prefix =
-                     (typeof (prefix)) event->prefixes;
-                   u32 j;
-                   for (j = 0; j < vec_len (ra_events[i].prefixes); j++)
-                     {
-                       ra_report_prefix_info_t *info =
-                         &ra_events[i].prefixes[j];
-                       ip_prefix_encode(&info->prefix, &prefix->prefix);
-                       prefix->flags = info->flags;
-                       prefix->valid_time =
-                         clib_host_to_net_u32 (info->valid_time);
-                       prefix->preferred_time =
-                         clib_host_to_net_u32 (info->preferred_time);
-                       prefix++;
-                     }
-
-                   vl_api_send_msg (vl_reg, (u8 *) event);
-                 }
-              }));
-              /* *INDENT-ON* */
-             vec_free (ra_events[i].prefixes);
-           }
+         rv = ip4_sv_reass_set (clib_net_to_host_u32 (mp->timeout_ms),
+                                clib_net_to_host_u32 (mp->max_reassemblies),
+                                clib_net_to_host_u32
+                                (mp->max_reassembly_length),
+                                clib_net_to_host_u32
+                                (mp->expire_walk_interval_ms));
        }
-      vlib_process_put_event_data (vm, event_data);
+      break;
     }
 
-  return 0;
+  REPLY_MACRO (VL_API_IP_REASSEMBLY_SET_REPLY);
 }
 
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (wc_arp_process_node,static) = {
-  .function = wc_arp_process,
-  .type = VLIB_NODE_TYPE_PROCESS,
-  .name = "wildcard-ip4-arp-publisher-process",
-};
-/* *INDENT-ON* */
-
-static int
-arp_change_data_callback (u32 pool_index,
-                         const mac_address_t * mac,
-                         u32 sw_if_index, const ip4_address_t * address)
+void
+vl_api_ip_reassembly_get_t_handler (vl_api_ip_reassembly_get_t * mp)
 {
-  vpe_api_main_t *am = &vpe_api_main;
-  vl_api_ip4_arp_event_t *event;
+  vl_api_registration_t *rp;
 
-  if (pool_is_free_index (am->arp_events, pool_index))
-    return 1;
-
-  event = pool_elt_at_index (am->arp_events, pool_index);
-  if (ethernet_mac_address_equal (event->mac, mac->bytes) &&
-      sw_if_index == ntohl (event->sw_if_index))
-    {
-      return 1;
-    }
-
-  mac_address_encode (mac, event->mac);
-  event->sw_if_index = htonl (sw_if_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;
-  ip4_address_t ip;
-  int rv = 0;
-
-  ip4_address_decode (mp->ip, &ip);
-
-  if (ip.as_u32 == 0)
-    {
-      uword *p =
-       hash_get (am->wc_ip4_arp_events_registration_hash, mp->client_index);
-      vpe_client_registration_t *rp;
-      if (p)
-       {
-         if (mp->enable_disable)
-           {
-             clib_warning ("pid %d: already enabled...", mp->pid);
-             rv = VNET_API_ERROR_INVALID_REGISTRATION;
-             goto reply;
-           }
-         else
-           {
-             rp =
-               pool_elt_at_index (am->wc_ip4_arp_events_registrations, p[0]);
-             pool_put (am->wc_ip4_arp_events_registrations, rp);
-             hash_unset (am->wc_ip4_arp_events_registration_hash,
-                         mp->client_index);
-             if (pool_elts (am->wc_ip4_arp_events_registrations) == 0)
-               wc_arp_set_publisher_node (~0, REPORT_MAX);
-             goto reply;
-           }
-       }
-      if (mp->enable_disable == 0)
-       {
-         clib_warning ("pid %d: already disabled...", mp->pid);
-         rv = VNET_API_ERROR_INVALID_REGISTRATION;
-         goto reply;
-       }
-      pool_get (am->wc_ip4_arp_events_registrations, rp);
-      rp->client_index = mp->client_index;
-      rp->client_pid = mp->pid;
-      hash_set (am->wc_ip4_arp_events_registration_hash, rp->client_index,
-               rp - am->wc_ip4_arp_events_registrations);
-      wc_arp_set_publisher_node (wc_arp_process_node.index, WC_ARP_REPORT);
-      goto reply;
-    }
-
-  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->ip /* addr, in net byte order */ ,
-        ip_resolver_process_node.index,
-        IP4_ARP_EVENT, event - am->arp_events, 1 /* is_add */ );
-
-      if (rv)
-       {
-         pool_put (am->arp_events, event);
-         goto reply;
-       }
-      clib_memset (event, 0, sizeof (*event));
-
-      /* Python API expects events to have no context */
-      event->_vl_msg_id = htons (VL_API_IP4_ARP_EVENT);
-      event->client_index = mp->client_index;
-      memcpy (event->ip, mp->ip, 4);
-      event->pid = mp->pid;
-      if (ip.as_u32 == 0)
-       event->mac_ip = 1;
-    }
-  else
-    {
-      rv = vnet_add_del_ip4_arp_change_event
-       (vnm, arp_change_delete_callback,
-        mp->pid, mp->ip /* addr, in net byte order */ ,
-        ip_resolver_process_node.index,
-        IP4_ARP_EVENT, ~0 /* pool index */ , 0 /* is_add */ );
-    }
-reply:
-  REPLY_MACRO (VL_API_WANT_IP4_ARP_EVENTS_REPLY);
-}
-
-static clib_error_t *
-want_ip4_arp_events_reaper (u32 client_index)
-{
-  vpe_client_registration_t *rp;
-  vl_api_ip4_arp_event_t *event;
-  u32 *to_delete, *event_id;
-  vpe_api_main_t *am;
-  vnet_main_t *vnm;
-  uword *p;
-
-  am = &vpe_api_main;
-  vnm = vnet_get_main ();
-  to_delete = NULL;
-
-  /* clear out all of its pending resolutions */
-  /* *INDENT-OFF* */
-  pool_foreach(event, am->arp_events,
-  ({
-    if (event->client_index == client_index)
-      {
-        vec_add1(to_delete, event - am->arp_events);
-      }
-  }));
-  /* *INDENT-ON* */
-
-  vec_foreach (event_id, to_delete)
-  {
-    event = pool_elt_at_index (am->arp_events, *event_id);
-    vnet_add_del_ip4_arp_change_event
-      (vnm, arp_change_delete_callback,
-       event->pid, event->ip,
-       ip_resolver_process_node.index, IP4_ARP_EVENT,
-       ~0 /* pool index, notused */ , 0 /* is_add */ );
-  }
-  vec_free (to_delete);
-
-  /* remove from the registration hash */
-  p = hash_get (am->wc_ip4_arp_events_registration_hash, client_index);
-
-  if (p)
-    {
-      rp = pool_elt_at_index (am->wc_ip4_arp_events_registrations, p[0]);
-      pool_put (am->wc_ip4_arp_events_registrations, rp);
-      hash_unset (am->wc_ip4_arp_events_registration_hash, client_index);
-      if (pool_elts (am->wc_ip4_arp_events_registrations) == 0)
-       wc_arp_set_publisher_node (~0, REPORT_MAX);
-    }
-  return (NULL);
-}
-
-VL_MSG_API_REAPER_FUNCTION (want_ip4_arp_events_reaper);
-
-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;
-  ip6_address_t ip6;
-  int rv = 0;
-
-  ip6_address_decode (mp->ip, &ip6);
+  rp = vl_api_client_index_to_registration (mp->client_index);
+  if (rp == 0)
+    return;
 
-  if (ip6_address_is_zero (&ip6))
+  vl_api_ip_reassembly_get_reply_t *rmp = vl_msg_api_alloc (sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_IP_REASSEMBLY_GET_REPLY);
+  rmp->context = mp->context;
+  rmp->retval = 0;
+  u32 timeout_ms;
+  u32 max_reassemblies;
+  u32 max_reassembly_length;
+  u32 expire_walk_interval_ms;
+  switch ((vl_api_ip_reass_type_t) clib_net_to_host_u32 (mp->type))
     {
-      uword *p =
-       hash_get (am->wc_ip6_nd_events_registration_hash, mp->client_index);
-      vpe_client_registration_t *rp;
-      if (p)
+    case IP_REASS_TYPE_FULL:
+      if (mp->is_ip6)
        {
-         if (mp->enable_disable)
-           {
-             clib_warning ("pid %d: already enabled...", mp->pid);
-             rv = VNET_API_ERROR_INVALID_REGISTRATION;
-             goto reply;
-           }
-         else
-           {
-             rp =
-               pool_elt_at_index (am->wc_ip6_nd_events_registrations, p[0]);
-             pool_put (am->wc_ip6_nd_events_registrations, rp);
-             hash_unset (am->wc_ip6_nd_events_registration_hash,
-                         mp->client_index);
-             if (pool_elts (am->wc_ip6_nd_events_registrations) == 0)
-               wc_nd_set_publisher_node (~0, REPORT_MAX);
-             goto reply;
-           }
+         rmp->is_ip6 = 1;
+         ip6_full_reass_get (&timeout_ms, &max_reassemblies,
+                             &max_reassembly_length,
+                             &expire_walk_interval_ms);
        }
-      if (mp->enable_disable == 0)
+      else
        {
-         clib_warning ("pid %d: already disabled...", mp->pid);
-         rv = VNET_API_ERROR_INVALID_REGISTRATION;
-         goto reply;
+         rmp->is_ip6 = 0;
+         ip4_full_reass_get (&timeout_ms, &max_reassemblies,
+                             &max_reassembly_length,
+                             &expire_walk_interval_ms);
        }
-      pool_get (am->wc_ip6_nd_events_registrations, rp);
-      rp->client_index = mp->client_index;
-      rp->client_pid = mp->pid;
-      hash_set (am->wc_ip6_nd_events_registration_hash, rp->client_index,
-               rp - am->wc_ip6_nd_events_registrations);
-      wc_nd_set_publisher_node (wc_arp_process_node.index, WC_ND_REPORT);
-      goto reply;
-    }
-
-  if (mp->enable_disable)
-    {
-      vl_api_ip6_nd_event_t *event;
-      pool_get (am->nd_events, event);
-
-      rv = vnet_add_del_ip6_nd_change_event
-       (vnm, nd_change_data_callback,
-        mp->pid, &ip6,
-        ip_resolver_process_node.index,
-        IP6_ND_EVENT, event - am->nd_events, 1 /* is_add */ );
-
-      if (rv)
+      break;
+    case IP_REASS_TYPE_SHALLOW_VIRTUAL:
+      if (mp->is_ip6)
        {
-         pool_put (am->nd_events, event);
-         goto reply;
-       }
-      clib_memset (event, 0, sizeof (*event));
-
-      event->_vl_msg_id = ntohs (VL_API_IP6_ND_EVENT);
-      event->client_index = mp->client_index;
-      ip6_address_encode (&ip6, event->ip);
-      event->pid = mp->pid;
-    }
-  else
-    {
-      rv = vnet_add_del_ip6_nd_change_event
-       (vnm, nd_change_delete_callback,
-        mp->pid, &ip6 /* addr, in net byte order */ ,
-        ip_resolver_process_node.index,
-        IP6_ND_EVENT, ~0 /* pool index */ , 0 /* is_add */ );
-    }
-reply:
-  REPLY_MACRO (VL_API_WANT_IP6_ND_EVENTS_REPLY);
-}
-
-static clib_error_t *
-want_ip6_nd_events_reaper (u32 client_index)
-{
-
-  vpe_client_registration_t *rp;
-  vl_api_ip6_nd_event_t *event;
-  u32 *to_delete, *event_id;
-  vpe_api_main_t *am;
-  vnet_main_t *vnm;
-  uword *p;
-
-  am = &vpe_api_main;
-  vnm = vnet_get_main ();
-  to_delete = NULL;
-
-  /* clear out all of its pending resolutions */
-  /* *INDENT-OFF* */
-  pool_foreach(event, am->nd_events,
-  ({
-    if (event->client_index == client_index)
-      {
-        vec_add1(to_delete, event - am->nd_events);
-      }
-  }));
-  /* *INDENT-ON* */
-
-  vec_foreach (event_id, to_delete)
-  {
-    event = pool_elt_at_index (am->nd_events, *event_id);
-    vnet_add_del_ip6_nd_change_event
-      (vnm, nd_change_delete_callback,
-       event->pid, event->ip,
-       ip_resolver_process_node.index, IP6_ND_EVENT,
-       ~0 /* pool index, notused */ , 0 /* is_add */ );
-  }
-  vec_free (to_delete);
-
-  /* remove from the registration hash */
-  p = hash_get (am->wc_ip6_nd_events_registration_hash, client_index);
-
-  if (p)
-    {
-      rp = pool_elt_at_index (am->wc_ip6_nd_events_registrations, p[0]);
-      pool_put (am->wc_ip6_nd_events_registrations, rp);
-      hash_unset (am->wc_ip6_nd_events_registration_hash, client_index);
-      if (pool_elts (am->wc_ip6_nd_events_registrations) == 0)
-       wc_nd_set_publisher_node (~0, REPORT_MAX);
-    }
-  return (NULL);
-}
-
-VL_MSG_API_REAPER_FUNCTION (want_ip6_nd_events_reaper);
-
-static void
-vl_api_want_ip6_ra_events_t_handler (vl_api_want_ip6_ra_events_t * mp)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  vl_api_want_ip6_ra_events_reply_t *rmp;
-  int rv = 0;
-
-  uword *p = hash_get (am->ip6_ra_events_registration_hash, mp->client_index);
-  vpe_client_registration_t *rp;
-  if (p)
-    {
-      if (mp->enable_disable)
-       {
-         clib_warning ("pid %d: already enabled...", ntohl (mp->pid));
-         rv = VNET_API_ERROR_INVALID_REGISTRATION;
-         goto reply;
+         rmp->is_ip6 = 1;
+         ip6_sv_reass_get (&timeout_ms, &max_reassemblies,
+                           &max_reassembly_length, &expire_walk_interval_ms);
        }
       else
        {
-         rp = pool_elt_at_index (am->ip6_ra_events_registrations, p[0]);
-         pool_put (am->ip6_ra_events_registrations, rp);
-         hash_unset (am->ip6_ra_events_registration_hash, mp->client_index);
-         goto reply;
+         rmp->is_ip6 = 0;
+         ip4_sv_reass_get (&timeout_ms, &max_reassemblies,
+                           &max_reassembly_length, &expire_walk_interval_ms);
        }
+      break;
     }
-  if (mp->enable_disable == 0)
-    {
-      clib_warning ("pid %d: already disabled...", ntohl (mp->pid));
-      rv = VNET_API_ERROR_INVALID_REGISTRATION;
-      goto reply;
-    }
-  pool_get (am->ip6_ra_events_registrations, rp);
-  rp->client_index = mp->client_index;
-  rp->client_pid = ntohl (mp->pid);
-  hash_set (am->ip6_ra_events_registration_hash, rp->client_index,
-           rp - am->ip6_ra_events_registrations);
-
-reply:
-  REPLY_MACRO (VL_API_WANT_IP6_RA_EVENTS_REPLY);
-}
-
-static clib_error_t *
-want_ip6_ra_events_reaper (u32 client_index)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  vpe_client_registration_t *rp;
-  uword *p;
-
-  p = hash_get (am->ip6_ra_events_registration_hash, client_index);
-
-  if (p)
-    {
-      rp = pool_elt_at_index (am->ip6_ra_events_registrations, p[0]);
-      pool_put (am->ip6_ra_events_registrations, rp);
-      hash_unset (am->ip6_ra_events_registration_hash, client_index);
-    }
-  return (NULL);
-}
-
-VL_MSG_API_REAPER_FUNCTION (want_ip6_ra_events_reaper);
-
-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;
-  ip4_address_t lo, hi;
-  u32 fib_index;
-  int rv;
-
-  fib_index = fib_table_find (FIB_PROTOCOL_IP4, ntohl (mp->proxy.table_id));
-
-  if (~0 == fib_index)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_FIB;
-      goto out;
-    }
-
-  ip4_address_decode (mp->proxy.low, &lo);
-  ip4_address_decode (mp->proxy.hi, &hi);
-
-  rv = vnet_proxy_arp_add_del (&lo, &hi, fib_index, mp->is_add == 0);
-
-out:
-  REPLY_MACRO (VL_API_PROXY_ARP_ADD_DEL_REPLY);
-}
-
-typedef struct proxy_arp_walk_ctx_t_
-{
-  vl_api_registration_t *reg;
-  u32 context;
-} proxy_arp_walk_ctx_t;
-
-static walk_rc_t
-send_proxy_arp_details (const ip4_address_t * lo_addr,
-                       const ip4_address_t * hi_addr,
-                       u32 fib_index, void *data)
-{
-  vl_api_proxy_arp_details_t *mp;
-  proxy_arp_walk_ctx_t *ctx;
-
-  ctx = data;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  clib_memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_PROXY_ARP_DETAILS);
-  mp->context = ctx->context;
-  mp->proxy.table_id = htonl (fib_index);
-
-  ip4_address_encode (lo_addr, mp->proxy.low);
-  ip4_address_encode (hi_addr, mp->proxy.hi);
-
-  vl_api_send_msg (ctx->reg, (u8 *) mp);
-
-  return (WALK_CONTINUE);
-}
-
-static void
-vl_api_proxy_arp_dump_t_handler (vl_api_proxy_arp_dump_t * mp)
-{
-  vl_api_registration_t *reg;
-
-  reg = vl_api_client_index_to_registration (mp->client_index);
-  if (!reg)
-    return;
-
-  proxy_arp_walk_ctx_t wctx = {
-    .reg = reg,
-    .context = mp->context,
-  };
-
-  proxy_arp_walk (send_proxy_arp_details, &wctx);
-}
-
-static walk_rc_t
-send_proxy_arp_intfc_details (u32 sw_if_index, void *data)
-{
-  vl_api_proxy_arp_intfc_details_t *mp;
-  proxy_arp_walk_ctx_t *ctx;
-
-  ctx = data;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  clib_memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_PROXY_ARP_INTFC_DETAILS);
-  mp->context = ctx->context;
-  mp->sw_if_index = htonl (sw_if_index);
-
-  vl_api_send_msg (ctx->reg, (u8 *) mp);
-
-  return (WALK_CONTINUE);
-}
-
-static void
-vl_api_proxy_arp_intfc_dump_t_handler (vl_api_proxy_arp_intfc_dump_t * mp)
-{
-  vl_api_registration_t *reg;
-
-  reg = vl_api_client_index_to_registration (mp->client_index);
-  if (!reg)
-    return;
-
-  proxy_arp_walk_ctx_t wctx = {
-    .reg = reg,
-    .context = mp->context,
-  };
-
-  proxy_arp_intfc_walk (send_proxy_arp_intfc_details, &wctx);
-}
-
-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);
-
-  rv = vnet_proxy_arp_enable_disable (vnm,
-                                     ntohl (mp->sw_if_index),
-                                     mp->enable_disable);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_PROXY_ARP_INTFC_ENABLE_DISABLE_REPLY);
-}
-
-static void
-vl_api_ip_probe_neighbor_t_handler (vl_api_ip_probe_neighbor_t * mp)
-{
-  int rv = 0;
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_ip_probe_neighbor_reply_t *rmp;
-  clib_error_t *error;
-  ip46_address_t dst;
-  ip46_type_t itype;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  itype = ip_address_decode (&mp->dst, &dst);
-
-  if (IP46_TYPE_IP6 == itype)
-    error = ip6_probe_neighbor (vm, &dst.ip6, sw_if_index, 0);
-  else
-    error = ip4_probe_neighbor (vm, &dst.ip4, sw_if_index, 0);
-
-  if (error)
-    {
-      clib_error_report (error);
-      rv = clib_error_get_code (error);
-    }
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_IP_PROBE_NEIGHBOR_REPLY);
-}
-
-static void
-  vl_api_ip_scan_neighbor_enable_disable_t_handler
-  (vl_api_ip_scan_neighbor_enable_disable_t * mp)
-{
-  int rv = 0;
-  vl_api_ip_scan_neighbor_enable_disable_reply_t *rmp;
-  ip_neighbor_scan_arg_t arg;
-
-  arg.mode = mp->mode;
-  arg.scan_interval = mp->scan_interval;
-  arg.max_proc_time = mp->max_proc_time;
-  arg.max_update = mp->max_update;
-  arg.scan_int_delay = mp->scan_int_delay;
-  arg.stale_threshold = mp->stale_threshold;
-  ip_neighbor_scan_enable_disable (&arg);
-
-  REPLY_MACRO (VL_API_IP_SCAN_NEIGHBOR_ENABLE_DISABLE_REPLY);
-}
-
-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;
-  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);
-
-  /* *INDENT-OFF* */
-  pool_foreach (fib_table, im4->fibs,
-  ({
-    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;
-
-    /* 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* */
-
-  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;
-  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);
-
-  /* *INDENT-OFF* */
-  pool_foreach (fib_table, im6->fibs,
-  ({
-    vnet_sw_interface_t * si;
-
-    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);
-    }));
-
-    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* */
-
-  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_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);
-}
-
-void
-vl_api_ip_reassembly_set_t_handler (vl_api_ip_reassembly_set_t * mp)
-{
-  vl_api_ip_reassembly_set_reply_t *rmp;
-  int rv = 0;
-  if (mp->is_ip6)
-    {
-      rv = ip6_reass_set (clib_net_to_host_u32 (mp->timeout_ms),
-                         clib_net_to_host_u32 (mp->max_reassemblies),
-                         clib_net_to_host_u32 (mp->max_reassembly_length),
-                         clib_net_to_host_u32 (mp->expire_walk_interval_ms));
-    }
-  else
-    {
-      rv = ip4_reass_set (clib_net_to_host_u32 (mp->timeout_ms),
-                         clib_net_to_host_u32 (mp->max_reassemblies),
-                         clib_net_to_host_u32 (mp->max_reassembly_length),
-                         clib_net_to_host_u32 (mp->expire_walk_interval_ms));
-    }
-
-  REPLY_MACRO (VL_API_IP_REASSEMBLY_SET_REPLY);
-}
-
-void
-vl_api_ip_reassembly_get_t_handler (vl_api_ip_reassembly_get_t * mp)
-{
-  vl_api_registration_t *rp;
-
-  rp = vl_api_client_index_to_registration (mp->client_index);
-  if (rp == 0)
-    return;
-
-  vl_api_ip_reassembly_get_reply_t *rmp = vl_msg_api_alloc (sizeof (*rmp));
-  clib_memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_IP_REASSEMBLY_GET_REPLY);
-  rmp->context = mp->context;
-  rmp->retval = 0;
-  if (mp->is_ip6)
-    {
-      rmp->is_ip6 = 1;
-      ip6_reass_get (&rmp->timeout_ms, &rmp->max_reassemblies,
-                    &rmp->expire_walk_interval_ms);
-    }
-  else
-    {
-      rmp->is_ip6 = 0;
-      ip4_reass_get (&rmp->timeout_ms, &rmp->max_reassemblies,
-                    &rmp->max_reassembly_length,
-                    &rmp->expire_walk_interval_ms);
-    }
-  rmp->timeout_ms = clib_host_to_net_u32 (rmp->timeout_ms);
-  rmp->max_reassemblies = clib_host_to_net_u32 (rmp->max_reassemblies);
+  rmp->timeout_ms = clib_host_to_net_u32 (timeout_ms);
+  rmp->max_reassemblies = clib_host_to_net_u32 (max_reassemblies);
+  rmp->max_reassembly_length = clib_host_to_net_u32 (max_reassembly_length);
   rmp->expire_walk_interval_ms =
-    clib_host_to_net_u32 (rmp->expire_walk_interval_ms);
+    clib_host_to_net_u32 (expire_walk_interval_ms);
   vl_api_send_msg (rp, (u8 *) rmp);
 }
 
@@ -2791,12 +1597,28 @@ void
 {
   vl_api_ip_reassembly_enable_disable_reply_t *rmp;
   int rv = 0;
-  rv = ip4_reass_enable_disable (clib_net_to_host_u32 (mp->sw_if_index),
-                                mp->enable_ip4);
-  if (0 == rv)
+  switch ((vl_api_ip_reass_type_t) clib_net_to_host_u32 (mp->type))
     {
-      rv = ip6_reass_enable_disable (clib_net_to_host_u32 (mp->sw_if_index),
-                                    mp->enable_ip6);
+    case IP_REASS_TYPE_FULL:
+      rv =
+       ip4_full_reass_enable_disable (clib_net_to_host_u32 (mp->sw_if_index),
+                                      mp->enable_ip4);
+      if (0 == rv)
+       rv =
+         ip6_full_reass_enable_disable (clib_net_to_host_u32
+                                        (mp->sw_if_index), mp->enable_ip6);
+      break;
+    case IP_REASS_TYPE_SHALLOW_VIRTUAL:
+      rv =
+       ip4_sv_reass_enable_disable (clib_net_to_host_u32 (mp->sw_if_index),
+                                    mp->enable_ip4);
+      if (0 == rv)
+       {
+         rv =
+           ip6_sv_reass_enable_disable (clib_net_to_host_u32
+                                        (mp->sw_if_index), mp->enable_ip6);
+       }
+      break;
     }
 
   REPLY_MACRO (VL_API_IP_REASSEMBLY_ENABLE_DISABLE_REPLY);
@@ -2845,13 +1667,14 @@ static void
 vl_api_ip_punt_redirect_dump_t_handler (vl_api_ip_punt_redirect_dump_t * mp)
 {
   vl_api_registration_t *reg;
-  fib_protocol_t fproto;
+  fib_protocol_t fproto = FIB_PROTOCOL_IP4;
 
   reg = vl_api_client_index_to_registration (mp->client_index);
   if (!reg)
     return;
 
-  fproto = mp->is_ipv6 ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4;
+  if (mp->is_ipv6 == 1)
+    fproto = FIB_PROTOCOL_IP6;
 
   ip_punt_redirect_walk_ctx_t ctx = {
     .reg = reg,
@@ -2891,7 +1714,7 @@ setup_message_id_table (api_main_t * am)
 static clib_error_t *
 ip_api_hookup (vlib_main_t * vm)
 {
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
 
 #define _(N,n)                                                  \
     vl_msg_api_set_handlers(VL_API_##N, #n,                     \
@@ -2914,8 +1737,6 @@ ip_api_hookup (vlib_main_t * vm)
    */
   setup_message_id_table (am);
 
-  ra_set_publisher_node (wc_arp_process_node.index, RA_REPORT);
-
   return 0;
 }