Initial commit of vpp code.

Change-Id: Ib246f1fbfce93274020ee93ce461e3d8bd8b9f17
Signed-off-by: Ed Warnicke <eaw@cisco.com>

9 files changed, 10207 insertions, 0 deletions

diff --git a/vpp-api-test/vat/api_format.c b/vpp-api-test/vat/api_format.c
new file mode 100644
index 00000000..5ee4b929
--- /dev/null
+++ b/vpp-api-test/vat/api_format.c
@@ -0,0 +1,8718 @@
+/*
+ *------------------------------------------------------------------
+ * api_format.c 
+ * 
+ * Copyright (c) 2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. 
+ *------------------------------------------------------------------
+ */
+
+#include <vat/vat.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+#include <vnet/ip/ip.h>
+#include <vnet/sr/sr_packet.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2tp/l2tp.h>
+#include <vnet/vxlan/vxlan.h>
+#include <vnet/nsh-gre/nsh_gre.h>
+#include <vnet/nsh-vxlan-gpe/nsh_vxlan_gpe.h>
+#include <vnet/lisp-gpe/lisp_gpe.h>
+
+#include <api/vpe_msg_enum.h>
+#include <vnet/l2/l2_classify.h> 
+#include <vnet/l2/l2_vtr.h>
+#include <vnet/classify/input_acl.h>
+#include <vnet/ipsec/ipsec.h>
+#include <vnet/map/map.h>
+
+#include "vat/json_format.h"
+
+#define vl_typedefs             /* define message structures */
+#include <api/vpe_all_api_h.h> 
+#undef vl_typedefs
+
+/* declare message handlers for each api */
+
+#define vl_endianfun             /* define message structures */
+#include <api/vpe_all_api_h.h> 
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <api/vpe_all_api_h.h>
+#undef vl_printfun
+
+uword unformat_sw_if_index (unformat_input_t * input, va_list * args)
+{
+  vat_main_t * vam = va_arg (*args, vat_main_t *);
+  u32 * result = va_arg (*args, u32 *);
+  u8 * if_name;
+  uword * p;
+
+  if (!unformat (input, "%s", &if_name))
+      return 0;
+
+  p = hash_get_mem (vam->sw_if_index_by_interface_name, if_name);
+  if (p == 0)
+      return 0;
+  *result = p[0];
+  return 1;
+}
+
+/* Parse an IP4 address %d.%d.%d.%d. */
+uword unformat_ip4_address (unformat_input_t * input, va_list * args)
+{
+  u8 * result = va_arg (*args, u8 *);
+  unsigned a[4];
+
+  if (! unformat (input, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3]))
+    return 0;
+
+  if (a[0] >= 256 || a[1] >= 256 || a[2] >= 256 || a[3] >= 256)
+    return 0;
+
+  result[0] = a[0];
+  result[1] = a[1];
+  result[2] = a[2];
+  result[3] = a[3];
+
+  return 1;
+}
+
+
+uword
+unformat_ethernet_address (unformat_input_t * input, va_list * args)
+{
+  u8 * result = va_arg (*args, u8 *);
+  u32 i, a[6];
+
+  if (! unformat (input, "%_%x:%x:%x:%x:%x:%x%_",
+		  &a[0], &a[1], &a[2], &a[3], &a[4], &a[5]))
+    return 0;
+
+  /* Check range. */
+  for (i = 0; i < 6; i++)
+    if (a[i] >= (1 << 8))
+      return 0;
+
+  for (i = 0; i < 6; i++)
+    result[i] = a[i];
+
+  return 1;
+}
+
+/* Returns ethernet type as an int in host byte order. */
+uword
+unformat_ethernet_type_host_byte_order (unformat_input_t * input,
+					va_list * args)
+{
+  u16 * result = va_arg (*args, u16 *);
+  int type;
+
+  /* Numeric type. */
+  if (unformat (input, "0x%x", &type)
+      || unformat (input, "%d", &type))
+    {
+      if (type >= (1 << 16))
+	return 0;
+      *result = type;
+      return 1;
+    }
+  return 0;
+}
+
+/* Parse an IP6 address. */
+uword unformat_ip6_address (unformat_input_t * input, va_list * args)
+{
+  ip6_address_t * result = va_arg (*args, ip6_address_t *);
+  u16 hex_quads[8];
+  uword hex_quad, n_hex_quads, hex_digit, n_hex_digits;
+  uword c, n_colon, double_colon_index;
+
+  n_hex_quads = hex_quad = n_hex_digits = n_colon = 0;
+  double_colon_index = ARRAY_LEN (hex_quads);
+  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
+    {
+      hex_digit = 16;
+      if (c >= '0' && c <= '9')
+	hex_digit = c - '0';
+      else if (c >= 'a' && c <= 'f')
+	hex_digit = c + 10 - 'a';
+      else if (c >= 'A' && c <= 'F')
+	hex_digit = c + 10 - 'A';
+      else if (c == ':' && n_colon < 2)
+	n_colon++;
+      else
+	{
+	  unformat_put_input (input);
+	  break;
+	}
+
+      /* Too many hex quads. */
+      if (n_hex_quads >= ARRAY_LEN (hex_quads))
+	return 0;
+
+      if (hex_digit < 16)
+	{
+	  hex_quad = (hex_quad << 4) | hex_digit;
+
+	  /* Hex quad must fit in 16 bits. */
+	  if (n_hex_digits >= 4)
+	    return 0;
+
+	  n_colon = 0;
+	  n_hex_digits++;
+	}
+      
+      /* Save position of :: */
+      if (n_colon == 2)
+	{
+	  /* More than one :: ? */
+	  if (double_colon_index < ARRAY_LEN (hex_quads))
+	    return 0;
+	  double_colon_index = n_hex_quads;
+	}
+
+      if (n_colon > 0 && n_hex_digits > 0)
+	{
+	  hex_quads[n_hex_quads++] = hex_quad;
+	  hex_quad = 0;
+	  n_hex_digits = 0;
+	}
+    }
+
+  if (n_hex_digits > 0)
+    hex_quads[n_hex_quads++] = hex_quad;
+
+  {
+    word i;
+
+    /* Expand :: to appropriate number of zero hex quads. */
+    if (double_colon_index < ARRAY_LEN (hex_quads))
+      {
+	word n_zero = ARRAY_LEN (hex_quads) - n_hex_quads;
+
+	for (i = n_hex_quads - 1; i >= (signed) double_colon_index; i--)
+	  hex_quads[n_zero + i] = hex_quads[i];
+
+	for (i = 0; i < n_zero; i++)
+	  hex_quads[double_colon_index + i] = 0;
+
+	n_hex_quads = ARRAY_LEN (hex_quads);
+      }
+
+    /* Too few hex quads given. */
+    if (n_hex_quads < ARRAY_LEN (hex_quads))
+      return 0;
+
+    for (i = 0; i < ARRAY_LEN (hex_quads); i++)
+      result->as_u16[i] = clib_host_to_net_u16 (hex_quads[i]);
+
+    return 1;
+  }
+}
+
+uword
+unformat_ipsec_policy_action (unformat_input_t * input, va_list * args)
+{
+  u32 * r = va_arg (*args, u32 *);
+
+  if (0) ;
+#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_POLICY_ACTION_##f;
+  foreach_ipsec_policy_action
+#undef _
+  else
+    return 0;
+  return 1;
+}
+
+uword
+unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args)
+{
+  u32 * r = va_arg (*args, u32 *);
+
+  if (0) ;
+#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_CRYPTO_ALG_##f;
+  foreach_ipsec_crypto_alg
+#undef _
+  else
+    return 0;
+  return 1;
+}
+
+u8 *
+format_ipsec_crypto_alg (u8 * s, va_list * args)
+{
+  u32 i = va_arg (*args, u32);
+  u8 * t = 0;
+
+  switch (i)
+    {
+#define _(v,f,str) case IPSEC_CRYPTO_ALG_##f: t = (u8 *) str; break;
+  foreach_ipsec_crypto_alg
+#undef _
+      default:
+        return format (s, "unknown");
+    }
+  return format (s, "%s", t);
+}
+
+uword
+unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args)
+{
+  u32 * r = va_arg (*args, u32 *);
+
+  if (0) ;
+#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_INTEG_ALG_##f;
+  foreach_ipsec_integ_alg
+#undef _
+  else
+    return 0;
+  return 1;
+}
+
+u8 *
+format_ipsec_integ_alg (u8 * s, va_list * args)
+{
+  u32 i = va_arg (*args, u32);
+  u8 * t = 0;
+
+  switch (i)
+    {
+#define _(v,f,str) case IPSEC_INTEG_ALG_##f: t = (u8 *) str; break;
+  foreach_ipsec_integ_alg
+#undef _
+      default:
+        return format (s, "unknown");
+    }
+  return format (s, "%s", t);
+}
+
+u8 * format_ip4_address (u8 * s, va_list * args)
+{
+  u8 * a = va_arg (*args, u8 *);
+  return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
+}
+
+u8 * format_ip6_address (u8 * s, va_list * args)
+{
+    ip6_address_t * a = va_arg (*args, ip6_address_t *);
+    u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon;
+
+    i_max_n_zero = ARRAY_LEN (a->as_u16);
+    max_n_zeros = 0;
+    i_first_zero = i_max_n_zero;
+    n_zeros = 0;
+    for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+      {
+        u32 is_zero = a->as_u16[i] == 0;
+        if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16))
+          {
+            i_first_zero = i;
+            n_zeros = 0;
+          }
+        n_zeros += is_zero;
+        if ((! is_zero && n_zeros > max_n_zeros)
+            || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
+          {
+            i_max_n_zero = i_first_zero;
+            max_n_zeros = n_zeros;
+            i_first_zero = ARRAY_LEN (a->as_u16);
+            n_zeros = 0;
+          }
+      }
+
+    last_double_colon = 0;
+    for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+      {
+        if (i == i_max_n_zero && max_n_zeros > 1)
+          {
+            s = format (s, "::");
+            i += max_n_zeros - 1;
+            last_double_colon = 1;
+          }
+        else
+          {
+            s = format (s, "%s%x",
+                        (last_double_colon || i == 0) ? "" : ":",
+                        clib_net_to_host_u16 (a->as_u16[i]));
+            last_double_colon = 0;
+          }
+      }
+
+    return s;
+}
+
+u8 * format_ethernet_address (u8 * s, va_list * args)
+{
+  u8 * a = va_arg (*args, u8 *);
+
+  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+                 a[0], a[1], a[2], a[3], a[4], a[5]);
+}
+
+void increment_v4_address (ip4_address_t * a)
+{
+    u32 v;
+
+    v = ntohl(a->as_u32) + 1;
+    a->as_u32 = ntohl(v);
+}
+
+void increment_v6_address (ip6_address_t * a)
+{
+    u64 v0, v1;
+
+    v0 = clib_net_to_host_u64 (a->as_u64[0]);
+    v1 = clib_net_to_host_u64 (a->as_u64[1]);
+
+    v1 += 1;
+    if (v1 == 0)
+        v0 += 1;
+    a->as_u64[0] = clib_net_to_host_u64 (v0);
+    a->as_u64[1] = clib_net_to_host_u64 (v1);
+}
+
+
+static void vl_api_create_loopback_reply_t_handler 
+(vl_api_create_loopback_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+
+    vam->retval = retval;
+    vam->result_ready = 1;
+    vam->regenerate_interface_table = 1;
+}
+
+static void vl_api_create_loopback_reply_t_handler_json
+(vl_api_create_loopback_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_create_vlan_subif_reply_t_handler 
+(vl_api_create_vlan_subif_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+
+    vam->retval = retval;
+    vam->result_ready = 1;
+    vam->regenerate_interface_table = 1;
+}
+
+static void vl_api_create_vlan_subif_reply_t_handler_json
+(vl_api_create_vlan_subif_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_create_subif_reply_t_handler 
+(vl_api_create_subif_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+
+    vam->retval = retval;
+    vam->result_ready = 1;
+    vam->regenerate_interface_table = 1;
+}
+
+static void vl_api_create_subif_reply_t_handler_json
+(vl_api_create_subif_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_interface_name_renumber_reply_t_handler 
+(vl_api_interface_name_renumber_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+
+    vam->retval = retval;
+    vam->result_ready = 1;
+    vam->regenerate_interface_table = 1;
+}
+
+static void vl_api_interface_name_renumber_reply_t_handler_json
+(vl_api_interface_name_renumber_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+/* 
+ * Special-case: build the interface table, maintain
+ * the next loopback sw_if_index vbl.
+ */
+static void vl_api_sw_interface_details_t_handler
+(vl_api_sw_interface_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    u8 * s = format (0, "%s%c", mp->interface_name, 0);
+
+    hash_set_mem (vam->sw_if_index_by_interface_name, s, 
+                  ntohl(mp->sw_if_index));
+
+    /* In sub interface case, fill the sub interface table entry */
+    if (mp->sw_if_index != mp->sup_sw_if_index) {
+        sw_interface_subif_t * sub = NULL;
+
+        vec_add2(vam->sw_if_subif_table, sub, 1);
+
+        vec_validate(sub->interface_name, strlen((char *)s) + 1);
+        strncpy((char *)sub->interface_name, (char *)s,
+                vec_len(sub->interface_name));
+        sub->sw_if_index = ntohl(mp->sw_if_index);
+        sub->sub_id = ntohl(mp->sub_id);
+
+        sub->sub_dot1ad = mp->sub_dot1ad;
+        sub->sub_number_of_tags = mp->sub_number_of_tags;
+        sub->sub_outer_vlan_id = ntohs(mp->sub_outer_vlan_id);
+        sub->sub_inner_vlan_id = ntohs(mp->sub_inner_vlan_id);
+        sub->sub_exact_match = mp->sub_exact_match;
+        sub->sub_default = mp->sub_default;
+        sub->sub_outer_vlan_id_any = mp->sub_outer_vlan_id_any;
+        sub->sub_inner_vlan_id_any = mp->sub_inner_vlan_id_any;
+
+        /* vlan tag rewrite */
+        sub->vtr_op = ntohl(mp->vtr_op);
+        sub->vtr_push_dot1q = ntohl(mp->vtr_push_dot1q);
+        sub->vtr_tag1 = ntohl(mp->vtr_tag1);
+        sub->vtr_tag2 = ntohl(mp->vtr_tag2);
+    }
+}
+
+static void vl_api_sw_interface_details_t_handler_json
+(vl_api_sw_interface_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t *node = NULL;
+
+    if (VAT_JSON_ARRAY != vam->json_tree.type) {
+        ASSERT(VAT_JSON_NONE == vam->json_tree.type);
+        vat_json_init_array(&vam->json_tree);
+    }
+    node = vat_json_array_add(&vam->json_tree);
+
+    vat_json_init_object(node);
+    vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
+    vat_json_object_add_uint(node, "sup_sw_if_index", ntohl(mp->sup_sw_if_index));
+    vat_json_object_add_uint(node, "l2_address_length", ntohl(mp->l2_address_length));
+    vat_json_object_add_bytes(node, "l2_address", mp->l2_address, sizeof(mp->l2_address));
+    vat_json_object_add_string_copy(node, "interface_name", mp->interface_name);
+    vat_json_object_add_uint(node, "admin_up_down", mp->admin_up_down);
+    vat_json_object_add_uint(node, "link_up_down", mp->link_up_down);
+    vat_json_object_add_uint(node, "link_duplex", mp->link_duplex);
+    vat_json_object_add_uint(node, "link_speed", mp->link_speed);
+    vat_json_object_add_uint(node, "sub_id", ntohl(mp->sub_id));
+    vat_json_object_add_uint(node, "sub_dot1ad", mp->sub_dot1ad);
+    vat_json_object_add_uint(node, "sub_number_of_tags", mp->sub_number_of_tags);
+    vat_json_object_add_uint(node, "sub_outer_vlan_id", ntohs(mp->sub_outer_vlan_id));
+    vat_json_object_add_uint(node, "sub_inner_vlan_id", ntohs(mp->sub_inner_vlan_id));
+    vat_json_object_add_uint(node, "sub_exact_match", mp->sub_exact_match);
+    vat_json_object_add_uint(node, "sub_default", mp->sub_default);
+    vat_json_object_add_uint(node, "sub_outer_vlan_id_any", mp->sub_outer_vlan_id_any);
+    vat_json_object_add_uint(node, "sub_inner_vlan_id_any", mp->sub_inner_vlan_id_any);
+    vat_json_object_add_uint(node, "vtr_op", ntohl(mp->vtr_op));
+    vat_json_object_add_uint(node, "vtr_push_dot1q", ntohl(mp->vtr_push_dot1q));
+    vat_json_object_add_uint(node, "vtr_tag1", ntohl(mp->vtr_tag1));
+    vat_json_object_add_uint(node, "vtr_tag2", ntohl(mp->vtr_tag2));
+}
+
+static void vl_api_sw_interface_set_flags_t_handler
+(vl_api_sw_interface_set_flags_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    if (vam->interface_event_display)
+	errmsg ("interface flags: sw_if_index %d %s %s\n",
+		ntohl(mp->sw_if_index),
+		mp->admin_up_down ? "admin-up" : "admin-down",
+		mp->link_up_down  ? "link-up"  : "link-down");
+}
+
+static void vl_api_sw_interface_set_flags_t_handler_json
+(vl_api_sw_interface_set_flags_t * mp)
+{
+    /* JSON output not supported */
+}
+
+static void vl_api_cli_reply_t_handler 
+(vl_api_cli_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+
+    vam->retval = retval;
+    vam->shmem_result = (u8 *) mp->reply_in_shmem;
+    vam->result_ready = 1;
+}
+
+static void vl_api_cli_reply_t_handler_json
+(vl_api_cli_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "reply_in_shmem", ntohl(mp->reply_in_shmem));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_classify_add_del_table_reply_t_handler
+(vl_api_classify_add_del_table_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    if (vam->async_mode) {
+        vam->async_errors += (retval < 0);
+    } else {
+        vam->retval = retval;
+        vam->result_ready = 1;
+        if (retval == 0 && 
+            ((mp->new_table_index != 0xFFFFFFFF) ||
+             (mp->skip_n_vectors != 0xFFFFFFFF) ||
+             (mp->match_n_vectors != 0xFFFFFFFF)))
+            /* 
+             * Note: this is just barely thread-safe, depends on
+             * the main thread spinning waiting for an answer...
+             */
+            errmsg ("new index %d, skip_n_vectors %d, match_n_vectors %d\n",
+                    ntohl(mp->new_table_index),
+                    ntohl(mp->skip_n_vectors), ntohl(mp->match_n_vectors));
+    }
+}
+
+static void vl_api_classify_add_del_table_reply_t_handler_json
+(vl_api_classify_add_del_table_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "new_table_index", ntohl(mp->new_table_index));
+    vat_json_object_add_uint(&node, "skip_n_vectors", ntohl(mp->skip_n_vectors));
+    vat_json_object_add_uint(&node, "match_n_vectors", ntohl(mp->match_n_vectors));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_get_node_index_reply_t_handler
+(vl_api_get_node_index_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    if (vam->async_mode) {
+        vam->async_errors += (retval < 0);
+    } else {
+        vam->retval = retval;
+        vam->result_ready = 1;
+        if (retval == 0)
+            errmsg ("node index %d\n", ntohl(mp->node_index));
+    }
+}
+
+static void vl_api_get_node_index_reply_t_handler_json
+(vl_api_get_node_index_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "node_index", ntohl(mp->node_index));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_add_node_next_reply_t_handler
+(vl_api_add_node_next_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    if (vam->async_mode) {
+        vam->async_errors += (retval < 0);
+    } else {
+        vam->retval = retval;
+        vam->result_ready = 1;
+        if (retval == 0)
+            errmsg ("next index %d\n", ntohl(mp->next_index));
+    }
+}
+
+static void vl_api_add_node_next_reply_t_handler_json
+(vl_api_add_node_next_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "next_index", ntohl(mp->next_index));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_mpls_gre_add_del_tunnel_reply_t_handler 
+(vl_api_mpls_gre_add_del_tunnel_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    u32 sw_if_index = ntohl(mp->tunnel_sw_if_index);
+
+    if (retval >= 0 && sw_if_index != (u32)~0) {
+        errmsg ("tunnel_sw_if_index %d\n", sw_if_index);
+    }
+    vam->retval = retval;
+    vam->result_ready = 1;
+}
+
+static void vl_api_mpls_gre_add_del_tunnel_reply_t_handler_json
+(vl_api_mpls_gre_add_del_tunnel_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "tunnel_sw_if_index", ntohl(mp->tunnel_sw_if_index));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_nsh_gre_add_del_tunnel_reply_t_handler 
+(vl_api_nsh_gre_add_del_tunnel_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    u32 sw_if_index = ntohl(mp->sw_if_index);
+
+    if (retval >= 0 && sw_if_index != (u32)~0) {
+        errmsg ("sw_if_index %d\n", ntohl(mp->sw_if_index));
+    }
+    vam->retval = retval;
+    vam->result_ready = 1;
+}
+
+static void vl_api_nsh_gre_add_del_tunnel_reply_t_handler_json
+(vl_api_nsh_gre_add_del_tunnel_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_nsh_vxlan_gpe_add_del_tunnel_reply_t_handler 
+(vl_api_nsh_vxlan_gpe_add_del_tunnel_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    u32 sw_if_index = ntohl(mp->sw_if_index);
+
+    if (retval >= 0 && sw_if_index != (u32)~0) {
+        errmsg ("sw_if_index %d\n", ntohl(mp->sw_if_index));
+    }
+    vam->retval = retval;
+    vam->result_ready = 1;
+}
+
+static void vl_api_nsh_vxlan_gpe_add_del_tunnel_reply_t_handler_json
+(vl_api_nsh_vxlan_gpe_add_del_tunnel_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_lisp_gpe_add_del_tunnel_reply_t_handler 
+(vl_api_lisp_gpe_add_del_tunnel_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    u32 sw_if_index = ntohl(mp->sw_if_index);
+
+    if (retval >= 0 && sw_if_index != (u32)~0) {
+        errmsg ("sw_if_index %d\n", ntohl(mp->sw_if_index));
+    }
+    vam->retval = retval;
+    vam->result_ready = 1;
+}
+
+static void vl_api_lisp_gpe_add_del_tunnel_reply_t_handler_json
+(vl_api_lisp_gpe_add_del_tunnel_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_show_version_reply_t_handler 
+(vl_api_show_version_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+
+    if (retval >= 0) {
+        errmsg ("        program: %s\n", mp->program);
+        errmsg ("     git branch: %s\n", mp->git_branch);
+        errmsg ("     build date: %s\n", mp->build_date);
+        errmsg ("build directory: %s\n", mp->build_directory);
+    }
+    vam->retval = retval;
+    vam->result_ready = 1;
+}
+
+static void vl_api_show_version_reply_t_handler_json
+(vl_api_show_version_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_string_copy(&node, "program", mp->program);
+    vat_json_object_add_string_copy(&node, "git_branch", mp->git_branch);
+    vat_json_object_add_string_copy(&node, "build_date", mp->build_date);
+    vat_json_object_add_string_copy(&node, "build_directory", mp->build_directory);
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_ip4_arp_event_t_handler 
+(vl_api_ip4_arp_event_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    errmsg ("arp event: address %U new mac %U sw_if_index %d\n",
+            format_ip4_address, &mp->address,
+            format_ethernet_address, mp->new_mac, mp->sw_if_index);
+}
+
+static void vl_api_ip4_arp_event_t_handler_json
+(vl_api_ip4_arp_event_t * mp)
+{
+    /* JSON output not supported */
+}
+
+/* 
+ * Special-case: build the bridge domain table, maintain
+ * the next bd id vbl.
+ */
+static void vl_api_bridge_domain_details_t_handler
+(vl_api_bridge_domain_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    u32 n_sw_ifs =  ntohl (mp->n_sw_ifs);
+
+    fformat (vam->ofp, "\n%-3s %-3s %-3s %-3s %-3s %-3s\n",
+             " ID", "LRN", "FWD", "FLD", "BVI", "#IF");
+
+    fformat (vam->ofp, "%3d %3d %3d %3d %3d %3d\n",
+             ntohl (mp->bd_id), mp->learn, mp->forward,
+             mp->flood, ntohl (mp->bvi_sw_if_index), n_sw_ifs);
+
+    if (n_sw_ifs)
+        fformat (vam->ofp, "\n\n%s %s  %s\n", "sw_if_index", "SHG",
+                 "Interface Name");
+}
+
+static void vl_api_bridge_domain_details_t_handler_json
+(vl_api_bridge_domain_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t *node, *array = NULL;
+
+    if (VAT_JSON_ARRAY != vam->json_tree.type) {
+        ASSERT(VAT_JSON_NONE == vam->json_tree.type);
+        vat_json_init_array(&vam->json_tree);
+    }
+    node = vat_json_array_add(&vam->json_tree);
+
+    vat_json_init_object(node);
+    vat_json_object_add_uint(node, "bd_id", ntohl(mp->bd_id));
+    vat_json_object_add_uint(node, "flood", mp->flood);
+    vat_json_object_add_uint(node, "forward", mp->forward);
+    vat_json_object_add_uint(node, "learn", mp->learn);
+    vat_json_object_add_uint(node, "bvi_sw_if_index", ntohl(mp->bvi_sw_if_index));
+    vat_json_object_add_uint(node, "n_sw_ifs", ntohl(mp->n_sw_ifs));
+    array = vat_json_object_add(node, "sw_if");
+    vat_json_init_array(array);
+}
+
+/* 
+ * Special-case: build the bridge domain sw if table.
+ */
+static void vl_api_bridge_domain_sw_if_details_t_handler
+(vl_api_bridge_domain_sw_if_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    hash_pair_t * p;
+    u8 * sw_if_name = 0;
+    u32 sw_if_index;
+
+    sw_if_index = ntohl (mp->sw_if_index);
+    hash_foreach_pair (p, vam->sw_if_index_by_interface_name, 
+    ({
+        if ((u32) p->value[0] == sw_if_index) {
+            sw_if_name = (u8 *)(p->key);
+            break;
+        }
+    }));
+   
+    fformat (vam->ofp, "%7d     %3d  %s", sw_if_index, 
+             mp->shg, sw_if_name ? (char *)sw_if_name : 
+             "sw_if_index not found!");
+}
+
+static void vl_api_bridge_domain_sw_if_details_t_handler_json
+(vl_api_bridge_domain_sw_if_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t *node = NULL;
+    uword last_index = 0;
+
+    ASSERT(VAT_JSON_ARRAY == vam->json_tree.type);
+    ASSERT(vec_len(vam->json_tree.array) >= 1);
+    last_index = vec_len(vam->json_tree.array) - 1;
+    node = &vam->json_tree.array[last_index];
+    node = vat_json_object_get_element(node, "sw_if");
+    ASSERT(NULL != node);
+    node = vat_json_array_add(node);
+
+    vat_json_init_object(node);
+    vat_json_object_add_uint(node, "bd_id", ntohl(mp->bd_id));
+    vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
+    vat_json_object_add_uint(node, "shg", mp->shg);
+}
+
+static void vl_api_control_ping_reply_t_handler
+(vl_api_control_ping_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    if (vam->async_mode) {
+        vam->async_errors += (retval < 0);
+    } else {
+        vam->retval = retval;
+        vam->result_ready = 1;
+    }
+}
+
+static void vl_api_control_ping_reply_t_handler_json
+(vl_api_control_ping_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+
+    if (VAT_JSON_NONE != vam->json_tree.type) {
+        vat_json_print(vam->ofp, &vam->json_tree);
+        vat_json_free(&vam->json_tree);
+        vam->json_tree.type = VAT_JSON_NONE;
+    } else {
+        /* just print [] */
+        vat_json_init_array(&vam->json_tree);
+        vat_json_print(vam->ofp, &vam->json_tree);
+        vam->json_tree.type = VAT_JSON_NONE;
+    }
+
+    vam->retval = retval;
+    vam->result_ready = 1;
+}
+
+static void vl_api_l2_flags_reply_t_handler
+(vl_api_l2_flags_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    if (vam->async_mode) {
+        vam->async_errors += (retval < 0);
+    } else {
+        vam->retval = retval;
+        vam->result_ready = 1;
+    }
+}
+
+static void vl_api_l2_flags_reply_t_handler_json
+(vl_api_l2_flags_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "resulting_feature_bitmap", ntohl(mp->resulting_feature_bitmap));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_bridge_flags_reply_t_handler
+(vl_api_bridge_flags_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    if (vam->async_mode) {
+        vam->async_errors += (retval < 0);
+    } else {
+        vam->retval = retval;
+        vam->result_ready = 1;
+    }
+}
+
+static void vl_api_bridge_flags_reply_t_handler_json
+(vl_api_bridge_flags_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "resulting_feature_bitmap", ntohl(mp->resulting_feature_bitmap));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_tap_connect_reply_t_handler
+(vl_api_tap_connect_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    if (vam->async_mode) {
+        vam->async_errors += (retval < 0);
+    } else {
+        vam->retval = retval;
+        vam->result_ready = 1;
+    }
+}
+
+static void vl_api_tap_connect_reply_t_handler_json
+(vl_api_tap_connect_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_tap_modify_reply_t_handler
+(vl_api_tap_modify_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    if (vam->async_mode) {
+        vam->async_errors += (retval < 0);
+    } else {
+        vam->retval = retval;
+        vam->result_ready = 1;
+    }
+}
+
+static void vl_api_tap_modify_reply_t_handler_json
+(vl_api_tap_modify_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_tap_delete_reply_t_handler
+(vl_api_tap_delete_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    if (vam->async_mode) {
+        vam->async_errors += (retval < 0);
+    } else {
+        vam->retval = retval;
+        vam->result_ready = 1;
+    }
+}
+
+static void vl_api_tap_delete_reply_t_handler_json
+(vl_api_tap_delete_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_mpls_ethernet_add_del_tunnel_reply_t_handler
+(vl_api_mpls_ethernet_add_del_tunnel_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    if (vam->async_mode) {
+        vam->async_errors += (retval < 0);
+    } else {
+        vam->retval = retval;
+        vam->result_ready = 1;
+    }
+}
+
+static void vl_api_mpls_ethernet_add_del_tunnel_reply_t_handler_json
+(vl_api_mpls_ethernet_add_del_tunnel_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "tunnel_sw_if_index", ntohl(mp->tunnel_sw_if_index));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_l2tpv3_create_tunnel_reply_t_handler
+(vl_api_l2tpv3_create_tunnel_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    if (vam->async_mode) {
+        vam->async_errors += (retval < 0);
+    } else {
+        vam->retval = retval;
+        vam->result_ready = 1;
+    }
+}
+
+static void vl_api_l2tpv3_create_tunnel_reply_t_handler_json
+(vl_api_l2tpv3_create_tunnel_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_vxlan_add_del_tunnel_reply_t_handler
+(vl_api_vxlan_add_del_tunnel_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    if (vam->async_mode) {
+        vam->async_errors += (retval < 0);
+    } else {
+        vam->retval = retval;
+        vam->result_ready = 1;
+    }
+}
+
+static void vl_api_vxlan_add_del_tunnel_reply_t_handler_json
+(vl_api_vxlan_add_del_tunnel_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_create_vhost_user_if_reply_t_handler
+(vl_api_create_vhost_user_if_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    if (vam->async_mode) {
+        vam->async_errors += (retval < 0);
+    } else {
+        vam->retval = retval;
+        vam->result_ready = 1;
+    }
+}
+
+static void vl_api_create_vhost_user_if_reply_t_handler_json
+(vl_api_create_vhost_user_if_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_ip_address_details_t_handler
+(vl_api_ip_address_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    static ip_address_details_t empty_ip_address_details = {{0}};
+    ip_address_details_t * address = NULL;
+    ip_details_t * current_ip_details = NULL;
+    ip_details_t * details = NULL;
+
+    details = vam->ip_details_by_sw_if_index[vam->is_ipv6];
+
+    if (!details || vam->current_sw_if_index >= vec_len(details)
+            || !details[vam->current_sw_if_index].present) {
+        errmsg ("ip address details arrived but not stored\n");
+        errmsg ("ip_dump should be called first\n");
+        return;
+    }
+
+    current_ip_details = vec_elt_at_index(details,
+            vam->current_sw_if_index);
+
+#define addresses (current_ip_details->addr)
+
+    vec_validate_init_empty(addresses, vec_len(addresses),
+            empty_ip_address_details);
+
+    address = vec_elt_at_index(addresses, vec_len(addresses) - 1);
+
+    memcpy(&address->ip, &mp->ip, sizeof(address->ip));
+    address->prefix_length = mp->prefix_length;
+#undef addresses
+}
+
+static void vl_api_ip_address_details_t_handler_json
+(vl_api_ip_address_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t *node = NULL;
+    struct in6_addr ip6;
+    struct in_addr ip4;
+
+    if (VAT_JSON_ARRAY != vam->json_tree.type) {
+        ASSERT(VAT_JSON_NONE == vam->json_tree.type);
+        vat_json_init_array(&vam->json_tree);
+    }
+    node = vat_json_array_add(&vam->json_tree);
+
+    vat_json_init_object(node);
+    if (vam->is_ipv6) {
+        memcpy(&ip6, mp->ip, sizeof(ip6));
+        vat_json_object_add_ip6(node, "ip",  ip6);
+    } else {
+        memcpy(&ip4, mp->ip, sizeof(ip4));
+        vat_json_object_add_ip4(node, "ip", ip4);
+    }
+    vat_json_object_add_uint(node, "prefix_length", mp->prefix_length);
+}
+
+static void vl_api_ip_details_t_handler (vl_api_ip_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    static ip_details_t empty_ip_details = {0};
+    ip_details_t * ip = NULL;
+    u32 sw_if_index = ~0;
+
+    sw_if_index = ntohl(mp->sw_if_index);
+
+    vec_validate_init_empty(vam->ip_details_by_sw_if_index[vam->is_ipv6],
+            sw_if_index, empty_ip_details);
+
+    ip = vec_elt_at_index(vam->ip_details_by_sw_if_index[vam->is_ipv6],
+            sw_if_index);
+
+    ip->present = 1;
+}
+
+static void vl_api_ip_details_t_handler_json (vl_api_ip_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+
+    if (VAT_JSON_ARRAY != vam->json_tree.type) {
+        ASSERT(VAT_JSON_NONE == vam->json_tree.type);
+        vat_json_init_array(&vam->json_tree);
+    }
+    vat_json_array_add_uint(&vam->json_tree, clib_net_to_host_u32(mp->sw_if_index));
+}
+
+static void vl_api_map_domain_details_t_handler_json
+(vl_api_map_domain_details_t * mp)
+{
+    vat_json_node_t * node = NULL;
+    vat_main_t * vam = &vat_main;
+    struct in6_addr ip6;
+    struct in_addr ip4;
+
+    if (VAT_JSON_ARRAY != vam->json_tree.type) {
+        ASSERT(VAT_JSON_NONE == vam->json_tree.type);
+        vat_json_init_array(&vam->json_tree);
+    }
+
+    node = vat_json_array_add(&vam->json_tree);
+    vat_json_init_object(node);
+
+    vat_json_object_add_uint(node, "domain_index", clib_net_to_host_u32(mp->domain_index));
+    memcpy(&ip6, mp->ip6_prefix, sizeof(ip6));
+    vat_json_object_add_ip6(node, "ip6_prefix", ip6);
+    memcpy(&ip4, mp->ip4_prefix, sizeof(ip4));
+    vat_json_object_add_ip4(node, "ip4_prefix", ip4);
+    memcpy(&ip6, mp->ip6_src, sizeof(ip6));
+    vat_json_object_add_ip6(node, "ip6_src", ip6);
+    vat_json_object_add_int(node, "ip6_prefix_len", mp->ip6_prefix_len);
+    vat_json_object_add_int(node, "ip4_prefix_len", mp->ip4_prefix_len);
+    vat_json_object_add_int(node, "ip6_src_len", mp->ip6_src_len);
+    vat_json_object_add_int(node, "ea_bits_len", mp->ea_bits_len);
+    vat_json_object_add_int(node, "psid_offset", mp->psid_offset);
+    vat_json_object_add_int(node, "psid_length", mp->psid_length);
+    vat_json_object_add_uint(node, "flags", mp->flags);
+    vat_json_object_add_uint(node, "mtu", clib_net_to_host_u16(mp->mtu));
+    vat_json_object_add_int(node, "is_translation", mp->is_translation);
+}
+
+static void vl_api_map_domain_details_t_handler
+(vl_api_map_domain_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+
+    if (mp->is_translation) {
+        fformat(vam->ofp,  "* %U/%d (ipv4-prefix) %U/%d (ipv6-prefix) %U/%d (ip6-src) index: %u\n",
+                  format_ip4_address, mp->ip4_prefix, mp->ip4_prefix_len,
+                  format_ip6_address, mp->ip6_prefix, mp->ip6_prefix_len,
+                  format_ip6_address, mp->ip6_src, mp->ip6_src_len, clib_net_to_host_u32(mp->domain_index));
+    } else {
+        fformat(vam->ofp,  "* %U/%d (ipv4-prefix) %U/%d (ipv6-prefix) %U (ip6-src) index: %u\n",
+                  format_ip4_address, mp->ip4_prefix, mp->ip4_prefix_len,
+                  format_ip6_address, mp->ip6_prefix, mp->ip6_prefix_len,
+                  format_ip6_address, mp->ip6_src, clib_net_to_host_u32(mp->domain_index));
+    }
+    fformat(vam->ofp, "  ea-len %d psid-offset %d psid-len %d mtu %d %s\n",
+            mp->ea_bits_len, mp->psid_offset, mp->psid_length, mp->mtu, mp->is_translation? "map-t":"");
+}
+
+static void vl_api_map_rule_details_t_handler_json
+(vl_api_map_rule_details_t * mp)
+{
+    struct in6_addr ip6;
+    vat_json_node_t * node = NULL;
+    vat_main_t * vam = &vat_main;
+
+    if (VAT_JSON_ARRAY != vam->json_tree.type) {
+        ASSERT(VAT_JSON_NONE == vam->json_tree.type);
+        vat_json_init_array(&vam->json_tree);
+    }
+
+    node = vat_json_array_add(&vam->json_tree);
+    vat_json_init_object(node);
+
+    vat_json_object_add_uint(node, "psid", clib_net_to_host_u16(mp->psid));
+    memcpy(&ip6, mp->ip6_dst, sizeof(ip6));
+    vat_json_object_add_ip6(node, "ip6_dst", ip6);
+}
+
+static void vl_api_map_rule_details_t_handler
+(vl_api_map_rule_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    fformat(vam->ofp, " %d (psid) %U (ip6-dst)\n", clib_net_to_host_u16(mp->psid),
+            format_ip6_address, mp->ip6_dst);
+}
+
+static void vl_api_dhcp_compl_event_t_handler
+(vl_api_dhcp_compl_event_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    errmsg ("DHCP compl event: pid %d %s hostname %s host_addr %U "
+            "router_addr %U host_mac %U\n",
+            mp->pid, mp->is_ipv6 ? "ipv6":"ipv4", mp->hostname,
+            format_ip4_address, &mp->host_address,
+            format_ip4_address, &mp->router_address,
+            format_ethernet_address, mp->host_mac);
+}
+
+static void vl_api_dhcp_compl_event_t_handler_json
+(vl_api_dhcp_compl_event_t * mp)
+{
+    /* JSON output not supported */
+}
+
+static void set_simple_interface_counter (u8 vnet_counter_type, u32 sw_if_index,
+                                          u32 counter)
+{
+    vat_main_t * vam = &vat_main;
+    static u64 default_counter = 0;
+
+    vec_validate_init_empty(vam->simple_interface_counters, vnet_counter_type, NULL);
+    vec_validate_init_empty(vam->simple_interface_counters[vnet_counter_type],
+                            sw_if_index, default_counter);
+    vam->simple_interface_counters[vnet_counter_type][sw_if_index] = counter;
+}
+
+static void set_combined_interface_counter (u8 vnet_counter_type, u32 sw_if_index,
+                                            interface_counter_t counter)
+{
+    vat_main_t * vam = &vat_main;
+    static interface_counter_t default_counter = {0, };
+
+    vec_validate_init_empty(vam->combined_interface_counters, vnet_counter_type, NULL);
+    vec_validate_init_empty(vam->combined_interface_counters[vnet_counter_type],
+                            sw_if_index, default_counter);
+    vam->combined_interface_counters[vnet_counter_type][sw_if_index] = counter;
+}
+
+static void vl_api_vnet_interface_counters_t_handler
+(vl_api_vnet_interface_counters_t *mp)
+{
+    /* not supported */
+}
+
+static void vl_api_vnet_interface_counters_t_handler_json
+(vl_api_vnet_interface_counters_t *mp)
+{
+    interface_counter_t counter;
+    vlib_counter_t *v;
+    u64 *v_packets;
+    u64 packets;
+    u32 count;
+    u32 first_sw_if_index;
+    int i;
+
+    count = ntohl(mp->count);
+    first_sw_if_index = ntohl(mp->first_sw_if_index);
+
+    if (!mp->is_combined) {
+        v_packets = (u64*)&mp->data;
+        for (i = 0; i < count; i++) {
+            packets = clib_net_to_host_u64(clib_mem_unaligned(v_packets, u64));
+            set_simple_interface_counter(mp->vnet_counter_type,
+                    first_sw_if_index + i, packets);
+            v_packets++;
+        }
+    } else {
+        v = (vlib_counter_t*)&mp->data;
+        for (i = 0; i < count; i++) {
+            counter.packets = clib_net_to_host_u64(
+                    clib_mem_unaligned(&v->packets, u64));
+            counter.bytes = clib_net_to_host_u64(
+                    clib_mem_unaligned(&v->bytes, u64));
+            set_combined_interface_counter(mp->vnet_counter_type,
+                    first_sw_if_index + i, counter);
+            v++;
+        }
+    }
+}
+
+static u32 ip4_fib_counters_get_vrf_index_by_vrf_id (u32 vrf_id)
+{
+    vat_main_t * vam = &vat_main;
+    u32 i;
+
+    for (i = 0; i < vec_len(vam->ip4_fib_counters_vrf_id_by_index); i++) {
+        if (vam->ip4_fib_counters_vrf_id_by_index[i] == vrf_id) {
+            return i;
+        }
+    }
+    return ~0;
+}
+
+static u32 ip6_fib_counters_get_vrf_index_by_vrf_id (u32 vrf_id)
+{
+    vat_main_t * vam = &vat_main;
+    u32 i;
+
+    for (i = 0; i < vec_len(vam->ip6_fib_counters_vrf_id_by_index); i++) {
+        if (vam->ip6_fib_counters_vrf_id_by_index[i] == vrf_id) {
+            return i;
+        }
+    }
+    return ~0;
+}
+
+static void vl_api_vnet_ip4_fib_counters_t_handler
+(vl_api_vnet_ip4_fib_counters_t *mp)
+{
+    /* not supported */
+}
+
+static void vl_api_vnet_ip4_fib_counters_t_handler_json
+(vl_api_vnet_ip4_fib_counters_t *mp)
+{
+    vat_main_t * vam = &vat_main;
+    vl_api_ip4_fib_counter_t *v;
+    ip4_fib_counter_t *counter;
+    struct in_addr ip4;
+    u32 vrf_id;
+    u32 vrf_index;
+    u32 count;
+    int i;
+
+    vrf_id = ntohl(mp->vrf_id);
+    vrf_index = ip4_fib_counters_get_vrf_index_by_vrf_id(vrf_id);
+    if (~0 == vrf_index) {
+        vrf_index = vec_len(vam->ip4_fib_counters_vrf_id_by_index);
+        vec_validate(vam->ip4_fib_counters_vrf_id_by_index, vrf_index);
+        vam->ip4_fib_counters_vrf_id_by_index[vrf_index] = vrf_id;
+        vec_validate(vam->ip4_fib_counters, vrf_index);
+        vam->ip4_fib_counters[vrf_index] = NULL;
+    }
+
+    vec_free(vam->ip4_fib_counters[vrf_index]);
+    v = (vl_api_ip4_fib_counter_t*)&mp->c;
+    count = ntohl(mp->count);
+    for (i = 0; i < count; i++) {
+        vec_validate(vam->ip4_fib_counters[vrf_index], i);
+        counter = &vam->ip4_fib_counters[vrf_index][i];
+        memcpy(&ip4, &v->address, sizeof(ip4));
+        counter->address = ip4;
+        counter->address_length = v->address_length;
+        counter->packets = clib_net_to_host_u64(v->packets);
+        counter->bytes = clib_net_to_host_u64(v->bytes);
+        v++;
+    }
+}
+
+static void vl_api_vnet_ip6_fib_counters_t_handler
+(vl_api_vnet_ip6_fib_counters_t *mp)
+{
+    /* not supported */
+}
+
+static void vl_api_vnet_ip6_fib_counters_t_handler_json
+(vl_api_vnet_ip6_fib_counters_t *mp)
+{
+    vat_main_t * vam = &vat_main;
+    vl_api_ip6_fib_counter_t *v;
+    ip6_fib_counter_t *counter;
+    struct in6_addr ip6;
+    u32 vrf_id;
+    u32 vrf_index;
+    u32 count;
+    int i;
+
+    vrf_id = ntohl(mp->vrf_id);
+    vrf_index = ip6_fib_counters_get_vrf_index_by_vrf_id(vrf_id);
+    if (~0 == vrf_index) {
+        vrf_index = vec_len(vam->ip6_fib_counters_vrf_id_by_index);
+        vec_validate(vam->ip6_fib_counters_vrf_id_by_index, vrf_index);
+        vam->ip6_fib_counters_vrf_id_by_index[vrf_index] = vrf_id;
+        vec_validate(vam->ip6_fib_counters, vrf_index);
+        vam->ip6_fib_counters[vrf_index] = NULL;
+    }
+
+    vec_free(vam->ip6_fib_counters[vrf_index]);
+    v = (vl_api_ip6_fib_counter_t*)&mp->c;
+    count = ntohl(mp->count);
+    for (i = 0; i < count; i++) {
+        vec_validate(vam->ip6_fib_counters[vrf_index], i);
+        counter = &vam->ip6_fib_counters[vrf_index][i];
+        memcpy(&ip6, &v->address, sizeof(ip6));
+        counter->address = ip6;
+        counter->address_length = v->address_length;
+        counter->packets = clib_net_to_host_u64(v->packets);
+        counter->bytes = clib_net_to_host_u64(v->bytes);
+        v++;
+    }
+}
+
+static void vl_api_get_first_msg_id_reply_t_handler
+(vl_api_get_first_msg_id_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+    
+    if (vam->async_mode) {
+        vam->async_errors += (retval < 0);
+    } else {
+        vam->retval = retval;
+        vam->result_ready = 1;
+    }
+    if (retval >= 0) {
+        errmsg ("first message id %d\n", ntohs(mp->first_msg_id));
+    }
+}
+
+static void vl_api_get_first_msg_id_reply_t_handler_json
+(vl_api_get_first_msg_id_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "first_msg_id", 
+                             (uint) ntohs(mp->first_msg_id));
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+#define vl_api_vnet_ip4_fib_counters_t_endian vl_noop_handler
+#define vl_api_vnet_ip4_fib_counters_t_print vl_noop_handler
+#define vl_api_vnet_ip6_fib_counters_t_endian vl_noop_handler
+#define vl_api_vnet_ip6_fib_counters_t_print vl_noop_handler
+
+/* 
+ * Generate boilerplate reply handlers, which 
+ * dig the return value out of the xxx_reply_t API message,
+ * stick it into vam->retval, and set vam->result_ready
+ *
+ * Could also do this by pointing N message decode slots at
+ * a single function, but that could break in subtle ways.
+ */
+
+#define foreach_standard_reply_retval_handler           \
+_(sw_interface_set_flags_reply)                         \
+_(sw_interface_add_del_address_reply)                   \
+_(sw_interface_set_table_reply)                         \
+_(sw_interface_set_vpath_reply)                         \
+_(sw_interface_set_l2_bridge_reply)                     \
+_(bridge_domain_add_del_reply)                          \
+_(sw_interface_set_l2_xconnect_reply)                   \
+_(l2fib_add_del_reply)                                  \
+_(ip_add_del_route_reply)                               \
+_(proxy_arp_add_del_reply)                              \
+_(proxy_arp_intfc_enable_disable_reply)                 \
+_(mpls_add_del_encap_reply)                             \
+_(mpls_add_del_decap_reply)                             \
+_(mpls_ethernet_add_del_tunnel_2_reply)                 \
+_(sw_interface_set_unnumbered_reply)                    \
+_(ip_neighbor_add_del_reply)                            \
+_(reset_vrf_reply)                                      \
+_(oam_add_del_reply)                                    \
+_(reset_fib_reply)                                      \
+_(dhcp_proxy_config_reply)                              \
+_(dhcp_proxy_config_2_reply)                            \
+_(dhcp_proxy_set_vss_reply)                             \
+_(dhcp_client_config_reply)                             \
+_(set_ip_flow_hash_reply)                               \
+_(sw_interface_ip6_enable_disable_reply)                \
+_(sw_interface_ip6_set_link_local_address_reply)        \
+_(sw_interface_ip6nd_ra_prefix_reply)                   \
+_(sw_interface_ip6nd_ra_config_reply)                   \
+_(set_arp_neighbor_limit_reply)                         \
+_(l2_patch_add_del_reply)                               \
+_(sr_tunnel_add_del_reply)                              \
+_(classify_add_del_session_reply)                       \
+_(classify_set_interface_ip_table_reply)                \
+_(classify_set_interface_l2_tables_reply)               \
+_(l2tpv3_set_tunnel_cookies_reply)                      \
+_(l2tpv3_interface_enable_disable_reply)                \
+_(l2tpv3_set_lookup_key_reply)                          \
+_(l2_fib_clear_table_reply)                             \
+_(l2_interface_efp_filter_reply)                        \
+_(l2_interface_vlan_tag_rewrite_reply)                  \
+_(modify_vhost_user_if_reply)                           \
+_(delete_vhost_user_if_reply)                           \
+_(want_ip4_arp_events_reply)                            \
+_(input_acl_set_interface_reply)                        \
+_(ipsec_spd_add_del_reply)                              \
+_(ipsec_interface_add_del_spd_reply)                    \
+_(ipsec_spd_add_del_entry_reply)                        \
+_(ipsec_sad_add_del_entry_reply)                        \
+_(ipsec_sa_set_key_reply)                               \
+_(delete_loopback_reply)                                \
+_(bd_ip_mac_add_del_reply)                              \
+_(map_del_domain_reply)                                 \
+_(map_add_del_rule_reply)                               \
+_(want_interface_events_reply)                          \
+_(want_stats_reply)
+
+#define _(n)                                    \
+    static void vl_api_##n##_t_handler          \
+    (vl_api_##n##_t * mp)                       \
+    {                                           \
+        vat_main_t * vam = &vat_main;           \
+        i32 retval = ntohl(mp->retval);         \
+        if (vam->async_mode) {                  \
+            vam->async_errors += (retval < 0);  \
+        } else {                                \
+            vam->retval = retval;               \
+            vam->result_ready = 1;              \
+        }                                       \
+    }
+foreach_standard_reply_retval_handler;
+#undef _
+
+#define _(n)                                    \
+    static void vl_api_##n##_t_handler_json     \
+    (vl_api_##n##_t * mp)                       \
+    {                                           \
+        vat_main_t * vam = &vat_main;           \
+        vat_json_node_t node;                   \
+        vat_json_init_object(&node);            \
+        vat_json_object_add_int(&node, "retval", ntohl(mp->retval));    \
+        vat_json_print(vam->ofp, &node);        \
+        vam->retval = ntohl(mp->retval);        \
+        vam->result_ready = 1;                  \
+    }
+foreach_standard_reply_retval_handler;
+#undef _
+
+/* 
+ * Table of message reply handlers, must include boilerplate handlers
+ * we just generated
+ */
+
+#define foreach_vpe_api_reply_msg                                       \
+_(CREATE_LOOPBACK_REPLY, create_loopback_reply)                         \
+_(SW_INTERFACE_DETAILS, sw_interface_details)                           \
+_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags)                       \
+_(SW_INTERFACE_SET_FLAGS_REPLY, sw_interface_set_flags_reply)           \
+_(CONTROL_PING_REPLY, control_ping_reply)                               \
+_(CLI_REPLY, cli_reply)                                                 \
+_(SW_INTERFACE_ADD_DEL_ADDRESS_REPLY,                                   \
+  sw_interface_add_del_address_reply)                                   \
+_(SW_INTERFACE_SET_TABLE_REPLY, sw_interface_set_table_reply) 		\
+_(SW_INTERFACE_SET_VPATH_REPLY, sw_interface_set_vpath_reply) 		\
+_(SW_INTERFACE_SET_L2_XCONNECT_REPLY,                                   \
+  sw_interface_set_l2_xconnect_reply)                                   \
+_(SW_INTERFACE_SET_L2_BRIDGE_REPLY,                                     \
+  sw_interface_set_l2_bridge_reply)                                     \
+_(BRIDGE_DOMAIN_ADD_DEL_REPLY, bridge_domain_add_del_reply)             \
+_(BRIDGE_DOMAIN_DETAILS, bridge_domain_details)                         \
+_(BRIDGE_DOMAIN_SW_IF_DETAILS, bridge_domain_sw_if_details)             \
+_(L2FIB_ADD_DEL_REPLY, l2fib_add_del_reply)                             \
+_(L2_FLAGS_REPLY, l2_flags_reply)                                       \
+_(BRIDGE_FLAGS_REPLY, bridge_flags_reply)                               \
+_(TAP_CONNECT_REPLY, tap_connect_reply)					\
+_(TAP_MODIFY_REPLY, tap_modify_reply)					\
+_(TAP_DELETE_REPLY, tap_delete_reply)					\
+_(SW_INTERFACE_TAP_DETAILS, sw_interface_tap_details)                   \
+_(IP_ADD_DEL_ROUTE_REPLY, ip_add_del_route_reply)			\
+_(PROXY_ARP_ADD_DEL_REPLY, proxy_arp_add_del_reply)                     \
+_(PROXY_ARP_INTFC_ENABLE_DISABLE_REPLY,                                 \
+  proxy_arp_intfc_enable_disable_reply)                                 \
+_(MPLS_ADD_DEL_ENCAP_REPLY, mpls_add_del_encap_reply)                   \
+_(MPLS_ADD_DEL_DECAP_REPLY, mpls_add_del_decap_reply)                   \
+_(MPLS_GRE_ADD_DEL_TUNNEL_REPLY, mpls_gre_add_del_tunnel_reply)         \
+_(MPLS_ETHERNET_ADD_DEL_TUNNEL_REPLY,                                   \
+  mpls_ethernet_add_del_tunnel_reply)                                   \
+_(MPLS_ETHERNET_ADD_DEL_TUNNEL_2_REPLY,                                 \
+  mpls_ethernet_add_del_tunnel_2_reply)                                 \
+_(SW_INTERFACE_SET_UNNUMBERED_REPLY,                                    \
+  sw_interface_set_unnumbered_reply)                                    \
+_(IP_NEIGHBOR_ADD_DEL_REPLY, ip_neighbor_add_del_reply)                 \
+_(RESET_VRF_REPLY, reset_vrf_reply)                                     \
+_(CREATE_VLAN_SUBIF_REPLY, create_vlan_subif_reply)                     \
+_(CREATE_SUBIF_REPLY, create_subif_reply)                     		\
+_(OAM_ADD_DEL_REPLY, oam_add_del_reply)                                 \
+_(RESET_FIB_REPLY, reset_fib_reply)                                     \
+_(DHCP_PROXY_CONFIG_REPLY, dhcp_proxy_config_reply)                     \
+_(DHCP_PROXY_CONFIG_2_REPLY, dhcp_proxy_config_2_reply)                 \
+_(DHCP_PROXY_SET_VSS_REPLY, dhcp_proxy_set_vss_reply)                   \
+_(DHCP_CLIENT_CONFIG_REPLY, dhcp_client_config_reply)                   \
+_(SET_IP_FLOW_HASH_REPLY, set_ip_flow_hash_reply)                       \
+_(SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY,                                \
+  sw_interface_ip6_enable_disable_reply)                                \
+_(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS_REPLY,                        \
+  sw_interface_ip6_set_link_local_address_reply)                        \
+_(SW_INTERFACE_IP6ND_RA_PREFIX_REPLY,                                   \
+  sw_interface_ip6nd_ra_prefix_reply)                                   \
+_(SW_INTERFACE_IP6ND_RA_CONFIG_REPLY,                                   \
+  sw_interface_ip6nd_ra_config_reply)                                   \
+_(SET_ARP_NEIGHBOR_LIMIT_REPLY, set_arp_neighbor_limit_reply)           \
+_(L2_PATCH_ADD_DEL_REPLY, l2_patch_add_del_reply)                       \
+_(SR_TUNNEL_ADD_DEL_REPLY, sr_tunnel_add_del_reply)                     \
+_(CLASSIFY_ADD_DEL_TABLE_REPLY, classify_add_del_table_reply)           \
+_(CLASSIFY_ADD_DEL_SESSION_REPLY, classify_add_del_session_reply)       \
+_(CLASSIFY_SET_INTERFACE_IP_TABLE_REPLY,                                \
+classify_set_interface_ip_table_reply)                                  \
+_(CLASSIFY_SET_INTERFACE_L2_TABLES_REPLY,                               \
+  classify_set_interface_l2_tables_reply)                               \
+_(GET_NODE_INDEX_REPLY, get_node_index_reply)                           \
+_(ADD_NODE_NEXT_REPLY, add_node_next_reply)                             \
+_(L2TPV3_CREATE_TUNNEL_REPLY, l2tpv3_create_tunnel_reply)               \
+_(L2TPV3_SET_TUNNEL_COOKIES_REPLY, l2tpv3_set_tunnel_cookies_reply)     \
+_(L2TPV3_INTERFACE_ENABLE_DISABLE_REPLY,                                \
+  l2tpv3_interface_enable_disable_reply)                                \
+_(L2TPV3_SET_LOOKUP_KEY_REPLY, l2tpv3_set_lookup_key_reply)             \
+_(SW_IF_L2TPV3_TUNNEL_DETAILS, sw_if_l2tpv3_tunnel_details)             \
+_(VXLAN_ADD_DEL_TUNNEL_REPLY, vxlan_add_del_tunnel_reply)               \
+_(L2_FIB_CLEAR_TABLE_REPLY, l2_fib_clear_table_reply)                   \
+_(L2_INTERFACE_EFP_FILTER_REPLY, l2_interface_efp_filter_reply)         \
+_(L2_INTERFACE_VLAN_TAG_REWRITE_REPLY, l2_interface_vlan_tag_rewrite_reply) \
+_(SW_INTERFACE_VHOST_USER_DETAILS, sw_interface_vhost_user_details)     \
+_(CREATE_VHOST_USER_IF_REPLY, create_vhost_user_if_reply)               \
+_(MODIFY_VHOST_USER_IF_REPLY, modify_vhost_user_if_reply)               \
+_(DELETE_VHOST_USER_IF_REPLY, delete_vhost_user_if_reply)               \
+_(SHOW_VERSION_REPLY, show_version_reply)                               \
+_(NSH_GRE_ADD_DEL_TUNNEL_REPLY, nsh_gre_add_del_tunnel_reply)		\
+_(L2_FIB_TABLE_ENTRY, l2_fib_table_entry)				\
+_(NSH_VXLAN_GPE_ADD_DEL_TUNNEL_REPLY, nsh_vxlan_gpe_add_del_tunnel_reply) \
+_(LISP_GPE_ADD_DEL_TUNNEL_REPLY, lisp_gpe_add_del_tunnel_reply) 	\
+_(INTERFACE_NAME_RENUMBER_REPLY, interface_name_renumber_reply)		\
+_(WANT_IP4_ARP_EVENTS_REPLY, want_ip4_arp_events_reply)			\
+_(IP4_ARP_EVENT, ip4_arp_event)                                         \
+_(INPUT_ACL_SET_INTERFACE_REPLY, input_acl_set_interface_reply)         \
+_(IP_ADDRESS_DETAILS, ip_address_details)                               \
+_(IP_DETAILS, ip_details)                                               \
+_(IPSEC_SPD_ADD_DEL_REPLY, ipsec_spd_add_del_reply)                     \
+_(IPSEC_INTERFACE_ADD_DEL_SPD_REPLY, ipsec_interface_add_del_spd_reply) \
+_(IPSEC_SPD_ADD_DEL_ENTRY_REPLY, ipsec_spd_add_del_entry_reply)         \
+_(IPSEC_SAD_ADD_DEL_ENTRY_REPLY, ipsec_sad_add_del_entry_reply)         \
+_(IPSEC_SA_SET_KEY_REPLY, ipsec_sa_set_key_reply)                       \
+_(DELETE_LOOPBACK_REPLY, delete_loopback_reply)                         \
+_(BD_IP_MAC_ADD_DEL_REPLY, bd_ip_mac_add_del_reply)                     \
+_(DHCP_COMPL_EVENT, dhcp_compl_event)                                   \
+_(VNET_INTERFACE_COUNTERS, vnet_interface_counters)                     \
+_(VNET_IP4_FIB_COUNTERS, vnet_ip4_fib_counters)                         \
+_(VNET_IP6_FIB_COUNTERS, vnet_ip6_fib_counters)                         \
+_(MAP_ADD_DOMAIN_REPLY, map_add_domain_reply)                           \
+_(MAP_DEL_DOMAIN_REPLY, map_del_domain_reply)                           \
+_(MAP_ADD_DEL_RULE_REPLY, map_add_del_rule_reply)			            \
+_(MAP_DOMAIN_DETAILS, map_domain_details)                               \
+_(MAP_RULE_DETAILS, map_rule_details)                                   \
+_(WANT_INTERFACE_EVENTS_REPLY, want_interface_events_reply)             \
+_(WANT_STATS_REPLY, want_stats_reply)					\
+_(GET_FIRST_MSG_ID_REPLY, get_first_msg_id_reply)    
+
+/* M: construct, but don't yet send a message */
+
+#define M(T,t)                                  \
+do {                                            \
+    vam->result_ready = 0;                      \
+    mp = vl_msg_api_alloc(sizeof(*mp));         \
+    memset (mp, 0, sizeof (*mp));               \
+    mp->_vl_msg_id = ntohs (VL_API_##T);        \
+    mp->client_index = vam->my_client_index;    \
+} while(0);
+
+#define M2(T,t,n)                               \
+do {                                            \
+    vam->result_ready = 0;                      \
+    mp = vl_msg_api_alloc(sizeof(*mp)+(n));     \
+    memset (mp, 0, sizeof (*mp));               \
+    mp->_vl_msg_id = ntohs (VL_API_##T);        \
+    mp->client_index = vam->my_client_index;    \
+} while(0);
+
+
+/* S: send a message */
+#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
+
+/* W: wait for results, with timeout */
+#define W                                       \
+do {                                            \
+    timeout = vat_time_now (vam) + 1.0;         \
+                                                \
+    while (vat_time_now (vam) < timeout) {      \
+        if (vam->result_ready == 1) {           \
+            return (vam->retval);               \
+        }                                       \
+    }                                           \
+    return -99;                                 \
+} while(0);
+
+typedef struct {
+    u8 * name;
+    u32 value;
+} name_sort_t;
+
+
+#define STR_VTR_OP_CASE(op)     \
+    case L2_VTR_ ## op:         \
+        return "" # op;
+
+static const char *str_vtr_op(u32 vtr_op)
+{
+    switch(vtr_op) {
+        STR_VTR_OP_CASE(DISABLED);
+        STR_VTR_OP_CASE(PUSH_1);
+        STR_VTR_OP_CASE(PUSH_2);
+        STR_VTR_OP_CASE(POP_1);
+        STR_VTR_OP_CASE(POP_2);
+        STR_VTR_OP_CASE(TRANSLATE_1_1);
+        STR_VTR_OP_CASE(TRANSLATE_1_2);
+        STR_VTR_OP_CASE(TRANSLATE_2_1);
+        STR_VTR_OP_CASE(TRANSLATE_2_2);
+    }
+
+    return "UNKNOWN";
+}
+
+static int dump_sub_interface_table (vat_main_t * vam)
+{
+    const sw_interface_subif_t * sub = NULL;
+
+    if (vam->json_output) {
+        clib_warning ("JSON output supported only for VPE API calls and dump_stats_table");
+        return -99;
+    }
+
+    fformat (vam->ofp,
+             "%-30s%-12s%-11s%-7s%-5s%-9s%-9s%-6s%-8s%-10s%-10s\n",
+             "Interface", "sw_if_index",
+             "sub id", "dot1ad", "tags", "outer id",
+             "inner id", "exact", "default",
+             "outer any", "inner any");
+
+    vec_foreach (sub, vam->sw_if_subif_table) {
+        fformat (vam->ofp,
+                 "%-30s%-12d%-11d%-7s%-5d%-9d%-9d%-6d%-8d%-10d%-10d\n",
+                 sub->interface_name,
+                 sub->sw_if_index,
+                 sub->sub_id, sub->sub_dot1ad ? "dot1ad" : "dot1q",
+                 sub->sub_number_of_tags, sub->sub_outer_vlan_id,
+                 sub->sub_inner_vlan_id, sub->sub_exact_match, sub->sub_default,
+                 sub->sub_outer_vlan_id_any, sub->sub_inner_vlan_id_any);
+        if (sub->vtr_op != L2_VTR_DISABLED) {
+            fformat (vam->ofp,
+                     "  vlan-tag-rewrite - op: %-14s [ dot1q: %d "
+                     "tag1: %d tag2: %d ]\n",
+                     str_vtr_op(sub->vtr_op), sub->vtr_push_dot1q, 
+                     sub->vtr_tag1, sub->vtr_tag2);
+        }
+    }
+
+    return 0;
+}
+
+static int dump_interface_table (vat_main_t * vam)
+{
+    hash_pair_t * p;
+    name_sort_t * nses = 0, * ns;
+
+    if (vam->json_output) {
+        clib_warning ("JSON output supported only for VPE API calls and dump_stats_table");
+        return -99;
+    }
+
+    hash_foreach_pair (p, vam->sw_if_index_by_interface_name, 
+    ({
+        vec_add2 (nses, ns, 1);
+        ns->name = (u8 *)(p->key);
+        ns->value = (u32) p->value[0];
+    }));
+
+    vec_sort (nses, n1, n2, 
+              strcmp ((char *)n1->name, (char *)n2->name));
+
+    fformat (vam->ofp, "%-25s%-15s\n", "Interface", "sw_if_index");
+    vec_foreach (ns, nses) {
+        fformat (vam->ofp, "%-25s%-15d\n", ns->name, ns->value);
+    }
+    vec_free (nses);
+    return 0;
+}
+
+static int dump_ip_table (vat_main_t * vam, int is_ipv6)
+{
+    const ip_details_t * det = NULL;
+    const ip_address_details_t * address = NULL;
+    u32 i = ~0;
+
+    fformat (vam->ofp,
+             "%-12s\n",
+             "sw_if_index");
+
+    if (0 == vam->ip_details_by_sw_if_index) {
+        return 0;
+    }
+
+    vec_foreach (det, vam->ip_details_by_sw_if_index[is_ipv6]) {
+        i++;
+        if (!det->present) {
+            continue;
+        }
+        fformat (vam->ofp,
+                 "%-12d\n",
+                 i);
+        fformat (vam->ofp,
+                 "            %-30s%-13s\n",
+                 "Address", "Prefix length");
+        if (!det->addr) {
+            continue;
+        }
+        vec_foreach (address, det->addr) {
+            fformat (vam->ofp,
+                     "            %-30U%-13d\n",
+                     is_ipv6 ? format_ip6_address : format_ip4_address,
+                     address->ip,
+                     address->prefix_length);
+        }
+    }
+
+    return 0;
+}
+
+static int dump_ipv4_table (vat_main_t * vam)
+{
+    if (vam->json_output) {
+        clib_warning ("JSON output supported only for VPE API calls and dump_stats_table");
+        return -99;
+    }
+
+    return dump_ip_table (vam, 0);
+}
+
+static int dump_ipv6_table (vat_main_t * vam)
+{
+    if (vam->json_output) {
+        clib_warning ("JSON output supported only for VPE API calls and dump_stats_table");
+        return -99;
+    }
+
+    return dump_ip_table (vam, 1);
+}
+
+static char* counter_type_to_str (u8 counter_type, u8 is_combined)
+{
+    if (!is_combined) {
+        switch(counter_type) {
+        case VNET_INTERFACE_COUNTER_DROP:
+            return "drop";
+        case VNET_INTERFACE_COUNTER_PUNT:
+            return "punt";
+        case VNET_INTERFACE_COUNTER_IP4:
+            return "ip4";
+        case VNET_INTERFACE_COUNTER_IP6:
+            return "ip6";
+        case VNET_INTERFACE_COUNTER_RX_NO_BUF:
+            return "rx-no-buf";
+        case VNET_INTERFACE_COUNTER_RX_MISS:
+            return "rx-miss";
+        case VNET_INTERFACE_COUNTER_RX_ERROR:
+            return "rx-error";
+        case VNET_INTERFACE_COUNTER_TX_ERROR:
+            return "tx-error";
+        default:
+            return "INVALID-COUNTER-TYPE";
+        }
+    } else {
+        switch(counter_type) {
+        case VNET_INTERFACE_COUNTER_RX:
+            return "rx";
+        case VNET_INTERFACE_COUNTER_TX:
+            return "tx";
+        default:
+            return "INVALID-COUNTER-TYPE";
+        }
+    }
+}
+
+static int dump_stats_table (vat_main_t * vam)
+{
+    vat_json_node_t node;
+    vat_json_node_t *msg_array;
+    vat_json_node_t *msg;
+    vat_json_node_t *counter_array;
+    vat_json_node_t *counter;
+    interface_counter_t c;
+    u64 packets;
+    ip4_fib_counter_t *c4;
+    ip6_fib_counter_t *c6;
+    int i, j;
+
+    if (!vam->json_output) {
+        clib_warning ("dump_stats_table supported only in JSON format");
+        return -99;
+    }
+
+    vat_json_init_object(&node);
+
+    /* interface counters */
+    msg_array = vat_json_object_add(&node, "interface_counters");
+    vat_json_init_array(msg_array);
+    for (i = 0; i < vec_len(vam->simple_interface_counters); i++) {
+        msg = vat_json_array_add(msg_array);
+        vat_json_init_object(msg);
+        vat_json_object_add_string_copy(msg, "vnet_counter_type",
+                (u8*)counter_type_to_str(i, 0));
+        vat_json_object_add_int(msg, "is_combined", 0);
+        counter_array = vat_json_object_add(msg, "data");
+        vat_json_init_array(counter_array);
+        for (j = 0; j < vec_len(vam->simple_interface_counters[i]); j++) {
+            packets = vam->simple_interface_counters[i][j];
+            vat_json_array_add_uint(counter_array, packets);
+        }
+    }
+    for (i = 0; i < vec_len(vam->combined_interface_counters); i++) {
+        msg = vat_json_array_add(msg_array);
+        vat_json_init_object(msg);
+        vat_json_object_add_string_copy(msg, "vnet_counter_type",
+                (u8*)counter_type_to_str(i, 1));
+        vat_json_object_add_int(msg, "is_combined", 1);
+        counter_array = vat_json_object_add(msg, "data");
+        vat_json_init_array(counter_array);
+        for (j = 0; j < vec_len(vam->combined_interface_counters[i]); j++) {
+            c = vam->combined_interface_counters[i][j];
+            counter = vat_json_array_add(counter_array);
+            vat_json_init_object(counter);
+            vat_json_object_add_uint(counter, "packets", c.packets);
+            vat_json_object_add_uint(counter, "bytes", c.bytes);
+        }
+    }
+
+    /* ip4 fib counters */
+    msg_array = vat_json_object_add(&node, "ip4_fib_counters");
+    vat_json_init_array(msg_array);
+    for (i = 0; i < vec_len(vam->ip4_fib_counters); i++) {
+        msg = vat_json_array_add(msg_array);
+        vat_json_init_object(msg);
+        vat_json_object_add_uint(msg, "vrf_id", vam->ip4_fib_counters_vrf_id_by_index[i]);
+        counter_array = vat_json_object_add(msg, "c");
+        vat_json_init_array(counter_array);
+        for (j = 0; j < vec_len(vam->ip4_fib_counters[i]); j++) {
+            counter = vat_json_array_add(counter_array);
+            vat_json_init_object(counter);
+            c4 = &vam->ip4_fib_counters[i][j];
+            vat_json_object_add_ip4(counter, "address", c4->address);
+            vat_json_object_add_uint(counter, "address_length", c4->address_length);
+            vat_json_object_add_uint(counter, "packets", c4->packets);
+            vat_json_object_add_uint(counter, "bytes", c4->bytes);
+        }
+    }
+
+    /* ip6 fib counters */
+    msg_array = vat_json_object_add(&node, "ip6_fib_counters");
+    vat_json_init_array(msg_array);
+    for (i = 0; i < vec_len(vam->ip6_fib_counters); i++) {
+        msg = vat_json_array_add(msg_array);
+        vat_json_init_object(msg);
+        vat_json_object_add_uint(msg, "vrf_id", vam->ip6_fib_counters_vrf_id_by_index[i]);
+        counter_array = vat_json_object_add(msg, "c");
+        vat_json_init_array(counter_array);
+        for (j = 0; j < vec_len(vam->ip6_fib_counters[i]); j++) {
+            counter = vat_json_array_add(counter_array);
+            vat_json_init_object(counter);
+            c6 = &vam->ip6_fib_counters[i][j];
+            vat_json_object_add_ip6(counter, "address", c6->address);
+            vat_json_object_add_uint(counter, "address_length", c6->address_length);
+            vat_json_object_add_uint(counter, "packets", c6->packets);
+            vat_json_object_add_uint(counter, "bytes", c6->bytes);
+        }
+    }
+
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+
+    return 0;
+}
+
+int exec (vat_main_t * vam)
+{
+    api_main_t * am = &api_main;
+    vl_api_cli_request_t *mp;
+    f64 timeout;
+    void * oldheap;
+    u8 * cmd = 0;
+    unformat_input_t * i = vam->input;
+
+    if (vec_len(i->buffer) == 0)
+        return -1;
+
+    if (vam->exec_mode == 0 && unformat (i, "mode")) {        
+        vam->exec_mode = 1;
+        return 0;
+    }
+    if (vam->exec_mode == 1 && 
+        (unformat (i, "exit") || unformat (i, "quit"))) {
+        vam->exec_mode = 0;
+        return 0;
+    }
+    
+
+    M(CLI_REQUEST, cli_request);
+
+    /* 
+     * Copy cmd into shared memory.
+     * In order for the CLI command to work, it
+     * must be a vector ending in \n, not a C-string ending
+     * in \n\0.
+     */
+    pthread_mutex_lock (&am->vlib_rp->mutex);
+    oldheap = svm_push_data_heap (am->vlib_rp);
+
+    vec_validate (cmd, vec_len(vam->input->buffer)-1);
+    memcpy (cmd, vam->input->buffer, vec_len(vam->input->buffer));
+
+    svm_pop_heap (oldheap);
+    pthread_mutex_unlock (&am->vlib_rp->mutex);
+
+    mp->cmd_in_shmem = (u64) cmd;
+    S;
+    timeout = vat_time_now (vam) + 10.0;
+
+    while (vat_time_now (vam) < timeout) {
+        if (vam->result_ready == 1) {
+            u8 * free_me;
+            fformat (vam->ofp, "%s", vam->shmem_result);
+            pthread_mutex_lock (&am->vlib_rp->mutex);
+            oldheap = svm_push_data_heap (am->vlib_rp);
+            
+            free_me = (u8 *)vam->shmem_result;
+            vec_free (free_me);
+
+            svm_pop_heap (oldheap);
+            pthread_mutex_unlock (&am->vlib_rp->mutex);
+            return 0;
+        }
+    }
+    return -99;
+}
+
+static int api_create_loopback (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_create_loopback_t *mp;
+    f64 timeout;
+    u8 mac_address[6];
+    u8 mac_set = 0;
+
+    memset (mac_address, 0, sizeof (mac_address));
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+      {
+        if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
+            mac_set = 1;
+        else
+          break;
+      }
+
+    /* Construct the API message */
+    M(CREATE_LOOPBACK, create_loopback);
+    if (mac_set)
+        memcpy (mp->mac_address, mac_address, sizeof (mac_address));
+
+    S; W;
+}
+
+static int api_delete_loopback (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_delete_loopback_t *mp;
+    f64 timeout;
+    u32 sw_if_index = ~0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+      {
+        if (unformat (i, "sw_if_index %d", &sw_if_index))
+          ;
+        else
+          break;
+      }
+
+    if (sw_if_index == ~0)
+      {
+        errmsg ("missing sw_if_index\n");
+        return -99;
+      }
+
+    /* Construct the API message */
+    M(DELETE_LOOPBACK, delete_loopback);
+    mp->sw_if_index = ntohl (sw_if_index);
+
+    S; W;
+}
+
+static int api_want_stats (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_want_stats_t * mp;
+    f64 timeout;
+    int enable = -1;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+      {
+        if (unformat (i, "enable"))
+          enable = 1;
+        else if (unformat (i, "disable"))
+          enable = 0;
+        else
+          break;
+      }
+
+    if (enable == -1)
+      {
+        errmsg ("missing enable|disable\n");
+        return -99;
+      }
+
+    M(WANT_STATS, want_stats);
+    mp->enable_disable = enable;
+
+    S; W;
+}
+
+static int api_want_interface_events (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_want_interface_events_t * mp;
+    f64 timeout;
+    int enable = -1;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+      {
+        if (unformat (i, "enable"))
+          enable = 1;
+        else if (unformat (i, "disable"))
+          enable = 0;
+        else
+          break;
+      }
+
+    if (enable == -1)
+      {
+        errmsg ("missing enable|disable\n");
+        return -99;
+      }
+
+    M(WANT_INTERFACE_EVENTS, want_interface_events);
+    mp->enable_disable = enable;
+
+    vam->interface_event_display = enable;
+
+    S; W;
+}
+
+
+/* Note: non-static, called once to set up the initial intfc table */
+int api_sw_interface_dump (vat_main_t * vam)
+{
+    vl_api_sw_interface_dump_t *mp;
+    f64 timeout;
+    hash_pair_t * p;
+    name_sort_t * nses = 0, * ns;
+    sw_interface_subif_t * sub = NULL;
+
+    /* Toss the old name table */
+    hash_foreach_pair (p, vam->sw_if_index_by_interface_name, 
+    ({
+        vec_add2 (nses, ns, 1);
+        ns->name = (u8 *)(p->key);
+        ns->value = (u32) p->value[0];
+    }));
+
+    hash_free (vam->sw_if_index_by_interface_name);
+
+    vec_foreach (ns, nses)
+        vec_free (ns->name);
+
+    vec_free (nses);
+
+    vec_foreach (sub, vam->sw_if_subif_table) {
+        vec_free (sub->interface_name);
+    }
+    vec_free (vam->sw_if_subif_table);
+
+    /* recreate the interface name hash table */
+    vam->sw_if_index_by_interface_name 
+        = hash_create_string (0, sizeof(uword));
+
+    /* Get list of ethernets */
+    M(SW_INTERFACE_DUMP, sw_interface_dump);
+    mp->name_filter_valid = 1;
+    strncpy ((char *) mp->name_filter, "Ether", sizeof(mp->name_filter-1)); 
+    S;
+
+    /* and local / loopback interfaces */
+    M(SW_INTERFACE_DUMP, sw_interface_dump);
+    mp->name_filter_valid = 1;
+    strncpy ((char *) mp->name_filter, "lo", sizeof(mp->name_filter-1)); 
+    S;
+
+    /* and vxlan tunnel interfaces */
+    M(SW_INTERFACE_DUMP, sw_interface_dump);
+    mp->name_filter_valid = 1;
+    strncpy ((char *) mp->name_filter, "vxlan", sizeof(mp->name_filter-1)); 
+    S;
+
+    /* and l2tpv3 tunnel interfaces */
+    M(SW_INTERFACE_DUMP, sw_interface_dump);
+    mp->name_filter_valid = 1;
+    strncpy ((char *) mp->name_filter, "l2tpv3_tunnel", sizeof(mp->name_filter-1));
+    S;
+
+    /* Use a control ping for synchronization */
+    {
+        vl_api_control_ping_t * mp;
+        M(CONTROL_PING, control_ping);
+        S;
+    }
+    W;
+}
+
+static int api_sw_interface_set_flags (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_sw_interface_set_flags_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u8 sw_if_index_set = 0;
+    u8 admin_up = 0, link_up = 0;
+    
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "admin-up"))
+            admin_up = 1;
+        else if (unformat (i, "admin-down"))
+            admin_up = 0;
+        else if (unformat (i, "link-up"))
+            link_up = 1;
+        else if (unformat (i, "link-down"))
+            link_up = 0;
+        else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+        else
+            break;
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+    /* Construct the API message */
+    M(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags);
+    mp->sw_if_index = ntohl (sw_if_index);
+    mp->admin_up_down = admin_up;
+    mp->link_up_down = link_up;
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply, return the good/bad news... */
+    W;
+}
+
+static int api_sw_interface_add_del_address (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_sw_interface_add_del_address_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u8 sw_if_index_set = 0;
+    u8 is_add = 1, del_all = 0;
+    u32 address_length = 0;
+    u8 v4_address_set = 0;
+    u8 v6_address_set = 0;
+    ip4_address_t v4address;
+    ip6_address_t v6address;
+    
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "del-all"))
+            del_all = 1;
+        else if (unformat (i, "del"))
+            is_add = 0;
+        else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "%U/%d", 
+                           unformat_ip4_address, &v4address, 
+                           &address_length))
+            v4_address_set = 1;
+        else if (unformat (i, "%U/%d", 
+                           unformat_ip6_address, &v6address, 
+                           &address_length))
+            v6_address_set = 1;
+        else
+            break;
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+    if (v4_address_set && v6_address_set) {
+        errmsg ("both v4 and v6 addresses set\n");
+        return -99;
+    }
+    if (!v4_address_set && !v6_address_set && !del_all) {
+        errmsg ("no addresses set\n");
+        return -99;
+    }
+
+    /* Construct the API message */
+    M(SW_INTERFACE_ADD_DEL_ADDRESS, sw_interface_add_del_address);
+
+    mp->sw_if_index = ntohl (sw_if_index);
+    mp->is_add = is_add;
+    mp->del_all = del_all;
+    if (v6_address_set) {
+        mp->is_ipv6 = 1;
+        memcpy (mp->address, &v6address, sizeof (v6address));
+    } else {
+        memcpy (mp->address, &v4address, sizeof (v4address));
+    }
+    mp->address_length = address_length;
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply, return good/bad news  */
+    W;
+}
+
+static int api_sw_interface_set_table (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_sw_interface_set_table_t *mp;
+    f64 timeout;
+    u32 sw_if_index, vrf_id = 0;
+    u8 sw_if_index_set = 0;
+    u8 is_ipv6 = 0;
+    
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "vrf %d", &vrf_id))
+            ;
+        else if (unformat (i, "ipv6"))
+            is_ipv6 = 1;
+        else
+            break;
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+    /* Construct the API message */
+    M(SW_INTERFACE_SET_TABLE, sw_interface_set_table);
+
+    mp->sw_if_index = ntohl (sw_if_index);
+    mp->is_ipv6 = is_ipv6;
+    mp->vrf_id = ntohl (vrf_id);
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+}
+
+static int api_sw_interface_set_vpath (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_sw_interface_set_vpath_t *mp;
+    f64 timeout;
+    u32 sw_if_index = 0;
+    u8 sw_if_index_set = 0;
+    u8 is_enable = 0;
+    
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "enable"))
+            is_enable = 1;
+        else if (unformat (i, "disable"))
+            is_enable = 0;
+        else
+            break;
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+    /* Construct the API message */
+    M(SW_INTERFACE_SET_VPATH, sw_interface_set_vpath);
+
+    mp->sw_if_index = ntohl (sw_if_index);
+    mp->enable = is_enable;
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+}
+
+static int api_sw_interface_set_l2_xconnect (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_sw_interface_set_l2_xconnect_t *mp;
+    f64 timeout;
+    u32 rx_sw_if_index;
+    u8 rx_sw_if_index_set = 0;
+    u32 tx_sw_if_index;
+    u8 tx_sw_if_index_set = 0;
+    u8 enable = 1;
+    
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index))
+            rx_sw_if_index_set = 1;	
+	else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
+            tx_sw_if_index_set = 1;
+	else if (unformat (i, "rx")) {
+	    if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+		if (unformat (i, "%U", unformat_sw_if_index, vam,
+			      &rx_sw_if_index))
+		    rx_sw_if_index_set = 1;
+	    } else
+		break;
+	} else if (unformat (i, "tx")) {
+	    if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+		if (unformat (i, "%U", unformat_sw_if_index, vam,
+			      &tx_sw_if_index))
+		    tx_sw_if_index_set = 1;
+	    } else
+		break;
+	} else if (unformat (i, "enable"))
+	    enable = 1;
+	else if (unformat (i, "disable")) 
+	    enable = 0;
+	else
+            break;
+    }
+
+    if (rx_sw_if_index_set == 0) {
+        errmsg ("missing rx interface name or rx_sw_if_index\n");
+        return -99;
+    }
+
+    if (enable && (tx_sw_if_index_set == 0)) {
+        errmsg ("missing tx interface name or tx_sw_if_index\n");
+        return -99;
+    }
+    
+    M(SW_INTERFACE_SET_L2_XCONNECT, sw_interface_set_l2_xconnect);
+
+    mp->rx_sw_if_index = ntohl(rx_sw_if_index);
+    mp->tx_sw_if_index = ntohl(tx_sw_if_index);
+    mp->enable = enable;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_sw_interface_set_l2_bridge (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_sw_interface_set_l2_bridge_t *mp;
+    f64 timeout;
+    u32 rx_sw_if_index;
+    u8 rx_sw_if_index_set = 0;
+    u32 bd_id;
+    u8 bd_id_set = 0;
+    u8 bvi = 0;
+    u32 shg = 0;
+    u8 enable = 1;
+    
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "sw_if_index %d", &rx_sw_if_index))
+            rx_sw_if_index_set = 1;	
+	else if (unformat (i, "bd_id %d", &bd_id))
+            bd_id_set = 1;
+	else if (unformat (i, "%U", unformat_sw_if_index, vam,
+                           &rx_sw_if_index))
+            rx_sw_if_index_set = 1;
+	else if (unformat (i, "shg %d", &shg)) 
+            ;
+        else if (unformat (i, "bvi"))
+            bvi = 1;
+	else if (unformat (i, "enable"))
+	    enable = 1;
+	else if (unformat (i, "disable")) 
+	    enable = 0;
+	else
+            break;
+    }
+
+    if (rx_sw_if_index_set == 0) {
+        errmsg ("missing rx interface name or sw_if_index\n");
+        return -99;
+    }
+
+    if (enable && (bd_id_set == 0)) {
+        errmsg ("missing bridge domain\n");
+        return -99;
+    }
+    
+    M(SW_INTERFACE_SET_L2_BRIDGE, sw_interface_set_l2_bridge);
+
+    mp->rx_sw_if_index = ntohl(rx_sw_if_index);
+    mp->bd_id = ntohl(bd_id);
+    mp->shg = (u8)shg;
+    mp->bvi = bvi;
+    mp->enable = enable;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_bridge_domain_dump (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_bridge_domain_dump_t *mp;
+    f64 timeout;
+    u32 bd_id = ~0;
+
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "bd_id %d", &bd_id))
+            ;
+        else
+            break;
+    }
+
+    M(BRIDGE_DOMAIN_DUMP, bridge_domain_dump);
+    mp->bd_id = ntohl(bd_id);
+    S;
+
+    /* Use a control ping for synchronization */
+    {
+        vl_api_control_ping_t * mp;
+        M(CONTROL_PING, control_ping);
+        S;
+    }
+
+    W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_bridge_domain_add_del (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_bridge_domain_add_del_t *mp;
+    f64 timeout;
+    u32 bd_id = ~0;
+    u8 is_add = 1;
+    u32 flood = 1, forward = 1, learn = 1, uu_flood = 1, arp_term = 0;
+
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "bd_id %d", &bd_id))
+            ;
+	else if (unformat (i, "flood %d", &flood))
+             ;
+	else if (unformat (i, "uu-flood %d", &uu_flood))
+             ;
+	else if (unformat (i, "forward %d", &forward))
+             ;
+	else if (unformat (i, "learn %d", &learn))
+             ;
+	else if (unformat (i, "arp-term %d", &arp_term))
+             ;
+	else if (unformat (i, "del")) {
+             is_add = 0;
+             flood = uu_flood = forward = learn = 0;
+        }
+        else
+            break;
+    }
+
+    if (bd_id == ~0) {
+        errmsg ("missing bridge domain\n");
+        return -99;
+    }
+
+    M(BRIDGE_DOMAIN_ADD_DEL, bridge_domain_add_del);
+
+    mp->bd_id = ntohl(bd_id);
+    mp->flood = flood;
+    mp->uu_flood = uu_flood;
+    mp->forward = forward;
+    mp->learn = learn;
+    mp->arp_term = arp_term;
+    mp->is_add = is_add;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_l2fib_add_del (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_l2fib_add_del_t *mp;
+    f64 timeout;
+    u64 mac = 0;
+    u8 mac_set = 0;
+    u32 bd_id;
+    u8 bd_id_set = 0;
+    u32 sw_if_index;
+    u8 sw_if_index_set = 0;
+    u8 is_add = 1;
+    u8 static_mac = 0;
+    u8 filter_mac = 0;
+
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "mac %U", unformat_ethernet_address, &mac))
+            mac_set = 1;
+	else if (unformat (i, "bd_id %d", &bd_id))
+            bd_id_set = 1;
+	else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;	
+	else if (unformat (i, "sw_if")) {
+	    if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+                if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+                    sw_if_index_set = 1;
+	    } else
+		break;
+	} else if (unformat (i, "static"))
+		static_mac = 1;
+	else if (unformat (i, "filter")) {
+		filter_mac = 1;
+		static_mac = 1;
+	} else if (unformat (i, "del"))
+		is_add = 0;
+	else
+            break;
+    }
+
+    if (mac_set == 0) {
+        errmsg ("missing mac address\n");
+        return -99;
+    }
+
+    if (bd_id_set == 0) {
+        errmsg ("missing bridge domain\n");
+        return -99;
+    }
+
+    if (is_add && (sw_if_index_set == 0)) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+    M(L2FIB_ADD_DEL, l2fib_add_del);
+
+    mp->mac = mac;
+    mp->bd_id = ntohl(bd_id);
+    mp->is_add = is_add;
+
+    if (is_add) {
+        mp->sw_if_index = ntohl(sw_if_index);
+        mp->static_mac = static_mac;
+        mp->filter_mac = filter_mac;
+    }
+    
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_l2_flags (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_l2_flags_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u32 feature_bitmap = 0;
+    u8 sw_if_index_set = 0;
+
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;	
+        else if (unformat (i, "sw_if")) {
+            if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+                if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+                    sw_if_index_set = 1;
+            } else
+                break;
+	} else if (unformat (i, "learn"))
+            feature_bitmap |= L2INPUT_FEAT_LEARN;
+	else if (unformat (i, "forward"))
+	    feature_bitmap |= L2INPUT_FEAT_FWD;
+	else if (unformat (i, "flood"))
+	    feature_bitmap |= L2INPUT_FEAT_FLOOD;
+	else if (unformat (i, "uu-flood"))
+	    feature_bitmap |= L2INPUT_FEAT_UU_FLOOD;
+	else
+            break;
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+    M(L2_FLAGS, l2_flags);
+
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->feature_bitmap = ntohl(feature_bitmap);
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_bridge_flags (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_bridge_flags_t *mp;
+    f64 timeout;
+    u32 bd_id;
+    u8 bd_id_set = 0;
+    u8 is_set = 1;
+    u32 flags = 0;
+
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "bd_id %d", &bd_id))
+            bd_id_set = 1;
+	else if (unformat (i, "learn"))
+	    flags |= L2_LEARN;
+	else if (unformat (i, "forward"))
+	    flags |= L2_FWD;
+	else if (unformat (i, "flood"))
+	    flags |= L2_FLOOD;
+	else if (unformat (i, "uu-flood"))
+	    flags |= L2_UU_FLOOD;
+	else if (unformat (i, "arp-term"))
+	    flags |= L2_ARP_TERM;
+	else if (unformat (i, "off"))
+	    is_set = 0;
+	else if (unformat (i, "disable"))
+	    is_set = 0;
+	else
+            break;
+    }
+
+    if (bd_id_set == 0) {
+        errmsg ("missing bridge domain\n");
+        return -99;
+    }
+
+    M(BRIDGE_FLAGS, bridge_flags);
+
+    mp->bd_id = ntohl(bd_id);
+    mp->feature_bitmap = ntohl(flags);
+    mp->is_set = is_set;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_bd_ip_mac_add_del (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_bd_ip_mac_add_del_t *mp;
+    f64 timeout;
+    u32 bd_id;
+    u8 is_ipv6 = 0;
+    u8 is_add = 1;
+    u8 bd_id_set = 0;
+    u8 ip_set = 0;
+    u8 mac_set = 0;
+    ip4_address_t v4addr;
+    ip6_address_t v6addr;
+    u8 macaddr[6];
+    
+
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "bd_id %d", &bd_id)) {
+            bd_id_set++;
+	} else if (unformat (i, "%U", unformat_ip4_address, &v4addr)) {
+	    ip_set++;
+	} else if (unformat (i, "%U", unformat_ip6_address, &v6addr)) {
+	    ip_set++;
+	    is_ipv6++;
+	} else if (unformat (i, "%U", unformat_ethernet_address, macaddr)) {
+	    mac_set++;
+	} else if (unformat (i, "del"))
+	    is_add = 0;
+	else
+            break;
+    }
+
+    if (bd_id_set == 0) {
+        errmsg ("missing bridge domain\n");
+        return -99;
+    } else if (ip_set == 0) {
+        errmsg ("missing IP address\n");
+        return -99;
+    } else if (mac_set == 0) {
+        errmsg ("missing MAC address\n");
+        return -99;
+    }
+
+    M(BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del);
+
+    mp->bd_id = ntohl(bd_id);
+    mp->is_ipv6 = is_ipv6;
+    mp->is_add = is_add;
+    if (is_ipv6)
+	 memcpy (mp->ip_address, &v6addr, sizeof (v6addr));
+    else memcpy (mp->ip_address, &v4addr, sizeof (v4addr));
+    memcpy (mp->mac_address, macaddr, 6);
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_tap_connect (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_tap_connect_t *mp;
+    f64 timeout;
+    u8 mac_address[6];
+    u8 random_mac = 1;
+    u8 name_set = 0;
+    u8 * tap_name;
+
+    memset (mac_address, 0, sizeof (mac_address));
+    
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "mac %U", unformat_ethernet_address, mac_address)) {
+            random_mac = 0;
+        }
+        else if (unformat (i, "random-mac"))
+            random_mac = 1;
+        else if (unformat (i, "tapname %s", &tap_name))
+            name_set = 1;
+        else
+            break;
+    }
+
+    if (name_set == 0) {
+        errmsg ("missing tap name\n");
+        return -99;
+    }
+    if (vec_len (tap_name) > 63) {
+        errmsg ("tap name too long\n");
+    }
+    vec_add1 (tap_name, 0);
+        
+    /* Construct the API message */
+    M(TAP_CONNECT, tap_connect);
+
+    mp->use_random_mac = random_mac;
+    memcpy (mp->mac_address, mac_address, 6);
+    memcpy (mp->tap_name, tap_name, vec_len (tap_name));
+    vec_free (tap_name);
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+}
+
+static int api_tap_modify (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_tap_modify_t *mp;
+    f64 timeout;
+    u8 mac_address[6];
+    u8 random_mac = 1;
+    u8 name_set = 0;
+    u8 * tap_name;
+    u32 sw_if_index = ~0;
+    u8 sw_if_index_set = 0;
+
+    memset (mac_address, 0, sizeof (mac_address));
+    
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "mac %U", unformat_ethernet_address, mac_address)) {
+            random_mac = 0;
+        }
+        else if (unformat (i, "random-mac"))
+            random_mac = 1;
+        else if (unformat (i, "tapname %s", &tap_name))
+            name_set = 1;
+        else
+            break;
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing vpp interface name");
+        return -99;
+    }
+    if (name_set == 0) {
+        errmsg ("missing tap name\n");
+        return -99;
+    }
+    if (vec_len (tap_name) > 63) {
+        errmsg ("tap name too long\n");
+    }
+    vec_add1 (tap_name, 0);
+        
+    /* Construct the API message */
+    M(TAP_MODIFY, tap_modify);
+
+    mp->use_random_mac = random_mac;
+    mp->sw_if_index = ntohl(sw_if_index);
+    memcpy (mp->mac_address, mac_address, 6);
+    memcpy (mp->tap_name, tap_name, vec_len (tap_name));
+    vec_free (tap_name);
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+}
+
+static int api_tap_delete (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_tap_delete_t *mp;
+    f64 timeout;
+    u32 sw_if_index = ~0;
+    u8 sw_if_index_set = 0;
+
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+        else
+            break;
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing vpp interface name");
+        return -99;
+    }
+        
+    /* Construct the API message */
+    M(TAP_DELETE, tap_delete);
+
+    mp->sw_if_index = ntohl(sw_if_index);
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+}
+
+static int api_ip_add_del_route (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_ip_add_del_route_t *mp;
+    f64 timeout;
+    u32 sw_if_index = 0, vrf_id = 0;
+    u8 sw_if_index_set = 0;
+    u8 is_ipv6 = 0;
+    u8 is_local = 0, is_drop = 0;
+    u8 create_vrf_if_needed = 0;
+    u8 is_add = 1;
+    u8 next_hop_weight = 1;
+    u8 not_last = 0;
+    u8 is_multipath = 0;
+    u8 address_set = 0;
+    u8 address_length_set = 0;
+    u32 lookup_in_vrf = 0;
+    u32 resolve_attempts = 0;
+    u32 dst_address_length = 0;
+    u8 next_hop_set = 0;
+    ip4_address_t v4_dst_address, v4_next_hop_address;
+    ip6_address_t v6_dst_address, v6_next_hop_address;
+    int count = 1;
+    int j;
+    f64 before = 0;
+    u32 random_add_del = 0;
+    u32 * random_vector = 0;
+    uword * random_hash;
+    u32 random_seed = 0xdeaddabe;
+    u32 classify_table_index = ~0;
+    u8 is_classify = 0;
+    
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "%U", unformat_ip4_address,
+                           &v4_dst_address)) {
+            address_set = 1;
+            is_ipv6 = 0;
+        }
+        else if (unformat (i, "%U", unformat_ip6_address, &v6_dst_address)) {
+            address_set = 1;
+            is_ipv6 = 1;
+        }
+        else if (unformat (i, "/%d", &dst_address_length)) {
+            address_length_set = 1;
+        }
+        
+        else if (is_ipv6 == 0 && unformat (i, "via %U", unformat_ip4_address, 
+                                           &v4_next_hop_address)) {
+            next_hop_set = 1;
+        }
+        else if (is_ipv6 == 1 && unformat (i, "via %U", unformat_ip6_address, 
+                                           &v6_next_hop_address)) {
+            next_hop_set = 1;
+        }
+        else if (unformat (i, "resolve-attempts %d", &resolve_attempts))
+            ;
+        else if (unformat (i, "weight %d", &next_hop_weight))
+            ;
+        else if (unformat (i, "drop")) {
+            is_drop = 1;
+        } else if (unformat (i, "local")) {
+            is_local = 1;
+        } else if (unformat (i, "classify %d", &classify_table_index)) {
+            is_classify = 1;
+        } else if (unformat (i, "del"))
+            is_add = 0;
+        else if (unformat (i, "add"))
+            is_add = 1;
+        else if (unformat (i, "not-last"))
+            not_last = 1;
+        else if (unformat (i, "multipath"))
+            is_multipath = 1;
+        else if (unformat (i, "vrf %d", &vrf_id))
+            ;
+        else if (unformat (i, "create-vrf"))
+            create_vrf_if_needed = 1;
+        else if (unformat (i, "count %d", &count))
+            ;
+        else if (unformat (i, "lookup-in-vrf %d", &lookup_in_vrf))
+            ;
+        else if (unformat (i, "random"))
+            random_add_del = 1;
+        else if (unformat (i, "seed %d", &random_seed))
+            ;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+
+    if (resolve_attempts > 0 && sw_if_index_set == 0) {
+        errmsg ("ARP resolution needs explicit interface or sw_if_index\n");
+        return -99;
+    }
+    
+    if (!next_hop_set && !is_drop && !is_local && !is_classify) {
+        errmsg ("next hop / local / drop / classify not set\n");
+        return -99;
+    }
+
+    if (address_set == 0) {
+        errmsg ("missing addresses\n");
+        return -99;
+    }
+
+    if (address_length_set == 0) {
+        errmsg ("missing address length\n");
+        return -99;
+    }
+    
+    /* Generate a pile of unique, random routes */
+    if (random_add_del) {
+        u32 this_random_address;
+        random_hash = hash_create (count, sizeof(uword));
+
+        hash_set (random_hash, v4_next_hop_address.as_u32, 1);
+        for (j = 0; j <= count; j++) {
+            do {
+                this_random_address = random_u32 (&random_seed);
+                this_random_address = 
+                    clib_host_to_net_u32 (this_random_address);
+            } while (hash_get (random_hash, this_random_address));
+            vec_add1 (random_vector, this_random_address);
+            hash_set (random_hash, this_random_address, 1);
+        }
+        hash_free (random_hash);
+        v4_dst_address.as_u32 = random_vector[0];
+    }
+
+    if (count > 1) {
+        /* Turn on async mode */
+        vam->async_mode = 1;
+        vam->async_errors = 0;
+        before = vat_time_now(vam);
+    }
+
+    for (j = 0; j < count; j++) {
+        /* Construct the API message */
+        M(IP_ADD_DEL_ROUTE, ip_add_del_route);
+    
+        mp->next_hop_sw_if_index = ntohl (sw_if_index);
+        mp->vrf_id = ntohl (vrf_id);
+        if (resolve_attempts > 0) {
+            mp->resolve_attempts = ntohl (resolve_attempts);
+            mp->resolve_if_needed = 1;
+        }
+        mp->create_vrf_if_needed = create_vrf_if_needed;
+    
+        mp->is_add = is_add;
+        mp->is_drop = is_drop;
+        mp->is_ipv6 = is_ipv6;
+        mp->is_local = is_local;
+        mp->is_classify = is_classify;
+        mp->is_multipath = is_multipath;
+        mp->not_last = not_last;
+        mp->next_hop_weight = next_hop_weight;
+        mp->dst_address_length = dst_address_length;
+        mp->lookup_in_vrf = ntohl(lookup_in_vrf);
+        mp->classify_table_index = ntohl(classify_table_index);
+
+        if (is_ipv6){
+            memcpy (mp->dst_address, &v6_dst_address, sizeof (v6_dst_address));
+            if (next_hop_set)
+                memcpy (mp->next_hop_address, &v6_next_hop_address, 
+                        sizeof (v6_next_hop_address));
+            increment_v6_address (&v6_dst_address);
+        } else {
+            memcpy (mp->dst_address, &v4_dst_address, sizeof (v4_dst_address));
+            if (next_hop_set)
+                memcpy (mp->next_hop_address, &v4_next_hop_address, 
+                        sizeof (v4_next_hop_address));
+            if (random_add_del)
+                v4_dst_address.as_u32 = random_vector[j+1];
+            else
+                increment_v4_address (&v4_dst_address);
+        }
+        /* send it... */
+        S;
+    }
+
+    /* When testing multiple add/del ops, use a control-ping to sync */
+    if (count > 1) {
+        vl_api_control_ping_t * mp;
+        f64 after;
+
+        /* Shut off async mode */
+        vam->async_mode = 0;
+
+        M(CONTROL_PING, control_ping);
+        S;
+
+        timeout = vat_time_now(vam) + 1.0;
+        while (vat_time_now (vam) < timeout)
+            if (vam->result_ready == 1)
+                goto out;
+        vam->retval = -99;
+
+    out:
+        if (vam->retval == -99)
+            errmsg ("timeout\n");
+
+        if (vam->async_errors > 0) {
+            errmsg ("%d asynchronous errors\n", vam->async_errors);
+            vam->retval = -98;
+        }
+        vam->async_errors = 0;
+        after = vat_time_now(vam);
+
+        fformat(vam->ofp, "%d routes in %.6f secs, %.2f routes/sec\n",
+                count, after - before, count / (after - before));
+    } else {
+        /* Wait for a reply... */
+        W;
+    }
+
+    /* Return the good/bad news */
+    return (vam->retval);
+}
+
+static int api_proxy_arp_add_del (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_proxy_arp_add_del_t *mp;
+    f64 timeout;
+    u32 vrf_id = 0;
+    u8 is_add = 1;
+    ip4_address_t lo, hi;
+    u8 range_set = 0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "vrf %d", &vrf_id))
+	    ;
+	else if (unformat (i, "%U - %U", unformat_ip4_address, &lo, 
+			   unformat_ip4_address, &hi))
+	    range_set = 1;
+	else if (unformat (i, "del"))
+	    is_add = 0;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+    
+    if (range_set == 0) {
+        errmsg ("address range not set\n");
+        return -99;
+    }
+
+    M(PROXY_ARP_ADD_DEL, proxy_arp_add_del);
+
+    mp->vrf_id = ntohl(vrf_id);
+    mp->is_add = is_add;
+    memcpy(mp->low_address, &lo, sizeof (mp->low_address));
+    memcpy(mp->hi_address, &hi, sizeof (mp->hi_address));
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_proxy_arp_intfc_enable_disable (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_proxy_arp_intfc_enable_disable_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u8 enable = 1;
+    u8 sw_if_index_set = 0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+	else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+	else if (unformat (i, "enable"))
+            enable = 1;
+	else if (unformat (i, "disable"))
+            enable = 0;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+    
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+    M(PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable);
+
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->enable_disable = enable;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_mpls_add_del_decap (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_mpls_add_del_decap_t *mp;
+    f64 timeout;
+    u32 rx_vrf_id = 0;
+    u32 tx_vrf_id = 0;
+    u32 label = 0;
+    u8 is_add = 1;
+    u8 s_bit = 1;
+    u32 next_index = 1;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "rx_vrf_id %d", &rx_vrf_id))
+	    ;
+	else if (unformat (i, "tx_vrf_id %d", &tx_vrf_id))
+	    ;
+	else if (unformat (i, "label %d", &label))
+	    ;
+	else if (unformat (i, "next-index %d", &next_index))
+            ;
+	else if (unformat (i, "del"))
+	    is_add = 0;
+        else if (unformat (i, "s-bit-clear"))
+            s_bit = 0;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+    
+    M(MPLS_ADD_DEL_DECAP, mpls_add_del_decap);
+
+    mp->rx_vrf_id = ntohl(rx_vrf_id);
+    mp->tx_vrf_id = ntohl(tx_vrf_id);
+    mp->label = ntohl(label);
+    mp->next_index = ntohl(next_index);
+    mp->s_bit = s_bit;
+    mp->is_add = is_add;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_mpls_add_del_encap (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_mpls_add_del_encap_t *mp;
+    f64 timeout;
+    u32 vrf_id = 0;
+    u32 *labels = 0;
+    u32 label;
+    ip4_address_t dst_address;
+    u8 is_add = 1;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "vrf %d", &vrf_id))
+	    ;
+	else if (unformat (i, "label %d", &label))
+            vec_add1 (labels, ntohl(label));
+	else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address))
+            ;
+	else if (unformat (i, "del"))
+	    is_add = 0;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+
+    if (vec_len (labels) == 0) {
+        errmsg ("missing encap label stack\n");
+        return -99;
+    }
+    
+    M2(MPLS_ADD_DEL_ENCAP, mpls_add_del_encap, 
+       sizeof (u32) * vec_len (labels));
+
+    mp->vrf_id = ntohl(vrf_id);
+    memcpy(mp->dst_address, &dst_address, sizeof (dst_address));
+    mp->is_add = is_add;
+    mp->nlabels = vec_len (labels);
+    memcpy(mp->labels, labels, sizeof(u32)*mp->nlabels);
+
+    vec_free(labels);
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_mpls_gre_add_del_tunnel (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_mpls_gre_add_del_tunnel_t *mp;
+    f64 timeout;
+    u32 inner_vrf_id = 0;
+    u32 outer_vrf_id = 0;
+    ip4_address_t src_address;
+    ip4_address_t dst_address;
+    ip4_address_t intfc_address;
+    u32 tmp;
+    u8 intfc_address_length = 0;
+    u8 is_add = 1;
+    u8 l2_only = 0;
+    
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "inner_vrf_id %d", &inner_vrf_id))
+	    ;
+	else if (unformat (i, "outer_vrf_id %d", &outer_vrf_id))
+	    ;
+	else if (unformat (i, "src %U", unformat_ip4_address, &src_address))
+            ;
+	else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address))
+            ;
+        else if (unformat (i, "adj %U/%d", unformat_ip4_address,
+                           &intfc_address, &tmp))
+            intfc_address_length = tmp;
+        else if (unformat (i, "l2-only"))
+            l2_only = 1;
+	else if (unformat (i, "del"))
+	    is_add = 0;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+    
+    M(MPLS_GRE_ADD_DEL_TUNNEL, mpls_gre_add_del_tunnel);
+
+    mp->inner_vrf_id = ntohl(inner_vrf_id);
+    mp->outer_vrf_id = ntohl(outer_vrf_id);
+    memcpy(mp->src_address, &src_address, sizeof (src_address));
+    memcpy(mp->dst_address, &dst_address, sizeof (dst_address));
+    memcpy(mp->intfc_address, &intfc_address, sizeof (intfc_address));
+    mp->intfc_address_length = intfc_address_length;
+    mp->l2_only = l2_only;
+    mp->is_add = is_add;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_mpls_ethernet_add_del_tunnel (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_mpls_ethernet_add_del_tunnel_t *mp;
+    f64 timeout;
+    u32 inner_vrf_id = 0;
+    ip4_address_t intfc_address;
+    u8 dst_mac_address[6];
+    int dst_set = 1;
+    u32 tmp;
+    u8 intfc_address_length = 0;
+    u8 is_add = 1;
+    u8 l2_only = 0;
+    u32 tx_sw_if_index;
+    int tx_sw_if_index_set = 0;
+    
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "vrf %d", &inner_vrf_id))
+	    ;
+        else if (unformat (i, "adj %U/%d", unformat_ip4_address,
+                           &intfc_address, &tmp))
+            intfc_address_length = tmp;
+        else if (unformat (i, "%U", 
+                           unformat_sw_if_index, vam, &tx_sw_if_index))
+            tx_sw_if_index_set = 1;
+        else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
+            tx_sw_if_index_set = 1;
+        else if (unformat (i, "dst %U", unformat_ethernet_address, 
+                           dst_mac_address))
+            dst_set = 1;
+	else if (unformat (i, "l2-only"))
+	    l2_only = 1;
+	else if (unformat (i, "del"))
+	    is_add = 0;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+
+    if (!dst_set) {
+        errmsg ("dst (mac address) not set\n");
+        return -99;
+    }
+    if (!tx_sw_if_index_set) {
+        errmsg ("tx-intfc not set\n");
+        return -99;
+    }
+    
+    M(MPLS_ETHERNET_ADD_DEL_TUNNEL, mpls_ethernet_add_del_tunnel);
+
+    mp->vrf_id = ntohl(inner_vrf_id);
+    memcpy (mp->adj_address, &intfc_address, sizeof (intfc_address));
+    mp->adj_address_length = intfc_address_length;
+    memcpy (mp->dst_mac_address, dst_mac_address, sizeof (dst_mac_address));
+    mp->tx_sw_if_index = ntohl(tx_sw_if_index);
+    mp->l2_only = l2_only;
+    mp->is_add = is_add;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_mpls_ethernet_add_del_tunnel_2 (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_mpls_ethernet_add_del_tunnel_2_t *mp;
+    f64 timeout;
+    u32 inner_vrf_id = 0;
+    u32 outer_vrf_id = 0;
+    ip4_address_t adj_address;
+    int adj_address_set = 0;
+    ip4_address_t next_hop_address;
+    int next_hop_address_set = 0;
+    u32 tmp;
+    u8 adj_address_length = 0;
+    u8 l2_only = 0;
+    u8 is_add = 1;
+    u32 resolve_attempts = 5;
+    u8 resolve_if_needed = 1;
+    
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "inner_vrf_id %d", &inner_vrf_id))
+	    ;
+	else if (unformat (i, "outer_vrf_id %d", &outer_vrf_id))
+	    ;
+        else if (unformat (i, "adj %U/%d", unformat_ip4_address,
+                           &adj_address, &tmp)) {
+            adj_address_length = tmp;
+            adj_address_set = 1;
+        }
+        else if (unformat (i, "next-hop %U", unformat_ip4_address,
+                           &next_hop_address))
+            next_hop_address_set = 1;
+        else if (unformat (i, "resolve-attempts %d", &resolve_attempts))
+            ;
+        else if (unformat (i, "resolve-if-needed %d", &tmp))
+            resolve_if_needed = tmp;
+	else if (unformat (i, "l2-only"))
+	    l2_only = 1;
+	else if (unformat (i, "del"))
+	    is_add = 0;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+    
+    if (!adj_address_set) {
+        errmsg ("adjacency address/mask not set\n");
+        return -99;
+    }
+    if (!next_hop_address_set) {
+        errmsg ("ip4 next hop address (in outer fib) not set\n");
+        return -99;
+    }
+    
+    M(MPLS_ETHERNET_ADD_DEL_TUNNEL_2, mpls_ethernet_add_del_tunnel_2);
+    
+    mp->inner_vrf_id = ntohl(inner_vrf_id);
+    mp->outer_vrf_id = ntohl(outer_vrf_id);
+    mp->resolve_attempts = ntohl(resolve_attempts);
+    mp->resolve_if_needed = resolve_if_needed;
+    mp->is_add = is_add;
+    mp->l2_only = l2_only;
+    memcpy (mp->adj_address, &adj_address, sizeof (adj_address));
+    mp->adj_address_length = adj_address_length;
+    memcpy (mp->next_hop_ip4_address_in_outer_vrf, &next_hop_address, 
+            sizeof (next_hop_address));
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_sw_interface_set_unnumbered (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_sw_interface_set_unnumbered_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u32 unnum_sw_index;
+    u8  is_add = 1;
+    u8 sw_if_index_set = 0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+	else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	    sw_if_index_set = 1;
+	else if (unformat (i, "unnum_if_index %d", &unnum_sw_index))
+	    ;
+	else if (unformat (i, "del"))
+	    is_add = 0;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+    
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+    M(SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered);
+
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->unnumbered_sw_if_index = ntohl(unnum_sw_index);
+    mp->is_add = is_add;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_ip_neighbor_add_del (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_ip_neighbor_add_del_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u8 sw_if_index_set = 0;
+    u32 vrf_id = 0;
+    u8 is_add = 1;
+    u8 is_static = 0;
+    u8 mac_address[6];
+    u8 mac_set = 0;
+    u8 v4_address_set = 0;
+    u8 v6_address_set = 0;
+    ip4_address_t v4address;
+    ip6_address_t v6address;
+    
+    memset (mac_address, 0, sizeof (mac_address));
+    
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "mac %U", unformat_ethernet_address, mac_address)) {
+            mac_set = 1;
+        }
+        else if (unformat (i, "del"))
+            is_add = 0;
+	else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "is_static"))
+            is_static = 1;
+        else if (unformat (i, "vrf %d", &vrf_id))
+            ;
+        else if (unformat (i, "dst %U", 
+                           unformat_ip4_address, &v4address))
+                v4_address_set = 1;
+        else if (unformat (i, "dst %U", 
+                           unformat_ip6_address, &v6address))
+                v6_address_set = 1;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+    if (v4_address_set && v6_address_set) {
+        errmsg ("both v4 and v6 addresses set\n");
+        return -99;
+    }
+    if (!v4_address_set && !v6_address_set) {
+        errmsg ("no addresses set\n");
+        return -99;
+    }
+
+    /* Construct the API message */
+    M(IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del);
+
+    mp->sw_if_index = ntohl (sw_if_index);
+    mp->is_add = is_add;
+    mp->vrf_id = ntohl (vrf_id);
+    mp->is_static = is_static;
+    if (mac_set)
+        memcpy (mp->mac_address, mac_address, 6);
+    if (v6_address_set) {
+        mp->is_ipv6 = 1;
+        memcpy (mp->dst_address, &v6address, sizeof (v6address));
+    } else {
+        /* mp->is_ipv6 = 0; via memset in M macro above */
+        memcpy (mp->dst_address, &v4address, sizeof (v4address));
+    }
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply, return good/bad news  */
+    W;
+
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_reset_vrf (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_reset_vrf_t *mp;
+    f64 timeout;
+    u32 vrf_id = 0;
+    u8 is_ipv6 = 0;
+    u8 vrf_id_set = 0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "vrf %d", &vrf_id))
+	    vrf_id_set = 1;
+	else if (unformat (i, "ipv6"))
+	    is_ipv6 = 1;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+
+    if (vrf_id_set == 0) {
+        errmsg ("missing vrf id\n");
+        return -99;
+    }
+    
+    M(RESET_VRF, reset_vrf);
+
+    mp->vrf_id = ntohl(vrf_id);
+    mp->is_ipv6 = is_ipv6;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_create_vlan_subif (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_create_vlan_subif_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u8  sw_if_index_set = 0;
+    u32 vlan_id;
+    u8  vlan_id_set = 0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "sw_if_index %d", &sw_if_index))
+	    sw_if_index_set = 1;
+        else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+	else if (unformat (i, "vlan %d", &vlan_id))
+	    vlan_id_set = 1;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+    
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+    if (vlan_id_set == 0) {
+        errmsg ("missing vlan_id\n");
+        return -99;
+    }
+    M(CREATE_VLAN_SUBIF, create_vlan_subif);
+
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->vlan_id = ntohl(vlan_id);
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+#define foreach_create_subif_bit                \
+_(no_tags)                                      \
+_(one_tag)                                      \
+_(two_tags)                                     \
+_(dot1ad)                                       \
+_(exact_match)                                  \
+_(default_sub)                                  \
+_(outer_vlan_id_any)                            \
+_(inner_vlan_id_any)
+
+static int api_create_subif (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_create_subif_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u8  sw_if_index_set = 0;
+    u32 sub_id;
+    u8  sub_id_set = 0;
+    u32 no_tags = 0;
+    u32 one_tag = 0;
+    u32 two_tags = 0;
+    u32 dot1ad = 0;
+    u32 exact_match = 0;
+    u32 default_sub = 0;
+    u32 outer_vlan_id_any = 0;
+    u32 inner_vlan_id_any = 0;
+    u32 tmp;
+    u16 outer_vlan_id = 0;
+    u16 inner_vlan_id = 0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "sw_if_index %d", &sw_if_index))
+	    sw_if_index_set = 1;
+        else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+	else if (unformat (i, "sub_id %d", &sub_id))
+	    sub_id_set = 1;
+        else if (unformat (i, "outer_vlan_id %d", &tmp))
+            outer_vlan_id = tmp;
+        else if (unformat (i, "inner_vlan_id %d", &tmp))
+            inner_vlan_id = tmp;
+
+#define _(a) else if (unformat (i, #a)) a = 1 ;
+        foreach_create_subif_bit
+#undef _
+
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+    
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+    if (sub_id_set == 0) {
+        errmsg ("missing sub_id\n");
+        return -99;
+    }
+    M(CREATE_SUBIF, create_subif);
+
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->sub_id = ntohl(sub_id);
+    
+#define _(a) mp->a = a;
+    foreach_create_subif_bit;
+#undef _
+        
+    mp->outer_vlan_id = ntohs (outer_vlan_id);
+    mp->inner_vlan_id = ntohs (inner_vlan_id);
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_oam_add_del (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_oam_add_del_t *mp;
+    f64 timeout;
+    u32 vrf_id = 0;
+    u8 is_add = 1;
+    ip4_address_t src, dst;
+    u8 src_set = 0;
+    u8 dst_set = 0;
+    
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "vrf %d", &vrf_id))
+	    ;
+	else if (unformat (i, "src %U", unformat_ip4_address, &src))
+	    src_set = 1;
+	else if (unformat (i, "dst %U", unformat_ip4_address, &dst))
+	    dst_set = 1;
+	else if (unformat (i, "del"))
+	    is_add = 0;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+    
+    if (src_set == 0) {
+        errmsg ("missing src addr\n");
+        return -99;
+    }
+
+    if (dst_set == 0) {
+        errmsg ("missing dst addr\n");
+        return -99;
+    }
+
+    M(OAM_ADD_DEL, oam_add_del);
+
+    mp->vrf_id = ntohl(vrf_id);
+    mp->is_add = is_add;
+    memcpy(mp->src_address, &src, sizeof (mp->src_address));
+    memcpy(mp->dst_address, &dst, sizeof (mp->dst_address));
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_reset_fib (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_reset_fib_t *mp;
+    f64 timeout;
+    u32 vrf_id = 0;
+    u8 is_ipv6 = 0;
+    u8 vrf_id_set = 0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "vrf %d", &vrf_id))
+	    vrf_id_set = 1;
+	else if (unformat (i, "ipv6"))
+	    is_ipv6 = 1;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+
+    if (vrf_id_set == 0) {
+        errmsg ("missing vrf id\n");
+        return -99;
+    }
+    
+    M(RESET_FIB, reset_fib);
+
+    mp->vrf_id = ntohl(vrf_id);
+    mp->is_ipv6 = is_ipv6;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_dhcp_proxy_config (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_dhcp_proxy_config_t *mp;
+    f64 timeout;
+    u32 vrf_id = 0;
+    u8 is_add = 1;
+    u8 insert_cid = 1;
+    u8 v4_address_set = 0;
+    u8 v6_address_set = 0;
+    ip4_address_t v4address;
+    ip6_address_t v6address;
+    u8 v4_src_address_set = 0;
+    u8 v6_src_address_set = 0;
+    ip4_address_t v4srcaddress;
+    ip6_address_t v6srcaddress;
+    
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "del"))
+            is_add = 0;
+        else if (unformat (i, "vrf %d", &vrf_id))
+            ;
+        else if (unformat (i, "insert-cid %d", &insert_cid))
+            ;
+        else if (unformat (i, "svr %U", 
+                           unformat_ip4_address, &v4address))
+                v4_address_set = 1;
+        else if (unformat (i, "svr %U", 
+                           unformat_ip6_address, &v6address))
+                v6_address_set = 1;
+        else if (unformat (i, "src %U", 
+                           unformat_ip4_address, &v4srcaddress))
+                v4_src_address_set = 1;
+        else if (unformat (i, "src %U", 
+                           unformat_ip6_address, &v6srcaddress))
+                v6_src_address_set = 1;
+        else
+            break;
+    }
+
+    if (v4_address_set && v6_address_set) {
+        errmsg ("both v4 and v6 server addresses set\n");
+        return -99;
+    }
+    if (!v4_address_set && !v6_address_set) {
+        errmsg ("no server addresses set\n");
+        return -99;
+    }
+
+    if (v4_src_address_set && v6_src_address_set) {
+        errmsg ("both v4 and v6  src addresses set\n");
+        return -99;
+    }
+    if (!v4_src_address_set && !v6_src_address_set) {
+        errmsg ("no src addresses set\n");
+        return -99;
+    }
+
+    if (!(v4_src_address_set && v4_address_set) &&
+        !(v6_src_address_set && v6_address_set)) {
+        errmsg ("no matching server and src addresses set\n");
+        return -99;
+    }
+
+    /* Construct the API message */
+    M(DHCP_PROXY_CONFIG, dhcp_proxy_config);
+
+    mp->insert_circuit_id = insert_cid;
+    mp->is_add = is_add;
+    mp->vrf_id = ntohl (vrf_id);
+    if (v6_address_set) {
+        mp->is_ipv6 = 1;
+        memcpy (mp->dhcp_server, &v6address, sizeof (v6address));
+        memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address));
+    } else {
+        memcpy (mp->dhcp_server, &v4address, sizeof (v4address));
+        memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address));
+    }
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply, return good/bad news  */
+    W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_dhcp_proxy_config_2 (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_dhcp_proxy_config_2_t *mp;
+    f64 timeout;
+    u32 rx_vrf_id = 0;
+    u32 server_vrf_id = 0;
+    u8 is_add = 1;
+    u8 insert_cid = 1;
+    u8 v4_address_set = 0;
+    u8 v6_address_set = 0;
+    ip4_address_t v4address;
+    ip6_address_t v6address;
+    u8 v4_src_address_set = 0;
+    u8 v6_src_address_set = 0;
+    ip4_address_t v4srcaddress;
+    ip6_address_t v6srcaddress;
+    
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "del"))
+            is_add = 0;
+        else if (unformat (i, "rx_vrf_id %d", &rx_vrf_id))
+            ;
+        else if (unformat (i, "server_vrf_id %d", &server_vrf_id))
+            ;
+        else if (unformat (i, "insert-cid %d", &insert_cid))
+            ;
+        else if (unformat (i, "svr %U", 
+                           unformat_ip4_address, &v4address))
+                v4_address_set = 1;
+        else if (unformat (i, "svr %U", 
+                           unformat_ip6_address, &v6address))
+                v6_address_set = 1;
+        else if (unformat (i, "src %U", 
+                           unformat_ip4_address, &v4srcaddress))
+                v4_src_address_set = 1;
+        else if (unformat (i, "src %U", 
+                           unformat_ip6_address, &v6srcaddress))
+                v6_src_address_set = 1;
+        else
+            break;
+    }
+
+    if (v4_address_set && v6_address_set) {
+        errmsg ("both v4 and v6 server addresses set\n");
+        return -99;
+    }
+    if (!v4_address_set && !v6_address_set) {
+        errmsg ("no server addresses set\n");
+        return -99;
+    }
+
+    if (v4_src_address_set && v6_src_address_set) {
+        errmsg ("both v4 and v6  src addresses set\n");
+        return -99;
+    }
+    if (!v4_src_address_set && !v6_src_address_set) {
+        errmsg ("no src addresses set\n");
+        return -99;
+    }
+
+    if (!(v4_src_address_set && v4_address_set) &&
+        !(v6_src_address_set && v6_address_set)) {
+        errmsg ("no matching server and src addresses set\n");
+        return -99;
+    }
+
+    /* Construct the API message */
+    M(DHCP_PROXY_CONFIG_2, dhcp_proxy_config_2);
+
+    mp->insert_circuit_id = insert_cid;
+    mp->is_add = is_add;
+    mp->rx_vrf_id = ntohl (rx_vrf_id);
+    mp->server_vrf_id = ntohl (server_vrf_id);
+    if (v6_address_set) {
+        mp->is_ipv6 = 1;
+        memcpy (mp->dhcp_server, &v6address, sizeof (v6address));
+        memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address));
+    } else {
+        memcpy (mp->dhcp_server, &v4address, sizeof (v4address));
+        memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address));
+    }
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply, return good/bad news  */
+    W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_dhcp_proxy_set_vss (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_dhcp_proxy_set_vss_t *mp;
+    f64 timeout;
+    u8  is_ipv6 = 0;
+    u8  is_add = 1;
+    u32 tbl_id;
+    u8  tbl_id_set = 0;
+    u32 oui;
+    u8  oui_set = 0;
+    u32 fib_id;
+    u8  fib_id_set = 0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "tbl_id %d", &tbl_id))
+	    tbl_id_set = 1;
+	if (unformat (i, "fib_id %d", &fib_id))
+	    fib_id_set = 1;
+	if (unformat (i, "oui %d", &oui))
+	    oui_set = 1;
+	else if (unformat (i, "ipv6"))
+	    is_ipv6 = 1;
+	else if (unformat (i, "del"))
+	    is_add = 0;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+
+    if (tbl_id_set == 0) {
+        errmsg ("missing tbl id\n");
+        return -99;
+    }
+
+    if (fib_id_set == 0) {
+        errmsg ("missing fib id\n");
+        return -99;
+    }
+    if (oui_set == 0) {
+        errmsg ("missing oui\n");
+        return -99;
+    }
+    
+    M(DHCP_PROXY_SET_VSS, dhcp_proxy_set_vss);
+    mp->tbl_id = ntohl(tbl_id);
+    mp->fib_id = ntohl(fib_id);
+    mp->oui = ntohl(oui);
+    mp->is_ipv6 = is_ipv6;
+    mp->is_add = is_add;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_dhcp_client_config (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_dhcp_client_config_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u8 sw_if_index_set = 0;
+    u8 is_add = 1;
+    u8 * hostname = 0;
+    u8 disable_event = 0;
+
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "del"))
+            is_add = 0;
+        else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "hostname %s", &hostname))
+            ;
+        else if (unformat (i, "disable_event"))
+            disable_event = 1;
+        else
+            break;
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+    if (vec_len (hostname) > 63) {
+        errmsg ("hostname too long\n");
+    }
+    vec_add1 (hostname, 0);
+
+    /* Construct the API message */
+    M(DHCP_CLIENT_CONFIG, dhcp_client_config);
+
+    mp->sw_if_index = ntohl (sw_if_index);
+    memcpy (mp->hostname, hostname, vec_len (hostname));
+    vec_free (hostname);
+    mp->is_add = is_add;
+    mp->want_dhcp_event = disable_event ? 0 : 1;
+    mp->pid = getpid();
+   
+    /* send it... */
+    S;
+
+    /* Wait for a reply, return good/bad news  */
+    W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_set_ip_flow_hash (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_set_ip_flow_hash_t *mp;
+    f64 timeout;
+    u32 vrf_id = 0;
+    u8 is_ipv6 = 0;
+    u8 vrf_id_set = 0;
+    u8 src = 0;
+    u8 dst = 0;
+    u8 sport = 0;
+    u8 dport = 0;
+    u8 proto = 0;
+    u8 reverse = 0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "vrf %d", &vrf_id))
+	    vrf_id_set = 1;
+	else if (unformat (i, "ipv6"))
+	    is_ipv6 = 1;
+	else if (unformat (i, "src"))
+	    src = 1;
+	else if (unformat (i, "dst"))
+	    dst = 1;
+	else if (unformat (i, "sport"))
+	    sport = 1;
+	else if (unformat (i, "dport"))
+	    dport = 1;
+	else if (unformat (i, "proto"))
+	    proto = 1;
+	else if (unformat (i, "reverse"))
+	    reverse = 1;
+
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+
+    if (vrf_id_set == 0) {
+        errmsg ("missing vrf id\n");
+        return -99;
+    }
+    
+    M(SET_IP_FLOW_HASH, set_ip_flow_hash);
+    mp->src = src;
+    mp->dst = dst;
+    mp->sport = sport;
+    mp->dport = dport;
+    mp->proto = proto;
+    mp->reverse = reverse;
+    mp->vrf_id = ntohl(vrf_id);
+    mp->is_ipv6 = is_ipv6;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_sw_interface_ip6_enable_disable (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_sw_interface_ip6_enable_disable_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u8  sw_if_index_set = 0;
+    u8  enable = 0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+	else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	    sw_if_index_set = 1;
+	else if (unformat (i, "enable"))
+	    enable = 1;
+	else if (unformat (i, "disable"))
+	    enable = 0;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+    
+    M(SW_INTERFACE_IP6_ENABLE_DISABLE, sw_interface_ip6_enable_disable);
+
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->enable = enable;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_sw_interface_ip6_set_link_local_address (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_sw_interface_ip6_set_link_local_address_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u8 sw_if_index_set = 0;
+    u32 address_length = 0;
+    u8 v6_address_set = 0;
+    ip6_address_t v6address;
+    
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "%U/%d", 
+                           unformat_ip6_address, &v6address, 
+                           &address_length))
+            v6_address_set = 1;
+        else
+            break;
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+    if (!v6_address_set) {
+        errmsg ("no address set\n");
+        return -99;
+    }
+
+    /* Construct the API message */
+    M(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS, \
+      sw_interface_ip6_set_link_local_address);
+
+    mp->sw_if_index = ntohl (sw_if_index);
+    memcpy (mp->address, &v6address, sizeof (v6address));
+    mp->address_length = address_length;
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply, return good/bad news  */
+    W;
+
+    /* NOTREACHED */
+    return 0;
+}
+
+
+static int api_sw_interface_ip6nd_ra_prefix (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_sw_interface_ip6nd_ra_prefix_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u8 sw_if_index_set = 0;
+    u32 address_length = 0;
+    u8 v6_address_set = 0;
+    ip6_address_t v6address;
+    u8 use_default = 0;
+    u8 no_advertise = 0;
+    u8 off_link = 0;
+    u8 no_autoconfig = 0;
+    u8 no_onlink = 0;
+    u8 is_no = 0;
+    u32 val_lifetime = 0;
+    u32 pref_lifetime = 0;
+    
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "%U/%d", 
+                           unformat_ip6_address, &v6address, 
+                           &address_length))
+            v6_address_set = 1;
+        else if (unformat (i, "val_life %d", &val_lifetime))
+            ;
+        else if (unformat (i, "pref_life %d", &pref_lifetime))
+            ;
+	else if (unformat (i, "def"))
+	    use_default = 1;
+	else if (unformat (i, "noadv"))
+	    no_advertise = 1;
+	else if (unformat (i, "offl"))
+	    off_link = 1;
+	else if (unformat (i, "noauto"))
+	    no_autoconfig = 1;
+	else if (unformat (i, "nolink"))
+	    no_onlink = 1;
+	else if (unformat (i, "isno"))
+	    is_no = 1;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }        
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+    if (!v6_address_set) {
+        errmsg ("no address set\n");
+        return -99;
+    }
+
+    /* Construct the API message */
+    M(SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix);
+
+    mp->sw_if_index = ntohl (sw_if_index);
+    memcpy (mp->address, &v6address, sizeof (v6address));
+    mp->address_length = address_length;
+    mp->use_default = use_default;
+    mp->no_advertise = no_advertise;
+    mp->off_link = off_link;
+    mp->no_autoconfig = no_autoconfig;
+    mp->no_onlink = no_onlink;
+    mp->is_no = is_no;
+    mp->val_lifetime = ntohl(val_lifetime);
+    mp->pref_lifetime = ntohl(pref_lifetime);
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply, return good/bad news  */
+    W;
+
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_sw_interface_ip6nd_ra_config (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_sw_interface_ip6nd_ra_config_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u8 sw_if_index_set = 0;
+    u8 surpress = 0;
+    u8 managed = 0;
+    u8 other = 0;
+    u8 ll_option = 0;
+    u8 send_unicast = 0;
+    u8 cease = 0;
+    u8 is_no = 0;
+    u8 default_router = 0;
+    u32 max_interval = 0;
+    u32 min_interval = 0;
+    u32 lifetime = 0;
+    u32 initial_count = 0;
+    u32 initial_interval = 0;
+
+    
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "maxint %d", &max_interval))
+            ;
+        else if (unformat (i, "minint %d", &min_interval))
+            ;
+        else if (unformat (i, "life %d", &lifetime))
+            ;
+        else if (unformat (i, "count %d", &initial_count))
+            ;
+        else if (unformat (i, "interval %d", &initial_interval))
+            ;
+	else if (unformat (i, "surpress"))
+	    surpress = 1;
+	else if (unformat (i, "managed"))
+	    managed = 1;
+	else if (unformat (i, "other"))
+	    other = 1;
+	else if (unformat (i, "ll"))
+	    ll_option = 1;
+	else if (unformat (i, "send"))
+	    send_unicast = 1;
+	else if (unformat (i, "cease"))
+	    cease = 1;
+	else if (unformat (i, "isno"))
+	    is_no = 1;
+	else if (unformat (i, "def"))
+	    default_router = 1;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }        
+    }
+
+    if (sw_if_index_set == 0) {
+	errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+    /* Construct the API message */
+    M(SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config);
+
+    mp->sw_if_index = ntohl (sw_if_index);
+    mp->max_interval = ntohl(max_interval);
+    mp->min_interval = ntohl(min_interval);
+    mp->lifetime = ntohl(lifetime);
+    mp->initial_count = ntohl(initial_count);
+    mp->initial_interval = ntohl(initial_interval);
+    mp->surpress = surpress;
+    mp->managed = managed;
+    mp->other = other;
+    mp->ll_option = ll_option;
+    mp->send_unicast = send_unicast;
+    mp->cease = cease;
+    mp->is_no = is_no;
+    mp->default_router = default_router;
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply, return good/bad news  */
+    W;
+
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_set_arp_neighbor_limit (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_set_arp_neighbor_limit_t *mp;
+    f64 timeout;
+    u32 arp_nbr_limit;
+    u8 limit_set = 0;
+    u8 is_ipv6 = 0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "arp_nbr_limit %d", &arp_nbr_limit))
+	    limit_set = 1;
+	else if (unformat (i, "ipv6"))
+	    is_ipv6 = 1;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+
+    if (limit_set == 0) {
+        errmsg ("missing limit value\n");
+        return -99;
+    }
+    
+    M(SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit);
+
+    mp->arp_neighbor_limit = ntohl(arp_nbr_limit);
+    mp->is_ipv6 = is_ipv6;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_l2_patch_add_del (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_l2_patch_add_del_t *mp;
+    f64 timeout;
+    u32 rx_sw_if_index;
+    u8 rx_sw_if_index_set = 0;
+    u32 tx_sw_if_index;
+    u8 tx_sw_if_index_set = 0;
+    u8 is_add = 1;
+    
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index))
+            rx_sw_if_index_set = 1;	
+	else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
+            tx_sw_if_index_set = 1;
+	else if (unformat (i, "rx")) {
+	    if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+		if (unformat (i, "%U", unformat_sw_if_index, vam,
+			      &rx_sw_if_index))
+		    rx_sw_if_index_set = 1;
+	    } else
+		break;
+	} else if (unformat (i, "tx")) {
+	    if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+		if (unformat (i, "%U", unformat_sw_if_index, vam,
+			      &tx_sw_if_index))
+		    tx_sw_if_index_set = 1;
+	    } else
+		break;
+	} else if (unformat (i, "del"))
+	    is_add = 0;
+	else
+            break;
+    }
+
+    if (rx_sw_if_index_set == 0) {
+        errmsg ("missing rx interface name or rx_sw_if_index\n");
+        return -99;
+    }
+
+    if (tx_sw_if_index_set == 0) {
+        errmsg ("missing tx interface name or tx_sw_if_index\n");
+        return -99;
+    }
+    
+    M(L2_PATCH_ADD_DEL, l2_patch_add_del);
+
+    mp->rx_sw_if_index = ntohl(rx_sw_if_index);
+    mp->tx_sw_if_index = ntohl(tx_sw_if_index);
+    mp->is_add = is_add;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_sr_tunnel_add_del (vat_main_t * vam)
+{
+  unformat_input_t * i = vam->input;
+  vl_api_sr_tunnel_add_del_t *mp;
+  f64 timeout;
+  int is_del = 0;
+  int pl_index;
+  ip6_address_t src_address;
+  int src_address_set = 0;
+  ip6_address_t dst_address;
+  u32 dst_mask_width;
+  int dst_address_set = 0;
+  u16 flags = 0;
+  u32 rx_table_id = 0;
+  u32 tx_table_id = 0;
+  ip6_address_t * segments = 0;
+  ip6_address_t * this_seg;
+  ip6_address_t * tags = 0;
+  ip6_address_t * this_tag;
+  ip6_address_t next_address, tag;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "del"))
+        is_del = 1;
+      else if (unformat (i, "rx_fib_id %d", &rx_table_id))
+        ;
+      else if (unformat (i, "tx_fib_id %d", &tx_table_id))
+        ;
+      else if (unformat (i, "src %U", unformat_ip6_address, &src_address))
+        src_address_set = 1;
+      else if (unformat (i, "dst %U/%d", 
+                         unformat_ip6_address, &dst_address,
+                         &dst_mask_width))
+        dst_address_set = 1;
+      else if (unformat (i, "next %U", unformat_ip6_address,
+                         &next_address))
+        {
+          vec_add2 (segments, this_seg, 1);
+          memcpy (this_seg->as_u8, next_address.as_u8, sizeof (*this_seg));
+        }
+      else if (unformat (i, "tag %U", unformat_ip6_address,
+                         &tag))
+        {
+          vec_add2 (tags, this_tag, 1);
+          memcpy (this_tag->as_u8, tag.as_u8, sizeof (*this_tag));
+        }
+      else if (unformat (i, "clean"))
+        flags |= IP6_SR_HEADER_FLAG_CLEANUP;
+      else if (unformat (i, "protected"))
+        flags |= IP6_SR_HEADER_FLAG_PROTECTED;
+      else if (unformat (i, "InPE %d", &pl_index))
+        {
+          if (pl_index <= 0 || pl_index > 4)
+            {
+            pl_index_range_error:
+              errmsg ("pl index %d out of range\n", pl_index);
+              return -99;
+            }
+          flags |= IP6_SR_HEADER_FLAG_PL_ELT_INGRESS_PE << (3*(pl_index - 1));
+        }
+      else if (unformat (i, "EgPE %d", &pl_index))
+        {
+          if (pl_index <= 0 || pl_index > 4)
+            goto pl_index_range_error;
+          flags |= IP6_SR_HEADER_FLAG_PL_ELT_EGRESS_PE << (3*(pl_index - 1));
+        }
+      else if (unformat (i, "OrgSrc %d", &pl_index))
+        {
+          if (pl_index <= 0 || pl_index > 4)
+            goto pl_index_range_error;
+          flags |= IP6_SR_HEADER_FLAG_PL_ELT_ORIG_SRC_ADDR << (3*(pl_index - 1));
+        }
+      else 
+        break;
+    }
+
+  if (!src_address_set)
+    {
+      errmsg ("src address required\n");
+      return -99;
+    }
+
+  if (!dst_address_set)
+    {
+      errmsg ("dst address required\n");
+      return -99;
+    }
+
+  if (!segments)
+    {
+      errmsg ("at least one sr segment required\n");
+      return -99;
+    }
+
+  M2(SR_TUNNEL_ADD_DEL, sr_tunnel_add_del, 
+     vec_len(segments) * sizeof (ip6_address_t) 
+     + vec_len(tags) * sizeof (ip6_address_t));
+
+  memcpy (mp->src_address, &src_address, sizeof (mp->src_address));
+  memcpy (mp->dst_address, &dst_address, sizeof (mp->dst_address));
+  mp->dst_mask_width = dst_mask_width;
+  mp->flags_net_byte_order = clib_host_to_net_u16 (flags);
+  mp->n_segments = vec_len (segments);
+  mp->n_tags = vec_len (tags);
+  mp->is_add = is_del == 0;
+  memcpy (mp->segs_and_tags, segments, 
+          vec_len(segments)* sizeof (ip6_address_t));
+  memcpy (mp->segs_and_tags + vec_len(segments)*sizeof (ip6_address_t),
+          tags, vec_len(tags)* sizeof (ip6_address_t));
+
+  mp->outer_vrf_id = ntohl (rx_table_id);
+  mp->inner_vrf_id = ntohl (tx_table_id);
+
+  vec_free (segments);
+  vec_free (tags);
+  
+  S; W;
+  /* NOTREACHED */
+}
+
+
+#define foreach_ip4_proto_field                 \
+_(src_address)                                  \
+_(dst_address)                                  \
+_(tos)                                          \
+_(length)					\
+_(fragment_id)                                  \
+_(ttl)                                          \
+_(protocol)                                     \
+_(checksum)
+
+uword unformat_ip4_mask (unformat_input_t * input, va_list * args)
+{
+  u8 ** maskp = va_arg (*args, u8 **);
+  u8 * mask = 0;
+  u8 found_something = 0;
+  ip4_header_t * ip;
+  
+#define _(a) u8 a=0;
+  foreach_ip4_proto_field;
+#undef _
+  u8 version = 0;
+  u8 hdr_length = 0;
+  
+  
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) 
+    {
+      if (unformat (input, "version")) 
+        version = 1;
+      else if (unformat (input, "hdr_length"))
+        hdr_length = 1;
+      else if (unformat (input, "src"))
+        src_address = 1;
+      else if (unformat (input, "dst"))
+        dst_address = 1;
+      else if (unformat (input, "proto"))
+        protocol = 1;
+      
+#define _(a) else if (unformat (input, #a)) a=1;
+      foreach_ip4_proto_field
+#undef _
+      else
+        break;
+    }
+  
+#define _(a) found_something += a;
+  foreach_ip4_proto_field;
+#undef _
+  
+  if (found_something == 0)
+    return 0;
+  
+  vec_validate (mask, sizeof (*ip) - 1);
+  
+  ip = (ip4_header_t *) mask;
+  
+#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
+  foreach_ip4_proto_field;
+#undef _
+  
+  ip->ip_version_and_header_length = 0;
+  
+  if (version)
+    ip->ip_version_and_header_length |= 0xF0;
+  
+  if (hdr_length)
+    ip->ip_version_and_header_length |= 0x0F;
+  
+  *maskp = mask;
+  return 1;
+}
+
+#define foreach_ip6_proto_field                 \
+_(src_address)                                  \
+_(dst_address)                                  \
+_(payload_length)				\
+_(hop_limit)                                    \
+_(protocol)
+
+uword unformat_ip6_mask (unformat_input_t * input, va_list * args)
+{
+  u8 ** maskp = va_arg (*args, u8 **);
+  u8 * mask = 0;
+  u8 found_something = 0;
+  ip6_header_t * ip;
+  u32 ip_version_traffic_class_and_flow_label;
+  
+#define _(a) u8 a=0;
+  foreach_ip6_proto_field;
+#undef _
+  u8 version = 0;
+  u8 traffic_class = 0;
+  u8 flow_label = 0;
+  
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) 
+    {
+      if (unformat (input, "version")) 
+        version = 1;
+      else if (unformat (input, "traffic-class"))
+        traffic_class = 1;
+      else if (unformat (input, "flow-label"))
+        flow_label = 1;
+      else if (unformat (input, "src"))
+        src_address = 1;
+      else if (unformat (input, "dst"))
+        dst_address = 1;
+      else if (unformat (input, "proto"))
+        protocol = 1;
+      
+#define _(a) else if (unformat (input, #a)) a=1;
+      foreach_ip6_proto_field
+#undef _
+      else
+        break;
+    }
+  
+#define _(a) found_something += a;
+  foreach_ip6_proto_field;
+#undef _
+  
+  if (found_something == 0)
+    return 0;
+  
+  vec_validate (mask, sizeof (*ip) - 1);
+  
+  ip = (ip6_header_t *) mask;
+  
+#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
+  foreach_ip6_proto_field;
+#undef _
+  
+  ip_version_traffic_class_and_flow_label = 0;
+  
+  if (version)
+    ip_version_traffic_class_and_flow_label |= 0xF0000000;
+
+  if (traffic_class)
+    ip_version_traffic_class_and_flow_label |= 0x0FF00000;
+
+  if (flow_label)
+    ip_version_traffic_class_and_flow_label |= 0x000FFFFF;
+
+  ip->ip_version_traffic_class_and_flow_label = 
+    clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label);
+  
+  *maskp = mask;
+  return 1;
+}
+
+uword unformat_l3_mask (unformat_input_t * input, va_list * args)
+{
+  u8 ** maskp = va_arg (*args, u8 **);
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "ip4 %U", unformat_ip4_mask, maskp))
+      return 1;
+    else if (unformat (input, "ip6 %U", unformat_ip6_mask, maskp))
+      return 1;
+    else
+      break;
+  }
+  return 0;
+}
+
+uword unformat_l2_mask (unformat_input_t * input, va_list * args)
+{
+  u8 ** maskp = va_arg (*args, u8 **);
+  u8 * mask = 0;
+  u8 src = 0;
+  u8 dst = 0;
+  u8 proto = 0;
+  u8 tag1 = 0;
+  u8 tag2 = 0;
+  u8 ignore_tag1 = 0;
+  u8 ignore_tag2 = 0;
+  u8 cos1 = 0;
+  u8 cos2 = 0;
+  u8 dot1q = 0;
+  u8 dot1ad = 0;
+  int len = 14;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "src"))
+      src = 1;
+    else if (unformat (input, "dst"))
+      dst = 1;
+    else if (unformat (input, "proto"))
+      proto = 1;
+    else if (unformat (input, "tag1"))
+      tag1 = 1;
+    else if (unformat (input, "tag2"))
+      tag2 = 1;
+    else if (unformat (input, "ignore-tag1"))
+      ignore_tag1 = 1;
+    else if (unformat (input, "ignore-tag2"))
+      ignore_tag2 = 1;
+    else if (unformat (input, "cos1"))
+      cos1 = 1;
+    else if (unformat (input, "cos2"))
+      cos2 = 1;
+    else if (unformat (input, "dot1q"))
+      dot1q = 1;
+    else if (unformat (input, "dot1ad"))
+      dot1ad = 1;
+    else
+      break;
+  }
+  if ((src + dst + proto + tag1 + tag2 + dot1q + dot1ad +
+      ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
+    return 0;
+
+  if (tag1 || ignore_tag1 || cos1 || dot1q)
+    len = 18;
+  if (tag2 || ignore_tag2 || cos2 || dot1ad)
+    len = 22;
+
+  vec_validate (mask, len-1);
+
+  if (dst)
+    memset (mask, 0xff, 6);
+
+  if (src)
+    memset (mask + 6, 0xff, 6);
+  
+  if (tag2 || dot1ad)
+    {
+      /* inner vlan tag */
+      if (tag2)
+        {
+          mask[19] = 0xff;
+          mask[18] = 0x0f;
+        }
+      if (cos2)
+        mask[18] |= 0xe0;
+      if (proto)
+          mask[21] = mask [20] = 0xff;
+      if (tag1)
+        {
+          mask [15] = 0xff;
+          mask [14] = 0x0f;
+        }
+      if (cos1)
+        mask[14] |= 0xe0;
+      *maskp = mask;
+      return 1;
+    }
+  if (tag1 | dot1q)
+    {
+      if (tag1)
+        {
+          mask [15] = 0xff;
+          mask [14] = 0x0f;
+        }
+      if (cos1)
+        mask[14] |= 0xe0;
+      if (proto)
+          mask[16] = mask [17] = 0xff;
+
+      *maskp = mask;
+      return 1;
+    }
+  if (cos2)
+    mask[18] |= 0xe0;
+  if (cos1)
+    mask[14] |= 0xe0;
+  if (proto)
+    mask[12] = mask [13] = 0xff;
+    
+  *maskp = mask;
+  return 1;
+}
+
+uword unformat_classify_mask (unformat_input_t * input, va_list * args)
+{
+  u8 ** maskp = va_arg (*args, u8 **);
+  u32 * skipp = va_arg (*args, u32 *);
+  u32 * matchp = va_arg (*args, u32 *);
+  u32 match;
+  u8 * mask = 0;
+  u8 * l2 = 0;
+  u8 * l3 = 0;
+  int i;
+  
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "hex %U", unformat_hex_string, &mask))
+      ;
+    else if (unformat (input, "l2 %U", unformat_l2_mask, &l2))
+      ;
+    else if (unformat (input, "l3 %U", unformat_l3_mask, &l3))
+      ;
+    else
+      break;
+  }
+
+  if (mask || l2 || l3)
+    {
+      if (l2 || l3)
+        {
+          /* "With a free Ethernet header in every package" */
+          if (l2 == 0)
+            vec_validate (l2, 13);
+          mask = l2;
+          vec_append (mask, l3);
+          vec_free (l3);
+        }
+
+      /* Scan forward looking for the first significant mask octet */
+      for (i = 0; i < vec_len (mask); i++)
+        if (mask[i])
+          break;
+
+      /* compute (skip, match) params */
+      *skipp = i / sizeof(u32x4);
+      vec_delete (mask, *skipp * sizeof(u32x4), 0);
+
+      /* Pad mask to an even multiple of the vector size */
+      while (vec_len (mask) % sizeof (u32x4))
+        vec_add1 (mask, 0);
+
+      match = vec_len (mask) / sizeof (u32x4);
+
+      for (i = match*sizeof(u32x4); i > 0; i-= sizeof(u32x4))
+        {
+          u64 *tmp = (u64 *)(mask + (i-sizeof(u32x4)));
+          if (*tmp || *(tmp+1))
+            break;
+          match--;
+        }
+      if (match == 0)
+        clib_warning ("BUG: match 0");
+
+      _vec_len (mask) = match * sizeof(u32x4);
+
+      *matchp = match;
+      *maskp = mask;
+
+      return 1;
+    }
+
+  return 0;
+}
+
+#define foreach_l2_next                         \
+_(drop, DROP)                                   \
+_(ethernet, ETHERNET_INPUT)                     \
+_(ip4, IP4_INPUT)                               \
+_(ip6, IP6_INPUT)
+
+uword unformat_l2_next_index (unformat_input_t * input, va_list * args)
+{
+  u32 * miss_next_indexp = va_arg (*args, u32 *);
+  u32 next_index = 0;
+  u32 tmp;
+  
+#define _(n,N) \
+  if (unformat (input, #n)) { next_index = L2_CLASSIFY_NEXT_##N; goto out;}
+  foreach_l2_next;
+#undef _
+  
+  if (unformat (input, "%d", &tmp))
+    { 
+      next_index = tmp; 
+      goto out; 
+    }
+  
+  return 0;
+
+ out:
+  *miss_next_indexp = next_index;
+  return 1;
+}
+
+#define foreach_ip_next                         \
+_(miss, MISS)                                   \
+_(drop, DROP)                                   \
+_(local, LOCAL)                                 \
+_(rewrite, REWRITE)
+
+uword unformat_ip_next_index (unformat_input_t * input, va_list * args)
+{
+  u32 * miss_next_indexp = va_arg (*args, u32 *);
+  u32 next_index = 0;
+  u32 tmp;
+  
+#define _(n,N) \
+  if (unformat (input, #n)) { next_index = IP_LOOKUP_NEXT_##N; goto out;}
+  foreach_ip_next;
+#undef _
+  
+  if (unformat (input, "%d", &tmp))
+    { 
+      next_index = tmp; 
+      goto out; 
+    }
+  
+  return 0;
+
+ out:
+  *miss_next_indexp = next_index;
+  return 1;
+}
+
+#define foreach_acl_next                        \
+_(deny, DENY)
+
+uword unformat_acl_next_index (unformat_input_t * input, va_list * args)
+{
+  u32 * miss_next_indexp = va_arg (*args, u32 *);
+  u32 next_index = 0;
+  u32 tmp;
+
+#define _(n,N) \
+  if (unformat (input, #n)) { next_index = ACL_NEXT_INDEX_##N; goto out;}
+  foreach_acl_next;
+#undef _
+
+  if (unformat (input, "permit"))
+    {
+      next_index = ~0;
+      goto out;
+    }
+  else if (unformat (input, "%d", &tmp))
+    {
+      next_index = tmp;
+      goto out;
+    }
+
+  return 0;
+
+ out:
+  *miss_next_indexp = next_index;
+  return 1;
+}
+
+static int api_classify_add_del_table (vat_main_t * vam)
+{
+  unformat_input_t * i = vam->input;
+  vl_api_classify_add_del_table_t *mp;
+
+  u32 nbuckets = 2;
+  u32 skip = ~0;
+  u32 match = ~0;
+  int is_add = 1;
+  u32 table_index = ~0;
+  u32 next_table_index = ~0;
+  u32 miss_next_index = ~0;
+  u32 memory_size = 32<<20;
+  u8 * mask = 0;
+  f64 timeout;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (i, "del"))
+      is_add = 0;
+    else if (unformat (i, "buckets %d", &nbuckets))
+      ;
+    else if (unformat (i, "memory_size %d", &memory_size))
+      ;
+    else if (unformat (i, "skip %d", &skip))
+      ;
+    else if (unformat (i, "match %d", &match))
+      ;
+    else if (unformat (i, "table %d", &table_index))
+      ;
+    else if (unformat (i, "mask %U", unformat_classify_mask, 
+                       &mask, &skip, &match))
+      ;
+    else if (unformat (i, "next-table %d", &next_table_index))
+      ;
+    else if (unformat (i, "miss-next %U", unformat_ip_next_index,
+                       &miss_next_index))
+      ;
+    else if (unformat (i, "l2-miss-next %U", unformat_l2_next_index,
+                       &miss_next_index))
+      ;
+    else if (unformat (i, "acl-miss-next %U", unformat_acl_next_index,
+                       &miss_next_index))
+      ;
+    else
+      break;
+  }
+  
+  if (is_add && mask == 0) {
+      errmsg ("Mask required\n");
+      return -99;
+  }
+
+  if (is_add && skip == ~0) {
+      errmsg ("skip count required\n");
+      return -99;
+  }
+
+  if (is_add && match == ~0) {
+      errmsg ("match count required\n");
+      return -99;
+  }
+      
+  if (!is_add && table_index == ~0) {
+      errmsg ("table index required for delete\n");
+      return -99;
+  }
+
+  M2 (CLASSIFY_ADD_DEL_TABLE, classify_add_del_table,
+      vec_len(mask));
+
+  mp->is_add = is_add;
+  mp->table_index = ntohl(table_index);
+  mp->nbuckets = ntohl(nbuckets);
+  mp->memory_size = ntohl(memory_size);
+  mp->skip_n_vectors = ntohl(skip);
+  mp->match_n_vectors = ntohl(match);
+  mp->next_table_index = ntohl(next_table_index);
+  mp->miss_next_index = ntohl(miss_next_index);
+  memcpy (mp->mask, mask, vec_len(mask));
+
+  vec_free(mask);
+
+  S; W;
+  /* NOTREACHED */
+}
+
+uword unformat_ip4_match (unformat_input_t * input, va_list * args)
+{
+  u8 ** matchp = va_arg (*args, u8 **);
+  u8 * match = 0;
+  ip4_header_t * ip;
+  int version = 0;
+  u32 version_val;
+  int hdr_length = 0;
+  u32 hdr_length_val;
+  int src = 0, dst = 0;
+  ip4_address_t src_val, dst_val;
+  int proto = 0;
+  u32 proto_val;
+  int tos = 0;
+  u32 tos_val;
+  int length = 0;
+  u32 length_val;
+  int fragment_id = 0;
+  u32 fragment_id_val;
+  int ttl = 0;
+  int ttl_val;
+  int checksum = 0;
+  u32 checksum_val;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) 
+    {
+      if (unformat (input, "version %d", &version_val)) 
+        version = 1;
+      else if (unformat (input, "hdr_length %d", &hdr_length_val))
+        hdr_length = 1;
+      else if (unformat (input, "src %U", unformat_ip4_address, &src_val))
+        src = 1;
+      else if (unformat (input, "dst %U", unformat_ip4_address, &dst_val))
+        dst = 1;
+      else if (unformat (input, "proto %d", &proto_val))
+        proto = 1;
+      else if (unformat (input, "tos %d", &tos_val))
+        tos = 1;
+      else if (unformat (input, "length %d", &length_val))
+        length = 1;
+      else if (unformat (input, "fragment_id %d", &fragment_id_val))
+        fragment_id = 1;
+      else if (unformat (input, "ttl %d", &ttl_val))
+        ttl = 1;
+      else if (unformat (input, "checksum %d", &checksum_val))
+        checksum = 1;
+      else
+        break;
+    }
+  
+  if (version + hdr_length + src + dst + proto + tos + length + fragment_id
+      + ttl + checksum == 0)
+    return 0;
+
+  /* 
+   * Aligned because we use the real comparison functions
+   */
+  vec_validate_aligned (match, sizeof (*ip) - 1, sizeof(u32x4));
+  
+  ip = (ip4_header_t *) match;
+  
+  /* These are realistically matched in practice */
+  if (src)
+    ip->src_address.as_u32 = src_val.as_u32;
+
+  if (dst)
+    ip->dst_address.as_u32 = dst_val.as_u32;
+  
+  if (proto)
+    ip->protocol = proto_val;
+    
+
+  /* These are not, but they're included for completeness */
+  if (version)
+    ip->ip_version_and_header_length |= (version_val & 0xF)<<4;
+
+  if (hdr_length)
+    ip->ip_version_and_header_length |= (hdr_length_val & 0xF);
+    
+  if (tos)
+    ip->tos = tos_val;
+  
+  if (length)
+    ip->length = length_val;
+  
+  if (ttl)
+    ip->ttl = ttl_val;
+
+  if (checksum)
+    ip->checksum = checksum_val;
+
+  *matchp = match;
+  return 1;
+}
+
+uword unformat_ip6_match (unformat_input_t * input, va_list * args)
+{
+  u8 ** matchp = va_arg (*args, u8 **);
+  u8 * match = 0;
+  ip6_header_t * ip;
+  int version = 0;
+  u32 version_val;
+  u8  traffic_class;
+  u32 traffic_class_val;
+  u8  flow_label;
+  u8  flow_label_val;
+  int src = 0, dst = 0;
+  ip6_address_t src_val, dst_val;
+  int proto = 0;
+  u32 proto_val;
+  int payload_length = 0;
+  u32 payload_length_val;
+  int hop_limit = 0;
+  int hop_limit_val;
+  u32 ip_version_traffic_class_and_flow_label;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) 
+    {
+      if (unformat (input, "version %d", &version_val)) 
+        version = 1;
+      else if (unformat (input, "traffic_class %d", &traffic_class_val))
+        traffic_class = 1;
+      else if (unformat (input, "flow_label %d", &flow_label_val))
+        flow_label = 1;
+      else if (unformat (input, "src %U", unformat_ip6_address, &src_val))
+        src = 1;
+      else if (unformat (input, "dst %U", unformat_ip6_address, &dst_val))
+        dst = 1;
+      else if (unformat (input, "proto %d", &proto_val))
+        proto = 1;
+      else if (unformat (input, "payload_length %d", &payload_length_val))
+        payload_length = 1;
+      else if (unformat (input, "hop_limit %d", &hop_limit_val))
+        hop_limit = 1;
+      else
+        break;
+    }
+  
+  if (version + traffic_class + flow_label + src + dst + proto +
+      payload_length + hop_limit == 0)
+    return 0;
+
+  /* 
+   * Aligned because we use the real comparison functions
+   */
+  vec_validate_aligned (match, sizeof (*ip) - 1, sizeof(u32x4));
+  
+  ip = (ip6_header_t *) match;
+  
+  if (src)
+    memcpy (&ip->src_address, &src_val, sizeof (ip->src_address));
+
+  if (dst)
+    memcpy (&ip->dst_address, &dst_val, sizeof (ip->dst_address));
+  
+  if (proto)
+    ip->protocol = proto_val;
+    
+  ip_version_traffic_class_and_flow_label = 0;
+
+  if (version)
+    ip_version_traffic_class_and_flow_label |= (version_val & 0xF) << 28;
+
+  if (traffic_class)
+    ip_version_traffic_class_and_flow_label |= (traffic_class_val & 0xFF) << 20;
+
+  if (flow_label)
+    ip_version_traffic_class_and_flow_label |= (flow_label_val & 0xFFFFF);
+    
+  ip->ip_version_traffic_class_and_flow_label = 
+    clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label);
+
+  if (payload_length)
+    ip->payload_length = clib_host_to_net_u16 (payload_length_val);
+  
+  if (hop_limit)
+    ip->hop_limit = hop_limit_val;
+
+  *matchp = match;
+  return 1;
+}
+
+uword unformat_l3_match (unformat_input_t * input, va_list * args)
+{
+  u8 ** matchp = va_arg (*args, u8 **);
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "ip4 %U", unformat_ip4_match, matchp))
+      return 1;
+    else if (unformat (input, "ip6 %U", unformat_ip6_match, matchp))
+      return 1;
+    else
+      break;
+  }
+  return 0;
+}
+
+uword unformat_vlan_tag (unformat_input_t * input, va_list * args)
+{
+  u8 * tagp = va_arg (*args, u8 *);
+  u32 tag;
+
+  if (unformat(input, "%d", &tag))
+    {
+      tagp[0] = (tag>>8) & 0x0F;
+      tagp[1] = tag & 0xFF;
+      return 1;
+    }
+
+  return 0;
+}
+
+uword unformat_l2_match (unformat_input_t * input, va_list * args)
+{
+  u8 ** matchp = va_arg (*args, u8 **);
+  u8 * match = 0;
+  u8 src = 0;
+  u8 src_val[6];
+  u8 dst = 0;
+  u8 dst_val[6];
+  u8 proto = 0;
+  u16 proto_val;
+  u8 tag1 = 0;
+  u8 tag1_val [2];
+  u8 tag2 = 0;
+  u8 tag2_val [2];
+  int len = 14;
+  u8 ignore_tag1 = 0;
+  u8 ignore_tag2 = 0;
+  u8 cos1 = 0;
+  u8 cos2 = 0;
+  u32 cos1_val = 0;
+  u32 cos2_val = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "src %U", unformat_ethernet_address, &src_val))
+      src = 1;
+    else if (unformat (input, "dst %U", unformat_ethernet_address, &dst_val))
+      dst = 1;
+    else if (unformat (input, "proto %U", 
+                       unformat_ethernet_type_host_byte_order, &proto_val))
+      proto = 1;
+    else if (unformat (input, "tag1 %U", unformat_vlan_tag, tag1_val))
+      tag1 = 1;
+    else if (unformat (input, "tag2 %U", unformat_vlan_tag, tag2_val))
+      tag2 = 1;
+    else if (unformat (input, "ignore-tag1"))
+      ignore_tag1 = 1;
+    else if (unformat (input, "ignore-tag2"))
+      ignore_tag2 = 1;
+    else if (unformat (input, "cos1 %d", &cos1_val))
+      cos1 = 1;
+    else if (unformat (input, "cos2 %d", &cos2_val))
+      cos2 = 1;
+    else
+      break;
+  }
+  if ((src + dst + proto + tag1 + tag2 +
+      ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
+    return 0;
+
+  if (tag1 || ignore_tag1 || cos1)
+    len = 18;
+  if (tag2 || ignore_tag2 || cos2)
+    len = 22;
+
+  vec_validate_aligned (match, len-1, sizeof(u32x4));
+
+  if (dst)
+    memcpy (match, dst_val, 6);
+
+  if (src)
+    memcpy (match + 6, src_val, 6);
+  
+  if (tag2)
+    {
+      /* inner vlan tag */
+      match[19] = tag2_val[1];
+      match[18] = tag2_val[0];
+      if (cos2)
+        match [18] |= (cos2_val & 0x7) << 5;
+      if (proto)
+        {
+          match[21] = proto_val & 0xff;
+          match[20] = proto_val >> 8;
+        }
+      if (tag1)
+        {
+          match [15] = tag1_val[1];
+          match [14] = tag1_val[0];
+        }
+      if (cos1)
+        match [14] |= (cos1_val & 0x7) << 5;
+      *matchp = match;
+      return 1;
+    }
+  if (tag1)
+    {
+      match [15] = tag1_val[1];
+      match [14] = tag1_val[0];
+      if (proto)
+        {
+          match[17] = proto_val & 0xff;
+          match[16] = proto_val >> 8;
+        }
+      if (cos1)
+        match [14] |= (cos1_val & 0x7) << 5;
+
+      *matchp = match;
+      return 1;
+    }
+  if (cos2)
+    match [18] |= (cos2_val & 0x7) << 5;
+  if (cos1)
+    match [14] |= (cos1_val & 0x7) << 5;
+  if (proto)
+    {
+      match[13] = proto_val & 0xff;
+      match[12] = proto_val >> 8;
+    }
+  
+  *matchp = match;
+  return 1;
+}
+
+
+uword unformat_classify_match (unformat_input_t * input, va_list * args)
+{
+  u8 ** matchp = va_arg (*args, u8 **);
+  u32 skip_n_vectors = va_arg (*args, u32);
+  u32 match_n_vectors = va_arg (*args, u32);
+  
+  u8 * match = 0;
+  u8 * l2 = 0;
+  u8 * l3 = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "hex %U", unformat_hex_string, &match))
+      ;
+    else if (unformat (input, "l2 %U", unformat_l2_match, &l2))
+      ;
+    else if (unformat (input, "l3 %U", unformat_l3_match, &l3))
+      ;
+    else
+      break;
+  }
+
+  if (match || l2 || l3)
+    {
+      if (l2 || l3)
+        {
+          /* "Win a free Ethernet header in every packet" */
+          if (l2 == 0)
+            vec_validate_aligned (l2, 13, sizeof(u32x4));
+          match = l2;
+          vec_append_aligned (match, l3, sizeof(u32x4));
+          vec_free (l3);
+        }
+
+      /* Make sure the vector is big enough even if key is all 0's */
+      vec_validate_aligned 
+          (match, ((match_n_vectors + skip_n_vectors) * sizeof(u32x4)) - 1,
+           sizeof(u32x4));
+      
+      /* Set size, include skipped vectors*/
+      _vec_len (match) = (match_n_vectors+skip_n_vectors) * sizeof(u32x4);
+
+      *matchp = match;
+
+      return 1;
+    }
+
+  return 0;
+}
+
+static int api_classify_add_del_session (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_classify_add_del_session_t *mp;
+    int is_add = 1;
+    u32 table_index = ~0;
+    u32 hit_next_index = ~0;
+    u32 opaque_index = ~0;
+    u8 * match = 0;
+    i32 advance = 0;
+    f64 timeout;
+    u32 skip_n_vectors = 0;
+    u32 match_n_vectors = 0;
+
+    /* 
+     * Warning: you have to supply skip_n and match_n
+     * because the API client cant simply look at the classify
+     * table object.
+     */
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "del"))
+            is_add = 0;
+        else if (unformat (i, "hit-next %U", unformat_ip_next_index,
+                           &hit_next_index))
+            ;
+        else if (unformat (i, "l2-hit-next %U", unformat_l2_next_index,
+                           &hit_next_index))
+            ;
+        else if (unformat (i, "acl-hit-next %U", unformat_acl_next_index,
+                           &hit_next_index))
+            ;
+        else if (unformat (i, "opaque-index %d", &opaque_index))
+            ;
+        else if (unformat (i, "skip_n %d", &skip_n_vectors))
+            ;
+        else if (unformat (i, "match_n %d", &match_n_vectors))
+            ;
+        else if (unformat (i, "match %U", unformat_classify_match,
+                           &match, skip_n_vectors, match_n_vectors))
+            ;
+        else if (unformat (i, "advance %d", &advance))
+            ;
+        else if (unformat (i, "table-index %d", &table_index))
+            ;
+        else
+            break;
+    }
+
+    if (table_index == ~0) {
+        errmsg ("Table index required\n");
+        return -99;
+    }
+
+    if (is_add && match == 0) {
+        errmsg ("Match value required\n");
+        return -99;
+    }
+
+    M2 (CLASSIFY_ADD_DEL_SESSION, classify_add_del_session,
+        vec_len(match));
+
+    mp->is_add = is_add;
+    mp->table_index = ntohl(table_index);
+    mp->hit_next_index = ntohl(hit_next_index);
+    mp->opaque_index = ntohl(opaque_index);
+    mp->advance = ntohl(advance);
+    memcpy (mp->match, match, vec_len(match));
+    vec_free(match);
+
+    S; W;
+    /* NOTREACHED */
+}
+
+static int api_classify_set_interface_ip_table (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_classify_set_interface_ip_table_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    int sw_if_index_set;
+    u32 table_index = ~0;
+    u8  is_ipv6 = 0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+	else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	    sw_if_index_set = 1;
+	else if (unformat (i, "table %d", &table_index))
+	    ;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+    
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+
+    M(CLASSIFY_SET_INTERFACE_IP_TABLE, classify_set_interface_ip_table);
+
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->table_index = ntohl(table_index);
+    mp->is_ipv6 = is_ipv6;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_classify_set_interface_l2_tables (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_classify_set_interface_l2_tables_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    int sw_if_index_set;
+    u32 ip4_table_index = ~0;
+    u32 ip6_table_index = ~0;
+    u32 other_table_index = ~0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+	else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	    sw_if_index_set = 1;
+	else if (unformat (i, "ip4-table %d", &ip4_table_index))
+	    ;
+	else if (unformat (i, "ip6-table %d", &ip6_table_index))
+	    ;
+	else if (unformat (i, "other-table %d", &other_table_index))
+	    ;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+    
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+
+    M(CLASSIFY_SET_INTERFACE_L2_TABLES, classify_set_interface_l2_tables);
+
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->ip4_table_index = ntohl(ip4_table_index);
+    mp->ip6_table_index = ntohl(ip6_table_index);
+    mp->other_table_index = ntohl(other_table_index);
+
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_get_node_index (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_get_node_index_t * mp;
+    f64 timeout;
+    u8 * name = 0;
+    
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "node %s", &name))
+            ;
+        else
+            break;
+    }
+    if (name == 0) {
+        errmsg ("node name required\n");
+        return -99;
+    }
+    if (vec_len (name) >= ARRAY_LEN(mp->node_name)) {
+        errmsg ("node name too long, max %d\n", ARRAY_LEN(mp->node_name));
+        return -99;
+    }
+
+    M(GET_NODE_INDEX, get_node_index);
+    memcpy (mp->node_name, name, vec_len(name));
+    vec_free(name);
+    
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_add_node_next (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_add_node_next_t * mp;
+    f64 timeout;
+    u8 * name = 0;
+    u8 * next = 0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "node %s", &name))
+            ;
+        else if (unformat (i, "next %s", &next))
+            ;
+        else
+            break;
+    }
+    if (name == 0) {
+        errmsg ("node name required\n");
+        return -99;
+    }
+    if (vec_len (name) >= ARRAY_LEN(mp->node_name)) {
+        errmsg ("node name too long, max %d\n", ARRAY_LEN(mp->node_name));
+        return -99;
+    }
+    if (next == 0) {
+        errmsg ("next node required\n");
+        return -99;
+    }
+    if (vec_len (next) >= ARRAY_LEN(mp->next_name)) {
+        errmsg ("next name too long, max %d\n", ARRAY_LEN(mp->next_name));
+        return -99;
+    }
+    
+    M(ADD_NODE_NEXT, add_node_next);
+    memcpy (mp->node_name, name, vec_len(name));
+    memcpy (mp->next_name, next, vec_len(next));
+    vec_free(name);
+    vec_free(next);
+    
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_l2tpv3_create_tunnel (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    ip6_address_t client_address, our_address;
+    int client_address_set = 0;
+    int our_address_set = 0;
+    u32 local_session_id = 0;
+    u32 remote_session_id = 0;
+    u64 local_cookie = 0;
+    u64 remote_cookie = 0;
+    u8 l2_sublayer_present = 0;
+    vl_api_l2tpv3_create_tunnel_t * mp;
+    f64 timeout;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "client_address %U", unformat_ip6_address, 
+                      &client_address))
+            client_address_set = 1;
+        else if (unformat (i, "our_address %U", unformat_ip6_address, 
+                           &our_address))
+            our_address_set = 1;
+        else if (unformat (i, "local_session_id %d", &local_session_id))
+            ;
+        else if (unformat (i, "remote_session_id %d", &remote_session_id))
+            ;
+        else if (unformat (i, "local_cookie %lld", &local_cookie))
+            ;
+        else if (unformat (i, "remote_cookie %lld", &remote_cookie))
+            ;
+        else if (unformat (i, "l2-sublayer-present"))
+            l2_sublayer_present = 1;
+        else
+            break;
+    }
+
+    if (client_address_set == 0) {
+        errmsg ("client_address required\n");
+        return -99;
+    }
+
+    if (our_address_set == 0) {
+        errmsg ("our_address required\n");
+        return -99;
+    }
+
+    M(L2TPV3_CREATE_TUNNEL, l2tpv3_create_tunnel);
+
+    memcpy (mp->client_address, client_address.as_u8, 
+            sizeof (mp->client_address));
+
+    memcpy (mp->our_address, our_address.as_u8, 
+            sizeof (mp->our_address));
+    
+    mp->local_session_id = ntohl (local_session_id);
+    mp->remote_session_id = ntohl (remote_session_id);
+    mp->local_cookie = clib_host_to_net_u64 (local_cookie);
+    mp->remote_cookie = clib_host_to_net_u64 (remote_cookie);
+    mp->l2_sublayer_present = l2_sublayer_present;
+    mp->is_ipv6 = 1;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_l2tpv3_set_tunnel_cookies (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    u32 sw_if_index;
+    u8  sw_if_index_set = 0;
+    u64 new_local_cookie = 0;
+    u64 new_remote_cookie = 0;
+    vl_api_l2tpv3_set_tunnel_cookies_t *mp;
+    f64 timeout;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "new_local_cookie %lld", &new_local_cookie))
+            ;
+        else if (unformat (i, "new_remote_cookie %lld", &new_remote_cookie))
+            ;
+        else
+            break;
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+    M(L2TPV3_SET_TUNNEL_COOKIES, l2tpv3_set_tunnel_cookies);
+
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->new_local_cookie = clib_host_to_net_u64 (new_local_cookie);
+    mp->new_remote_cookie = clib_host_to_net_u64 (new_remote_cookie);
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_l2tpv3_interface_enable_disable (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_l2tpv3_interface_enable_disable_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u8  sw_if_index_set = 0;
+    u8  enable_disable = 1;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+	else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	    sw_if_index_set = 1;
+	else if (unformat (i, "enable"))
+	    enable_disable = 1;
+	else if (unformat (i, "disable"))
+	    enable_disable = 0;
+        else
+            break;
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+    
+    M(L2TPV3_INTERFACE_ENABLE_DISABLE, l2tpv3_interface_enable_disable);
+
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->enable_disable = enable_disable;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_l2tpv3_set_lookup_key (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_l2tpv3_set_lookup_key_t * mp;
+    f64 timeout;
+    u8 key = ~0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "lookup_v6_src"))
+            key = L2T_LOOKUP_SRC_ADDRESS;
+        else if (unformat (i, "lookup_v6_dst"))
+            key = L2T_LOOKUP_DST_ADDRESS;
+        else if (unformat (i, "lookup_session_id"))
+            key = L2T_LOOKUP_SESSION_ID;
+        else
+            break;
+    }
+
+    if (key == ~0) {
+        errmsg ("l2tp session lookup key unset\n");
+        return -99;
+    }
+    
+    M(L2TPV3_SET_LOOKUP_KEY, l2tpv3_set_lookup_key);
+
+    mp->key = key;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler
+(vl_api_sw_if_l2tpv3_tunnel_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+
+    fformat(vam->ofp,  "* %U (our) %U (client) (sw_if_index %d)\n",
+              format_ip6_address, mp->our_address,
+              format_ip6_address, mp->client_address,
+              clib_net_to_host_u32(mp->sw_if_index));
+
+    fformat (vam->ofp, "   local cookies %016llx %016llx remote cookie %016llx\n",
+              clib_net_to_host_u64 (mp->local_cookie[0]),
+              clib_net_to_host_u64 (mp->local_cookie[1]),
+              clib_net_to_host_u64 (mp->remote_cookie));
+
+    fformat (vam->ofp, "   local session-id %d remote session-id %d\n",
+              clib_net_to_host_u32 (mp->local_session_id),
+              clib_net_to_host_u32 (mp->remote_session_id));
+
+    fformat (vam->ofp, "   l2 specific sublayer %s\n\n",
+              mp->l2_sublayer_present ? "preset" : "absent");
+
+}
+
+static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler_json
+(vl_api_sw_if_l2tpv3_tunnel_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t *node = NULL;
+    struct in6_addr addr;
+
+    if (VAT_JSON_ARRAY != vam->json_tree.type) {
+        ASSERT(VAT_JSON_NONE == vam->json_tree.type);
+        vat_json_init_array(&vam->json_tree);
+    }
+    node = vat_json_array_add(&vam->json_tree);
+
+    vat_json_init_object(node);
+
+    memcpy(&addr, mp->our_address, sizeof(addr));
+    vat_json_object_add_ip6(node, "our_address", addr);
+    memcpy(&addr, mp->client_address, sizeof(addr));
+    vat_json_object_add_ip6(node, "client_address", addr);
+
+    vat_json_node_t * lc = vat_json_object_add(node, "local_cookie");
+    vat_json_init_array(lc);
+    vat_json_array_add_uint(lc, clib_net_to_host_u64(mp->local_cookie[0]));
+    vat_json_array_add_uint(lc, clib_net_to_host_u64(mp->local_cookie[1]));
+    vat_json_object_add_uint(node, "remote_cookie", clib_net_to_host_u64(mp->remote_cookie));
+
+    printf("local id: %u", clib_net_to_host_u32(mp->local_session_id));
+    vat_json_object_add_uint(node, "local_session_id", clib_net_to_host_u32(mp->local_session_id));
+    vat_json_object_add_uint(node, "remote_session_id", clib_net_to_host_u32(mp->remote_session_id));
+    vat_json_object_add_string_copy(node, "l2_sublayer", mp->l2_sublayer_present ?
+            (u8*)"present" : (u8*)"absent");
+}
+
+static int api_sw_if_l2tpv3_tunnel_dump (vat_main_t * vam)
+{
+    vl_api_sw_if_l2tpv3_tunnel_dump_t *mp;
+    f64 timeout;
+
+    /* Get list of l2tpv3-tunnel interfaces */
+    M(SW_IF_L2TPV3_TUNNEL_DUMP, sw_if_l2tpv3_tunnel_dump);
+    S;
+
+    /* Use a control ping for synchronization */
+    {
+        vl_api_control_ping_t * mp;
+        M(CONTROL_PING, control_ping);
+        S;
+    }
+    W;
+}
+
+
+static void vl_api_sw_interface_tap_details_t_handler
+(vl_api_sw_interface_tap_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+
+    fformat(vam->ofp,  "%-16s %d\n",
+              mp->dev_name,
+              clib_net_to_host_u32(mp->sw_if_index));
+}
+
+static void vl_api_sw_interface_tap_details_t_handler_json
+(vl_api_sw_interface_tap_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t *node = NULL;
+
+    if (VAT_JSON_ARRAY != vam->json_tree.type) {
+        ASSERT(VAT_JSON_NONE == vam->json_tree.type);
+        vat_json_init_array(&vam->json_tree);
+    }
+    node = vat_json_array_add(&vam->json_tree);
+
+    vat_json_init_object(node);
+    vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
+    vat_json_object_add_string_copy(node, "dev_name", mp->dev_name);
+}
+
+static int api_sw_interface_tap_dump (vat_main_t * vam)
+{
+    vl_api_sw_interface_tap_dump_t *mp;
+    f64 timeout;
+
+    fformat(vam->ofp,  "\n%-16s %s\n", "dev_name", "sw_if_index");
+    /* Get list of tap interfaces */
+    M(SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump);
+    S;
+
+    /* Use a control ping for synchronization */
+    {
+        vl_api_control_ping_t * mp;
+        M(CONTROL_PING, control_ping);
+        S;
+    }
+    W;
+}
+
+static uword unformat_vxlan_decap_next 
+(unformat_input_t * input, va_list * args)
+{
+  u32 * result = va_arg (*args, u32 *);
+  u32 tmp;
+  
+  if (unformat (input, "drop"))
+    *result = VXLAN_INPUT_NEXT_DROP;
+  else if (unformat (input, "ip4"))
+    *result = VXLAN_INPUT_NEXT_IP4_INPUT;
+  else if (unformat (input, "ip6"))
+    *result = VXLAN_INPUT_NEXT_IP6_INPUT;
+  else if (unformat (input, "l2"))
+    *result = VXLAN_INPUT_NEXT_L2_INPUT;
+  else if (unformat (input, "%d", &tmp))
+    *result = tmp;
+  else
+    return 0;
+  return 1;
+}
+
+static int api_vxlan_add_del_tunnel (vat_main_t * vam)
+{
+    unformat_input_t * line_input = vam->input;
+    vl_api_vxlan_add_del_tunnel_t *mp;
+    f64 timeout;
+    ip4_address_t src, dst;
+    u8 is_add = 1;
+    u8 src_set = 0;
+    u8 dst_set = 0;
+    u32 encap_vrf_id = 0;
+    u32 decap_next_index = ~0;
+    u32 vni = 0;
+
+    while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (line_input, "del"))
+            is_add = 0;
+        else if (unformat (line_input, "src %U", 
+                           unformat_ip4_address, &src))
+            src_set = 1;
+        else if (unformat (line_input, "dst %U",
+                           unformat_ip4_address, &dst))
+            dst_set = 1;
+        else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
+            ;
+        else if (unformat (line_input, "decap-next %U", 
+                           unformat_vxlan_decap_next, &decap_next_index))
+            ;
+        else if (unformat (line_input, "vni %d", &vni))
+            ;
+        else {
+            errmsg ("parse error '%U'\n", format_unformat_error, line_input);
+            return -99;
+        }
+    }
+
+    if (src_set == 0) {
+        errmsg ("tunnel src address not specified\n");
+        return -99;
+    }
+    if (dst_set == 0) {
+        errmsg ("tunnel dst address not specified\n");
+        return -99;
+    }
+
+    if ((vni == 0) || (vni>>24)) {
+        errmsg ("vni not specified or out of range\n");
+        return -99;
+    }
+
+    M (VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel);
+    
+    mp->src_address = src.as_u32;
+    mp->dst_address = dst.as_u32;
+    mp->encap_vrf_id = ntohl(encap_vrf_id);
+    mp->decap_next_index = ntohl(decap_next_index);
+    mp->vni = ntohl(vni);
+    mp->is_add = is_add;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_l2_fib_clear_table (vat_main_t * vam)
+{
+//  unformat_input_t * i = vam->input;
+    vl_api_l2_fib_clear_table_t *mp;
+    f64 timeout;
+
+    M(L2_FIB_CLEAR_TABLE, l2_fib_clear_table);
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_l2_interface_efp_filter (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_l2_interface_efp_filter_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u8 enable = 1;
+    u8 sw_if_index_set = 0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+	else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+	else if (unformat (i, "enable"))
+            enable = 1;
+	else if (unformat (i, "disable"))
+            enable = 0;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+    
+    if (sw_if_index_set == 0) {
+        errmsg ("missing sw_if_index\n");
+        return -99;
+    }
+
+    M(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter);
+
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->enable_disable = enable;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+#define foreach_vtr_op                          \
+_("disable",  L2_VTR_DISABLED)                  \
+_("push-1",  L2_VTR_PUSH_1)                     \
+_("push-2",  L2_VTR_PUSH_2)                     \
+_("pop-1",  L2_VTR_POP_1)                       \
+_("pop-2",  L2_VTR_POP_2)                       \
+_("translate-1-1",  L2_VTR_TRANSLATE_1_1)       \
+_("translate-1-2",  L2_VTR_TRANSLATE_1_2)       \
+_("translate-2-1",  L2_VTR_TRANSLATE_2_1)       \
+_("translate-2-2",  L2_VTR_TRANSLATE_2_2)
+
+static int api_l2_interface_vlan_tag_rewrite (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_l2_interface_vlan_tag_rewrite_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u8 sw_if_index_set = 0;
+    u8 vtr_op_set = 0;
+    u32 vtr_op = 0;
+    u32 push_dot1q = 1;
+    u32 tag1 = ~0;
+    u32 tag2 = ~0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "vtr_op %d", &vtr_op))
+            vtr_op_set = 1;
+#define _(n,v) else if (unformat(i, n)) {vtr_op = v; vtr_op_set = 1;}
+        foreach_vtr_op
+#undef _
+        
+        else if (unformat (i, "push_dot1q %d", &push_dot1q))
+            ;
+        else if (unformat (i, "tag1 %d", &tag1))
+            ;
+        else if (unformat (i, "tag2 %d", &tag2))
+            ;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+    
+    if ((sw_if_index_set == 0)||(vtr_op_set == 0)) {
+        errmsg ("missing vtr operation or sw_if_index\n");
+        return -99;
+    }
+
+    M(L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite)
+
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->vtr_op = ntohl(vtr_op);
+    mp->push_dot1q = ntohl(push_dot1q);
+    mp->tag1 = ntohl(tag1);
+    mp->tag2 = ntohl(tag2);
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_create_vhost_user_if (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_create_vhost_user_if_t *mp;
+    f64 timeout;
+    u8 * file_name;
+    u8 is_server = 0;
+    u8 file_name_set = 0;
+    u32 custom_dev_instance = ~0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+      if (unformat (i, "socket %s", &file_name)) {
+        file_name_set = 1;
+      }
+      else if (unformat (i, "renumber %"PRIu32, &custom_dev_instance))
+        ;
+      else if (unformat (i, "server"))
+        is_server = 1;
+      else
+        break;
+    }
+
+    if (file_name_set == 0) {
+      errmsg ("missing socket file name\n");
+      return -99;
+    }
+
+    if (vec_len (file_name) > 255) {
+      errmsg ("socket file name too long\n");
+      return -99;
+    }
+    vec_add1 (file_name, 0);
+
+    M(CREATE_VHOST_USER_IF, create_vhost_user_if);
+
+    mp->is_server = is_server;
+    memcpy(mp->sock_filename, file_name, vec_len(file_name));
+    vec_free(file_name);
+    if (custom_dev_instance != ~0) {
+        mp->renumber = 1;
+        mp->custom_dev_instance = ntohl(custom_dev_instance);
+    }
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_modify_vhost_user_if (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_modify_vhost_user_if_t *mp;
+    f64 timeout;
+    u8 * file_name;
+    u8 is_server = 0;
+    u8 file_name_set = 0;
+    u32 custom_dev_instance = ~0;
+    u8 sw_if_index_set = 0;
+    u32 sw_if_index = (u32)~0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+      if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+          sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+          sw_if_index_set = 1;
+      else if (unformat (i, "socket %s", &file_name)) {
+        file_name_set = 1;
+      }
+      else if (unformat (i, "renumber %"PRIu32, &custom_dev_instance))
+        ;
+      else if (unformat (i, "server"))
+        is_server = 1;
+      else
+        break;
+    }
+
+    if (sw_if_index_set == 0) {
+       errmsg ("missing sw_if_index or interface name\n");
+       return -99;
+    }
+
+    if (file_name_set == 0) {
+      errmsg ("missing socket file name\n");
+      return -99;
+    }
+
+    if (vec_len (file_name) > 255) {
+      errmsg ("socket file name too long\n");
+      return -99;
+    }
+    vec_add1 (file_name, 0);
+
+    M(MODIFY_VHOST_USER_IF, modify_vhost_user_if);
+
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->is_server = is_server;
+    memcpy(mp->sock_filename, file_name, vec_len(file_name));
+    vec_free(file_name);
+    if (custom_dev_instance != ~0) {
+        mp->renumber = 1;
+        mp->custom_dev_instance = ntohl(custom_dev_instance);
+    }
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int api_delete_vhost_user_if (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_delete_vhost_user_if_t *mp;
+    f64 timeout;
+    u32 sw_if_index = ~0;
+    u8 sw_if_index_set = 0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+      if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+          sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+          sw_if_index_set = 1;
+      else
+        break;
+    }
+
+    if (sw_if_index_set == 0) {
+       errmsg ("missing sw_if_index or interface name\n");
+       return -99;
+    }
+
+
+    M(DELETE_VHOST_USER_IF, delete_vhost_user_if);
+
+    mp->sw_if_index = ntohl(sw_if_index);
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static void vl_api_sw_interface_vhost_user_details_t_handler
+(vl_api_sw_interface_vhost_user_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+
+    fformat(vam->ofp, "%-25s %3" PRIu32 " %6" PRIu32 " %8x %6d %7d %s\n",
+            (char *)mp->interface_name,
+            ntohl(mp->sw_if_index), ntohl(mp->virtio_net_hdr_sz),
+            clib_net_to_host_u64(mp->features), mp->is_server,
+            ntohl(mp->num_regions), (char *)mp->sock_filename);
+    fformat(vam->ofp, "    Status: '%s'\n", strerror(ntohl(mp->sock_errno)));
+}
+
+static void vl_api_sw_interface_vhost_user_details_t_handler_json
+(vl_api_sw_interface_vhost_user_details_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t *node = NULL;
+
+    if (VAT_JSON_ARRAY != vam->json_tree.type) {
+        ASSERT(VAT_JSON_NONE == vam->json_tree.type);
+        vat_json_init_array(&vam->json_tree);
+    }
+    node = vat_json_array_add(&vam->json_tree);
+
+    vat_json_init_object(node);
+    vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
+    vat_json_object_add_string_copy(node, "interface_name", mp->interface_name);
+    vat_json_object_add_uint(node, "virtio_net_hdr_sz", ntohl(mp->virtio_net_hdr_sz));
+    vat_json_object_add_uint(node, "features", clib_net_to_host_u64(mp->features));
+    vat_json_object_add_uint(node, "is_server", mp->is_server);
+    vat_json_object_add_string_copy(node, "sock_filename", mp->sock_filename);
+    vat_json_object_add_uint(node, "num_regions", ntohl(mp->num_regions));
+    vat_json_object_add_uint(node, "sock_errno", ntohl(mp->sock_errno));
+}
+
+static int api_sw_interface_vhost_user_dump (vat_main_t * vam)
+{
+    vl_api_sw_interface_vhost_user_dump_t *mp;
+    f64 timeout;
+    fformat(vam->ofp, "Interface name           idx hdr_sz features server regions filename\n");
+
+    /* Get list of vhost-user interfaces */
+    M(SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump);
+    S;
+
+    /* Use a control ping for synchronization */
+    {
+        vl_api_control_ping_t * mp;
+        M(CONTROL_PING, control_ping);
+        S;
+    }
+    W;
+}
+
+static int api_show_version (vat_main_t * vam)
+{
+    vl_api_show_version_t *mp;
+    f64 timeout;
+
+    M(SHOW_VERSION, show_version);
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static uword unformat_nsh_gre_decap_next 
+(unformat_input_t * input, va_list * args)
+{
+  u32 * result = va_arg (*args, u32 *);
+  u32 tmp;
+  
+  if (unformat (input, "drop"))
+    *result = NSH_INPUT_NEXT_DROP;
+  else if (unformat (input, "ip4"))
+    *result = NSH_INPUT_NEXT_IP4_INPUT;
+  else if (unformat (input, "ip6"))
+    *result = NSH_INPUT_NEXT_IP6_INPUT;
+  else if (unformat (input, "ethernet"))
+    *result = NSH_INPUT_NEXT_ETHERNET_INPUT;
+  else if (unformat (input, "%d", &tmp))
+    *result = tmp;
+  else
+    return 0;
+  return 1;
+}
+
+static int api_nsh_gre_add_del_tunnel (vat_main_t * vam)
+{
+    unformat_input_t * line_input = vam->input;
+    vl_api_nsh_gre_add_del_tunnel_t *mp;
+    f64 timeout;
+    ip4_address_t src, dst;
+    u8 is_add = 1;
+    u8 src_set = 0;
+    u8 dst_set = 0;
+    u32 encap_vrf_id = 0;
+    u32 decap_vrf_id = 0;
+    u8 ver_o_c = 0;
+    u8 md_type = 0;
+    u8 next_protocol = 1; /* ip4 */
+    u32 spi;
+    u8 spi_set = 0;
+    u32 si;
+    u8 si_set = 0;
+    u32 spi_si;
+    u32 c1 = 0;
+    u32 c2 = 0;
+    u32 c3 = 0;
+    u32 c4 = 0;
+    u32 *tlvs = 0;
+    u32 decap_next_index = NSH_INPUT_NEXT_IP4_INPUT;
+    u32 tmp;
+    int i;
+
+    while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (line_input, "del"))
+            is_add = 0;
+        else if (unformat (line_input, "src %U", 
+                           unformat_ip4_address, &src))
+            src_set = 1;
+        else if (unformat (line_input, "dst %U",
+                           unformat_ip4_address, &dst))
+            dst_set = 1;
+        else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
+            ;
+        else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id))
+            ;
+        else if (unformat (line_input, "decap-next %U", 
+                           unformat_nsh_gre_decap_next, &decap_next_index))
+            ;
+        else if (unformat (line_input, "version %d", &tmp))
+            ver_o_c |= (tmp & 3) << 6;
+        else if (unformat (line_input, "o-bit %d", &tmp))
+            ver_o_c |= (tmp & 1) << 5;
+        else if (unformat (line_input, "c-bit %d", &tmp))
+            ver_o_c |= (tmp & 1) << 4;
+        else if (unformat (line_input, "md-type %d", &tmp))
+            md_type = tmp;
+        else if (unformat(line_input, "next-ip4"))
+            next_protocol = 1;
+        else if (unformat(line_input, "next-ip6"))
+            next_protocol = 2;
+        else if (unformat(line_input, "next-ethernet"))
+            next_protocol = 3;
+        else if (unformat (line_input, "c1 %d", &c1))
+            ;
+        else if (unformat (line_input, "c2 %d", &c2))
+            ;
+        else if (unformat (line_input, "c3 %d", &c3))
+            ;
+        else if (unformat (line_input, "c4 %d", &c4))
+            ;
+        else if (unformat (line_input, "spi %d", &spi))
+            spi_set = 1;
+        else if (unformat (line_input, "si %d", &si))
+            si_set = 1;
+        else if (unformat (line_input, "tlv %x"))
+            vec_add1 (tlvs, tmp);
+        else {
+            errmsg ("parse error '%U'\n", format_unformat_error, line_input);
+            return -99;
+        }
+    }
+
+    if (src_set == 0) {
+        errmsg ("tunnel src address not specified\n");
+        return -99;
+    }
+    if (dst_set == 0) {
+        errmsg ("tunnel dst address not specified\n");
+        return -99;
+    }
+
+    if (spi_set == 0) {
+        errmsg ("spi not specified\n");
+        return -99;
+    }
+
+    if (si_set == 0) {
+        errmsg ("si not specified\n");
+        return -99;
+    }
+
+    M2 (NSH_GRE_ADD_DEL_TUNNEL, nsh_gre_add_del_tunnel,
+        sizeof(u32) * vec_len (tlvs));
+    
+    spi_si = (spi<<8) | si;
+
+    mp->src = src.as_u32;
+    mp->dst = dst.as_u32;
+    mp->encap_vrf_id = ntohl(encap_vrf_id);
+    mp->decap_vrf_id = ntohl(decap_vrf_id);
+    mp->decap_next_index = ntohl(decap_next_index);
+    mp->tlv_len_in_words = vec_len (tlvs);
+    mp->is_add = is_add;
+    mp->ver_o_c = ver_o_c;
+    mp->length = 6 + vec_len(tlvs);
+    mp->md_type = md_type;
+    mp->next_protocol = next_protocol;
+    mp->spi_si = ntohl(spi_si);
+    mp->c1 = ntohl(c1);
+    mp->c2 = ntohl(c2);
+    mp->c3 = ntohl(c3);
+    mp->c4 = ntohl(c4);
+    
+    for (i = 0; i < vec_len(tlvs); i++)
+        mp->tlvs[i] = ntohl(tlvs[i]);
+
+    vec_free (tlvs);
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static uword unformat_nsh_vxlan_gpe_decap_next 
+(unformat_input_t * input, va_list * args)
+{
+  u32 * result = va_arg (*args, u32 *);
+  u32 tmp;
+  
+  if (unformat (input, "drop"))
+    *result = NSH_VXLAN_GPE_INPUT_NEXT_DROP;
+  else if (unformat (input, "ip4"))
+    *result = NSH_VXLAN_GPE_INPUT_NEXT_IP4_INPUT;
+  else if (unformat (input, "ip6"))
+    *result = NSH_VXLAN_GPE_INPUT_NEXT_IP6_INPUT;
+  else if (unformat (input, "ethernet"))
+    *result = NSH_VXLAN_GPE_INPUT_NEXT_ETHERNET_INPUT;
+  else if (unformat (input, "nsh-vxlan-gpe"))
+      *result = NSH_VXLAN_GPE_INPUT_NEXT_ETHERNET_INPUT;
+  else if (unformat (input, "%d", &tmp))
+    *result = tmp;
+  else
+    return 0;
+  return 1;
+}
+
+static int api_nsh_vxlan_gpe_add_del_tunnel (vat_main_t * vam)
+{
+    unformat_input_t * line_input = vam->input;
+    vl_api_nsh_vxlan_gpe_add_del_tunnel_t *mp;
+    f64 timeout;
+    ip4_address_t src, dst;
+    u8 is_add = 1;
+    u8 src_set = 0;
+    u8 dst_set = 0;
+    u32 encap_vrf_id = 0;
+    u32 decap_vrf_id = 0;
+    u8 ver_o_c = 0;
+    u8 md_type = 0;
+    u8 next_protocol = 1; /* ip4 */
+    u32 spi;
+    u8 spi_set = 0;
+    u32 si;
+    u8 si_set = 0;
+    u32 spi_si;
+    u32 c1 = 0;
+    u32 c2 = 0;
+    u32 c3 = 0;
+    u32 c4 = 0;
+    u32 *tlvs = 0;
+    u32 decap_next_index = NSH_INPUT_NEXT_IP4_INPUT;
+    u32 vni;
+    u8 vni_set = 0;
+    u32 tmp;
+    int i;
+
+    while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (line_input, "del"))
+            is_add = 0;
+        else if (unformat (line_input, "src %U", 
+                           unformat_ip4_address, &src))
+            src_set = 1;
+        else if (unformat (line_input, "dst %U",
+                           unformat_ip4_address, &dst))
+            dst_set = 1;
+        else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
+            ;
+        else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id))
+            ;
+        else if (unformat (line_input, "decap-next %U", 
+                           unformat_nsh_vxlan_gpe_decap_next, 
+                           &decap_next_index))
+            ;
+        else if (unformat (line_input, "vni %d", &vni))
+            vni_set = 1;
+        else if (unformat (line_input, "version %d", &tmp))
+            ver_o_c |= (tmp & 3) << 6;
+        else if (unformat (line_input, "o-bit %d", &tmp))
+            ver_o_c |= (tmp & 1) << 5;
+        else if (unformat (line_input, "c-bit %d", &tmp))
+            ver_o_c |= (tmp & 1) << 4;
+        else if (unformat (line_input, "md-type %d", &tmp))
+            md_type = tmp;
+        else if (unformat(line_input, "next-ip4"))
+            next_protocol = 1;
+        else if (unformat(line_input, "next-ip6"))
+            next_protocol = 2;
+        else if (unformat(line_input, "next-ethernet"))
+            next_protocol = 3;
+        else if (unformat (line_input, "c1 %d", &c1))
+            ;
+        else if (unformat (line_input, "c2 %d", &c2))
+            ;
+        else if (unformat (line_input, "c3 %d", &c3))
+            ;
+        else if (unformat (line_input, "c4 %d", &c4))
+            ;
+        else if (unformat (line_input, "spi %d", &spi))
+            spi_set = 1;
+        else if (unformat (line_input, "si %d", &si))
+            si_set = 1;
+        else if (unformat (line_input, "tlv %x"))
+            vec_add1 (tlvs, tmp);
+        else {
+            errmsg ("parse error '%U'\n", format_unformat_error, line_input);
+            return -99;
+        }
+    }
+
+    if (src_set == 0) {
+        errmsg ("tunnel src address not specified\n");
+        return -99;
+    }
+    if (dst_set == 0) {
+        errmsg ("tunnel dst address not specified\n");
+        return -99;
+    }
+
+    if (spi_set == 0) {
+        errmsg ("spi not specified\n");
+        return -99;
+    }
+
+    if (si_set == 0) {
+        errmsg ("si not specified\n");
+        return -99;
+    }
+    if (vni_set == 0) {
+        errmsg ("vni not specified\n");
+        return -99;
+    }
+
+    M2 (NSH_VXLAN_GPE_ADD_DEL_TUNNEL, nsh_vxlan_gpe_add_del_tunnel,
+        sizeof(u32) * vec_len (tlvs));
+    
+    spi_si = (spi<<8) | si;
+
+    mp->src = src.as_u32;
+    mp->dst = dst.as_u32;
+    mp->encap_vrf_id = ntohl(encap_vrf_id);
+    mp->decap_vrf_id = ntohl(decap_vrf_id);
+    mp->decap_next_index = ntohl(decap_next_index);
+    mp->tlv_len_in_words = vec_len (tlvs);
+    mp->vni = ntohl(vni);
+    mp->is_add = is_add;
+    mp->ver_o_c = ver_o_c;
+    mp->length = 6 + vec_len(tlvs);
+    mp->md_type = md_type;
+    mp->next_protocol = next_protocol;
+    mp->spi_si = ntohl(spi_si);
+    mp->c1 = ntohl(c1);
+    mp->c2 = ntohl(c2);
+    mp->c3 = ntohl(c3);
+    mp->c4 = ntohl(c4);
+    
+    for (i = 0; i < vec_len(tlvs); i++)
+        mp->tlvs[i] = ntohl(tlvs[i]);
+
+    vec_free (tlvs);
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static uword unformat_lisp_gpe_decap_next (unformat_input_t * input, 
+                                               va_list * args)
+{
+    u32 * result = va_arg (*args, u32 *);
+    u32 tmp;
+  
+    if (unformat (input, "drop"))
+        *result = LISP_GPE_INPUT_NEXT_DROP;
+    else if (unformat (input, "ip4"))
+        *result = LISP_GPE_INPUT_NEXT_IP4_INPUT;
+    else if (unformat (input, "ip6"))
+        *result = LISP_GPE_INPUT_NEXT_IP6_INPUT;
+    else if (unformat (input, "ethernet"))
+        *result = LISP_GPE_INPUT_NEXT_IP6_INPUT;
+    else if (unformat (input, "lisp-gpe"))
+        *result = LISP_GPE_INPUT_NEXT_LISP_GPE_ENCAP;
+    else if (unformat (input, "%d", &tmp))
+        *result = tmp;
+    else
+        return 0;
+    return 1;
+}
+
+static int
+api_lisp_gpe_add_del_tunnel (vat_main_t * vam)
+{
+    unformat_input_t * line_input = vam->input;
+    vl_api_lisp_gpe_add_del_tunnel_t *mp;
+    f64 timeout;
+    ip4_address_t src, dst;
+    u8 is_add = 1;
+    u8 src_set = 0;
+    u8 dst_set = 0;
+    u32 encap_vrf_id = 0;
+    u32 decap_vrf_id = 0;
+    u8 next_protocol = LISP_GPE_NEXT_PROTOCOL_IP4;
+    u32 decap_next_index = LISP_GPE_INPUT_NEXT_IP4_INPUT;
+    u8 flags = LISP_GPE_FLAGS_P;
+    u8 ver_res = 0;
+    u8 res = 0;
+    u32 iid = 0;
+    u8 iid_set = 0;
+    u32 tmp;
+  
+    while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (line_input, "del"))
+            is_add = 0;
+        else if (unformat (line_input, "src %U", 
+                           unformat_ip4_address, &src))
+            src_set = 1;
+        else if (unformat (line_input, "dst %U",
+                           unformat_ip4_address, &dst))
+            dst_set = 1;
+        else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
+            ;
+        else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id))
+            ;
+        else if (unformat (line_input, "decap-next %U", 
+                           unformat_lisp_gpe_decap_next, 
+                           &decap_next_index))
+            ;
+        else if (unformat(line_input, "next-ip4"))
+            next_protocol = 1;
+        else if (unformat(line_input, "next-ip6"))
+            next_protocol = 2;
+        else if (unformat(line_input, "next-ethernet"))
+            next_protocol = 3;
+        else if (unformat(line_input, "next-nsh"))
+            next_protocol = 4;
+        /* Allow the user to specify anything they want in the LISP hdr */
+        else if (unformat (line_input, "ver_res %x", &tmp))
+            ver_res = tmp;
+        else if (unformat (line_input, "res %x", &tmp))
+            res = tmp;
+        else if (unformat (line_input, "flags %x", &tmp))
+            flags = tmp;
+        else if (unformat (line_input, "n-bit"))
+            flags |= LISP_GPE_FLAGS_N;
+        else if (unformat (line_input, "l-bit"))
+            flags |= LISP_GPE_FLAGS_L;
+        else if (unformat (line_input, "e-bit"))
+            flags |= LISP_GPE_FLAGS_E;
+        else if (unformat (line_input, "v-bit"))
+            flags |= LISP_GPE_FLAGS_V;
+        else if (unformat (line_input, "i-bit"))
+            flags |= LISP_GPE_FLAGS_V;
+        else if (unformat (line_input, "not-p-bit"))
+            flags &= !LISP_GPE_FLAGS_P;
+        else if (unformat (line_input, "p-bit"))
+            flags |= LISP_GPE_FLAGS_P;
+        else if (unformat (line_input, "o-bit"))
+            flags |= LISP_GPE_FLAGS_O;
+        else if (unformat (line_input, "iidx %x", &iid))
+            iid_set = 1;
+        else if (unformat (line_input, "iid %d", &iid))
+            iid_set = 1;
+        else {
+            errmsg ("parse error '%U'\n", format_unformat_error, line_input);
+            return -99;
+        }
+    }
+
+    if (src_set == 0) {
+        errmsg ("tunnel src address not specified\n");
+        return -99;
+    }
+    if (dst_set == 0) {
+        errmsg ("tunnel dst address not specified\n");
+        return -99;
+    }
+    if (iid_set == 0) {
+        errmsg ("iid not specified\n");
+        return -99;
+    }
+
+    M(LISP_GPE_ADD_DEL_TUNNEL, lisp_gpe_add_del_tunnel);
+
+    mp->src = src.as_u32;
+    mp->dst = dst.as_u32;
+    mp->encap_vrf_id = ntohl(encap_vrf_id);
+    mp->decap_vrf_id = ntohl(decap_vrf_id);
+    mp->decap_next_index = ntohl(decap_next_index);
+    mp->is_add = is_add;
+    mp->flags = flags;
+    mp->ver_res = ver_res;
+    mp->res = res;
+    mp->next_protocol = next_protocol;
+    mp->iid = ntohl(iid);
+
+    S; W; 
+
+    /* NOTREACHED */
+    return 0;
+}
+
+
+u8 * format_l2_fib_mac_address (u8 * s, va_list * args)
+{
+  u8 * a = va_arg (*args, u8 *);
+
+  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+                 a[2], a[3], a[4], a[5], a[6], a[7]);
+}
+
+static void vl_api_l2_fib_table_entry_t_handler
+(vl_api_l2_fib_table_entry_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+
+    fformat(vam->ofp, "%3" PRIu32 "    %U    %3" PRIu32
+            "       %d       %d     %d\n",
+            ntohl(mp->bd_id), format_l2_fib_mac_address, &mp->mac,
+            ntohl(mp->sw_if_index), mp->static_mac, mp->filter_mac,
+            mp->bvi_mac);
+}
+
+static void vl_api_l2_fib_table_entry_t_handler_json
+(vl_api_l2_fib_table_entry_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t *node = NULL;
+
+    if (VAT_JSON_ARRAY != vam->json_tree.type) {
+        ASSERT(VAT_JSON_NONE == vam->json_tree.type);
+        vat_json_init_array(&vam->json_tree);
+    }
+    node = vat_json_array_add(&vam->json_tree);
+
+    vat_json_init_object(node);
+    vat_json_object_add_uint(node, "bd_id", ntohl(mp->bd_id));
+    vat_json_object_add_uint(node, "mac", clib_net_to_host_u64(mp->mac));
+    vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
+    vat_json_object_add_uint(node, "static_mac", mp->static_mac);
+    vat_json_object_add_uint(node, "filter_mac", mp->filter_mac);
+    vat_json_object_add_uint(node, "bvi_mac", mp->bvi_mac);
+}
+
+static int api_l2_fib_table_dump (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_l2_fib_table_dump_t *mp;
+    f64 timeout;
+    u32 bd_id;
+    u8 bd_id_set = 0;
+
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "bd_id %d", &bd_id))
+            bd_id_set = 1;
+	else
+            break;
+    }
+
+    if (bd_id_set == 0) {
+        errmsg ("missing bridge domain\n");
+        return -99;
+    }
+
+    fformat(vam->ofp, "BD-ID     Mac Address      sw-ndx  Static  Filter  BVI\n");
+
+    /* Get list of l2 fib entries */
+    M(L2_FIB_TABLE_DUMP, l2_fib_table_dump);
+
+    mp->bd_id = ntohl(bd_id);
+    S;
+
+    /* Use a control ping for synchronization */
+    {
+        vl_api_control_ping_t * mp;
+        M(CONTROL_PING, control_ping);
+        S;
+    }
+    W;
+}
+
+
+static int
+api_interface_name_renumber (vat_main_t * vam)
+{
+    unformat_input_t * line_input = vam->input;
+    vl_api_interface_name_renumber_t *mp;
+    u32 sw_if_index = ~0;
+    f64 timeout;
+    u32 new_show_dev_instance = ~0;
+
+    while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (line_input, "%U", unformat_sw_if_index, vam, 
+                      &sw_if_index))
+            ;
+        else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
+            ;
+        else if (unformat (line_input, "new_show_dev_instance %d", 
+                           &new_show_dev_instance))
+            ;
+        else
+            break;
+    }
+
+    if (sw_if_index == ~0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+    if (new_show_dev_instance == ~0) {
+        errmsg ("missing new_show_dev_instance\n");
+        return -99;
+    }
+
+    M(INTERFACE_NAME_RENUMBER, interface_name_renumber);
+
+    mp->sw_if_index = ntohl (sw_if_index);
+    mp->new_show_dev_instance = ntohl (new_show_dev_instance);
+
+    S; W;
+}
+
+static int
+api_want_ip4_arp_events (vat_main_t * vam)
+{
+    unformat_input_t * line_input = vam->input;
+    vl_api_want_ip4_arp_events_t * mp;
+    f64 timeout;
+    ip4_address_t address;
+    int address_set = 0;
+    u32 enable_disable = 1;
+
+    while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (line_input, "address %U", 
+                      unformat_ip4_address, &address))
+            address_set = 1;
+        else if (unformat (line_input, "del"))
+            enable_disable = 0;
+        else
+            break;
+    }
+    
+    if (address_set == 0) {
+        errmsg ("missing addresses\n");
+        return -99;
+    }
+        
+    M(WANT_IP4_ARP_EVENTS, want_ip4_arp_events);
+    mp->enable_disable = enable_disable;
+    mp->pid = getpid();
+    mp->address = address.as_u32;
+
+    S; W; 
+}
+
+static int api_input_acl_set_interface (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_input_acl_set_interface_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    int sw_if_index_set;
+    u32 ip4_table_index = ~0;
+    u32 ip6_table_index = ~0;
+    u32 l2_table_index = ~0;
+    u8 is_add = 1;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+	else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	    sw_if_index_set = 1;
+        else if (unformat (i, "del"))
+            is_add = 0;
+	else if (unformat (i, "ip4-table %d", &ip4_table_index))
+	    ;
+	else if (unformat (i, "ip6-table %d", &ip6_table_index))
+	    ;
+	else if (unformat (i, "l2-table %d", &l2_table_index))
+	    ;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+    M(INPUT_ACL_SET_INTERFACE, input_acl_set_interface);
+
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->ip4_table_index = ntohl(ip4_table_index);
+    mp->ip6_table_index = ntohl(ip6_table_index);
+    mp->l2_table_index = ntohl(l2_table_index);
+    mp->is_add = is_add;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int
+api_ip_address_dump (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_ip_address_dump_t * mp;
+    u32 sw_if_index = ~0;
+    u8 sw_if_index_set = 0;
+    u8 ipv4_set = 0;
+    u8 ipv6_set = 0;
+    f64 timeout;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "ipv4"))
+            ipv4_set = 1;
+        else if (unformat (i, "ipv6"))
+            ipv6_set = 1;
+        else
+            break;
+    }
+
+    if (ipv4_set && ipv6_set) {
+        errmsg ("ipv4 and ipv6 flags cannot be both set\n");
+        return -99;
+    }
+
+    if ((!ipv4_set) && (!ipv6_set)) {
+        errmsg ("no ipv4 nor ipv6 flag set\n");
+        return -99;
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+    vam->current_sw_if_index = sw_if_index;
+    vam->is_ipv6 = ipv6_set;
+
+    M(IP_ADDRESS_DUMP, ip_address_dump);
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->is_ipv6 = ipv6_set;
+    S;
+
+    /* Use a control ping for synchronization */
+    {
+        vl_api_control_ping_t * mp;
+        M(CONTROL_PING, control_ping);
+        S;
+    }
+    W;
+}
+
+static int
+api_ip_dump (vat_main_t * vam)
+{
+    vl_api_ip_dump_t * mp;
+    unformat_input_t * in = vam->input;
+    int ipv4_set = 0;
+    int ipv6_set = 0;
+    int is_ipv6;
+    f64 timeout;
+    int i;
+
+    while (unformat_check_input (in) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (in, "ipv4"))
+            ipv4_set = 1;
+        else if (unformat (in, "ipv6"))
+            ipv6_set = 1;
+        else
+            break;
+    }
+
+    if (ipv4_set && ipv6_set) {
+        errmsg ("ipv4 and ipv6 flags cannot be both set\n");
+        return -99;
+    }
+
+    if ((!ipv4_set) && (!ipv6_set)) {
+        errmsg ("no ipv4 nor ipv6 flag set\n");
+        return -99;
+    }
+
+    is_ipv6 = ipv6_set;
+    vam->is_ipv6 = is_ipv6;
+
+    /* free old data */
+    for (i = 0; i < vec_len(vam->ip_details_by_sw_if_index[is_ipv6]); i++) {
+        vec_free(vam->ip_details_by_sw_if_index[is_ipv6][i].addr);
+    }
+    vec_free(vam->ip_details_by_sw_if_index[is_ipv6]);
+
+    M(IP_DUMP, ip_dump);
+    mp->is_ipv6 = ipv6_set;
+    S;
+
+    /* Use a control ping for synchronization */
+    {
+        vl_api_control_ping_t * mp;
+        M(CONTROL_PING, control_ping);
+        S;
+    }
+    W;
+}
+
+static int
+api_ipsec_spd_add_del (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_ipsec_spd_add_del_t *mp;
+    f64 timeout;
+    u32 spd_id = ~0;
+    u8 is_add = 1;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+	if (unformat (i, "spd_id %d", &spd_id))
+	    ;
+	else if (unformat (i, "del"))
+	    is_add = 0;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+    if (spd_id == ~0) {
+        errmsg ("spd_id must be set\n");
+        return -99;
+    }
+
+    M(IPSEC_SPD_ADD_DEL, ipsec_spd_add_del);
+
+    mp->spd_id = ntohl(spd_id);
+    mp->is_add = is_add;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int
+api_ipsec_interface_add_del_spd (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_ipsec_interface_add_del_spd_t *mp;
+    f64 timeout;
+    u32 sw_if_index;
+    u8 sw_if_index_set = 0;
+    u32 spd_id = (u32) ~0;
+    u8 is_add = 1;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "del"))
+            is_add = 0;
+	else if (unformat (i, "spd_id %d", &spd_id))
+	    ;
+        else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            sw_if_index_set = 1;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            sw_if_index_set = 1;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+
+    }
+
+    if (spd_id == (u32) ~0) {
+        errmsg ("spd_id must be set\n");
+        return -99;
+    }
+
+    if (sw_if_index_set == 0) {
+        errmsg ("missing interface name or sw_if_index\n");
+        return -99;
+    }
+
+    M(IPSEC_INTERFACE_ADD_DEL_SPD, ipsec_interface_add_del_spd);
+
+    mp->spd_id = ntohl(spd_id);
+    mp->sw_if_index = ntohl (sw_if_index);
+    mp->is_add = is_add;
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int
+api_ipsec_spd_add_del_entry (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_ipsec_spd_add_del_entry_t *mp;
+    f64 timeout;
+    u8 is_add = 1, is_outbound = 0, is_ipv6 = 0, is_ip_any = 1;
+    u32 spd_id, sa_id, protocol = 0, policy = 0;
+    i32 priority;
+    u32 rport_start = 0, rport_stop = (u32) ~0;
+    u32 lport_start = 0, lport_stop = (u32) ~0;
+    ip4_address_t laddr4_start, laddr4_stop, raddr4_start, raddr4_stop;
+    ip6_address_t laddr6_start, laddr6_stop, raddr6_start, raddr6_stop;
+
+    laddr4_start.as_u32 = raddr4_start.as_u32 = 0;
+    laddr4_stop.as_u32 = raddr4_stop.as_u32 = (u32) ~0;
+    laddr6_start.as_u64[0] = raddr6_start.as_u64[0] = 0;
+    laddr6_start.as_u64[1] = raddr6_start.as_u64[1] = 0;
+    laddr6_stop.as_u64[0] = raddr6_stop.as_u64[0] = (u64) ~0;
+    laddr6_stop.as_u64[1] = raddr6_stop.as_u64[1] = (u64) ~0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "del"))
+            is_add = 0;
+        if (unformat (i, "outbound"))
+            is_outbound = 1;
+        if (unformat (i, "inbound"))
+            is_outbound = 0;
+	else if (unformat (i, "spd_id %d", &spd_id))
+	    ;
+	else if (unformat (i, "sa_id %d", &sa_id))
+	    ;
+	else if (unformat (i, "priority %d", &priority))
+	    ;
+	else if (unformat (i, "protocol %d", &protocol))
+	    ;
+	else if (unformat (i, "lport_start %d", &lport_start))
+	    ;
+	else if (unformat (i, "lport_stop %d", &lport_stop))
+	    ;
+	else if (unformat (i, "rport_start %d", &rport_start))
+	    ;
+	else if (unformat (i, "rport_stop %d", &rport_stop))
+	    ;
+        else if (unformat (i, "laddr_start %U", unformat_ip4_address, &laddr4_start))
+          {
+            is_ipv6 = 0;
+            is_ip_any =0;
+          }
+        else if (unformat (i, "laddr_stop %U", unformat_ip4_address, &laddr4_stop))
+          {
+            is_ipv6 = 0;
+            is_ip_any = 0;
+          }
+        else if (unformat (i, "raddr_start %U", unformat_ip4_address, &raddr4_start))
+          {
+            is_ipv6 = 0;
+            is_ip_any = 0;
+          }
+        else if (unformat (i, "raddr_stop %U", unformat_ip4_address, &raddr4_stop))
+          {
+            is_ipv6 = 0;
+            is_ip_any = 0;
+          }
+        else if (unformat (i, "laddr_start %U", unformat_ip6_address, &laddr6_start))
+          {
+            is_ipv6 = 1;
+            is_ip_any = 0;
+          }
+        else if (unformat (i, "laddr_stop %U", unformat_ip6_address, &laddr6_stop))
+          {
+            is_ipv6 = 1;
+            is_ip_any = 0;
+          }
+        else if (unformat (i, "raddr_start %U", unformat_ip6_address, &raddr6_start))
+          {
+            is_ipv6 = 1;
+            is_ip_any = 0;
+          }
+        else if (unformat (i, "raddr_stop %U", unformat_ip6_address, &raddr6_stop))
+          {
+            is_ipv6 = 1;
+            is_ip_any = 0;
+          }
+        else if (unformat (i, "action %U", unformat_ipsec_policy_action, &policy))
+          {
+            if (policy == IPSEC_POLICY_ACTION_RESOLVE) {
+                clib_warning ("unsupported action: 'resolve'");
+                return -99;
+            }
+          }
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+
+    }
+
+    M(IPSEC_SPD_ADD_DEL_ENTRY, ipsec_spd_add_del_entry);
+
+    mp->spd_id = ntohl(spd_id);
+    mp->priority = ntohl(priority);
+    mp->is_outbound = is_outbound;
+
+    mp->is_ipv6 = is_ipv6;
+    if (is_ipv6 || is_ip_any) {
+        memcpy (mp->remote_address_start, &raddr6_start, sizeof(ip6_address_t));
+        memcpy (mp->remote_address_stop, &raddr6_stop, sizeof(ip6_address_t));
+        memcpy (mp->local_address_start, &laddr6_start, sizeof(ip6_address_t));
+        memcpy (mp->local_address_stop, &laddr6_stop, sizeof(ip6_address_t));
+    } else {
+        memcpy (mp->remote_address_start, &raddr4_start, sizeof(ip4_address_t));
+        memcpy (mp->remote_address_stop, &raddr4_stop, sizeof(ip4_address_t));
+        memcpy (mp->local_address_start, &laddr4_start, sizeof(ip4_address_t));
+        memcpy (mp->local_address_stop, &laddr4_stop, sizeof(ip4_address_t));
+    }
+    mp->protocol = (u8) protocol;
+    mp->local_port_start = ntohs((u16) lport_start);
+    mp->local_port_stop = ntohs((u16) lport_stop);
+    mp->remote_port_start = ntohs((u16) rport_start);
+    mp->remote_port_stop = ntohs((u16) rport_stop);
+    mp->policy = (u8) policy;
+    mp->sa_id = ntohl(sa_id);
+    mp->is_add = is_add;
+    mp->is_ip_any = is_ip_any;
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int
+api_ipsec_sad_add_del_entry (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_ipsec_sad_add_del_entry_t *mp;
+    f64 timeout;
+    u32 sad_id, spi;
+    u8 * ck, * ik;
+    u8 is_add = 1;
+
+    u8 protocol = IPSEC_PROTOCOL_AH;
+    u8 is_tunnel = 0, is_tunnel_ipv6 = 0;
+    u32 crypto_alg = 0, integ_alg = 0;
+    ip4_address_t tun_src4;
+    ip4_address_t tun_dst4;
+    ip6_address_t tun_src6;
+    ip6_address_t tun_dst6;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "del"))
+            is_add = 0;
+	else if (unformat (i, "sad_id %d", &sad_id))
+	    ;
+	else if (unformat (i, "spi %d", &spi))
+	    ;
+	else if (unformat (i, "esp"))
+	    protocol = IPSEC_PROTOCOL_ESP;
+        else if (unformat (i, "tunnel_src %U", unformat_ip4_address, &tun_src4)) {
+            is_tunnel = 1;
+            is_tunnel_ipv6 = 0;
+        }
+        else if (unformat (i, "tunnel_dst %U", unformat_ip4_address, &tun_dst4)) {
+            is_tunnel = 1;
+            is_tunnel_ipv6 = 0;
+        }
+        else if (unformat (i, "tunnel_src %U", unformat_ip6_address, &tun_src6)) {
+            is_tunnel = 1;
+            is_tunnel_ipv6 = 1;
+        }
+        else if (unformat (i, "tunnel_dst %U", unformat_ip6_address, &tun_dst6)) {
+            is_tunnel = 1;
+            is_tunnel_ipv6 = 1;
+        }
+        else if (unformat (i, "crypto_alg %U", unformat_ipsec_crypto_alg, &crypto_alg)) {
+            if (crypto_alg < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
+                crypto_alg > IPSEC_INTEG_ALG_SHA_512_256) {
+                clib_warning ("unsupported crypto-alg: '%U'",
+                              format_ipsec_crypto_alg, crypto_alg);
+                return -99;
+            }
+        }
+        else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
+            ;
+        else if (unformat (i, "integ_alg %U", unformat_ipsec_integ_alg, &integ_alg)) {
+            if (integ_alg < IPSEC_INTEG_ALG_SHA1_96 ||
+                integ_alg > IPSEC_INTEG_ALG_SHA_512_256) {
+                clib_warning ("unsupported integ-alg: '%U'",
+                              format_ipsec_integ_alg, integ_alg);
+                return -99;
+            }
+        }
+        else if (unformat (i, "integ_key %U", unformat_hex_string, &ik))
+            ;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+
+    }
+
+    M(IPSEC_SAD_ADD_DEL_ENTRY, ipsec_sad_add_del_entry);
+
+    mp->sad_id = ntohl(sad_id);
+    mp->is_add = is_add;
+    mp->protocol = protocol;
+    mp->spi = ntohl(spi);
+    mp->is_tunnel = is_tunnel;
+    mp->is_tunnel_ipv6 = is_tunnel_ipv6;
+    mp->crypto_algorithm = crypto_alg;
+    mp->integrity_algorithm = integ_alg;
+    mp->crypto_key_length = vec_len(ck);
+    mp->integrity_key_length = vec_len(ik);
+
+    if (mp->crypto_key_length > sizeof(mp->crypto_key))
+      mp->crypto_key_length = sizeof(mp->crypto_key);
+
+    if (mp->integrity_key_length > sizeof(mp->integrity_key))
+      mp->integrity_key_length = sizeof(mp->integrity_key);
+
+    memcpy (mp->crypto_key, ck, mp->crypto_key_length);
+    memcpy (mp->integrity_key, ik, mp->integrity_key_length);
+
+    if (is_tunnel) {
+      if (is_tunnel_ipv6) {
+        memcpy (mp->tunnel_src_address, &tun_src6, sizeof(ip6_address_t));
+        memcpy (mp->tunnel_dst_address, &tun_dst6, sizeof(ip6_address_t));
+      } else {
+        memcpy (mp->tunnel_src_address, &tun_src4, sizeof(ip4_address_t));
+        memcpy (mp->tunnel_dst_address, &tun_dst4, sizeof(ip4_address_t));
+      }
+    }
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int
+api_ipsec_sa_set_key (vat_main_t * vam)
+{
+    unformat_input_t * i = vam->input;
+    vl_api_ipsec_sa_set_key_t *mp;
+    f64 timeout;
+    u32 sa_id;
+    u8 * ck, * ik;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "sa_id %d", &sa_id))
+            ;
+        else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
+            ;
+        else if (unformat (i, "integ_key %U", unformat_hex_string, &ik))
+            ;
+        else {
+            clib_warning ("parse error '%U'", format_unformat_error, i);
+            return -99;
+        }
+    }
+
+    M(IPSEC_SA_SET_KEY, ipsec_set_sa_key);
+
+    mp->sa_id = ntohl(sa_id);
+    mp->crypto_key_length = vec_len(ck);
+    mp->integrity_key_length = vec_len(ik);
+
+    if (mp->crypto_key_length > sizeof(mp->crypto_key))
+      mp->crypto_key_length = sizeof(mp->crypto_key);
+
+    if (mp->integrity_key_length > sizeof(mp->integrity_key))
+      mp->integrity_key_length = sizeof(mp->integrity_key);
+
+    memcpy (mp->crypto_key, ck, mp->crypto_key_length);
+    memcpy (mp->integrity_key, ik, mp->integrity_key_length);
+
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+/*
+ * MAP
+ */
+static int api_map_add_domain (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_map_add_domain_t *mp;
+  f64 timeout;
+
+  ip4_address_t ip4_prefix;
+  ip6_address_t ip6_prefix;
+  ip6_address_t ip6_src;
+  u32 num_m_args = 0;
+  u32 ip6_prefix_len, ip4_prefix_len, ea_bits_len, psid_offset,
+    psid_length;
+  u8 is_translation = 0;
+  u32 mtu = 0;
+  u8 ip6_src_len = 128;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (i, "ip4-pfx %U/%d", unformat_ip4_address,
+		  &ip4_prefix, &ip4_prefix_len))
+      num_m_args++;
+    else if (unformat (i, "ip6-pfx %U/%d", unformat_ip6_address,
+		       &ip6_prefix, &ip6_prefix_len))
+      num_m_args++;
+    else if (unformat (i, "ip6-src %U/%d", unformat_ip6_address, &ip6_src, &ip6_src_len))
+      num_m_args++;
+    else if (unformat (i, "ip6-src %U", unformat_ip6_address, &ip6_src))
+      num_m_args++;
+    else if (unformat (i, "ea-bits-len %d", &ea_bits_len))
+      num_m_args++;
+    else if (unformat (i, "psid-offset %d", &psid_offset))
+      num_m_args++;
+    else if (unformat (i, "psid-len %d", &psid_length))
+      num_m_args++;
+    else if (unformat (i, "mtu %d", &mtu))
+      num_m_args++;
+    else if (unformat (i, "map-t"))
+      is_translation = 1;
+    else {
+      clib_warning ("parse error '%U'", format_unformat_error, i);
+      return -99;
+    }
+  }
+
+  if (num_m_args != 6) {
+    errmsg("mandatory argument(s) missing\n");
+    return -99;
+  }
+
+  /* Construct the API message */
+  M(MAP_ADD_DOMAIN, map_add_domain);
+
+  memcpy(mp->ip4_prefix, &ip4_prefix, sizeof(ip4_prefix));
+  mp->ip4_prefix_len = ip4_prefix_len;
+
+  memcpy(mp->ip6_prefix, &ip6_prefix, sizeof(ip6_prefix));
+  mp->ip6_prefix_len = ip6_prefix_len;
+
+  memcpy(mp->ip6_src, &ip6_src, sizeof(ip6_src));
+  mp->ip6_src_prefix_len = ip6_src_len;
+
+  mp->ea_bits_len = ea_bits_len;
+  mp->psid_offset = psid_offset;
+  mp->psid_length = psid_length;
+  mp->is_translation = is_translation;
+  mp->mtu = htons(mtu);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply, return good/bad news  */
+  W;
+}
+
+static int api_map_del_domain (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_map_del_domain_t *mp;
+  f64 timeout;
+
+  u32 num_m_args = 0;
+  u32 index;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (i, "index %d", &index))
+      num_m_args++;
+    else {
+      clib_warning ("parse error '%U'", format_unformat_error, i);
+      return -99;
+    }
+  }
+
+  if (num_m_args != 1) {
+    errmsg("mandatory argument(s) missing\n");
+    return -99;
+  }
+
+  /* Construct the API message */
+  M(MAP_DEL_DOMAIN, map_del_domain);
+
+  mp->index = ntohl(index);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply, return good/bad news  */
+  W;
+}
+
+static int api_map_add_del_rule (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_map_add_del_rule_t *mp;
+  f64 timeout;
+  u8 is_add = 1;
+  ip6_address_t ip6_dst;
+  u32 num_m_args = 0, index, psid;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (i, "index %d", &index))
+      num_m_args++;
+    else if (unformat (i, "psid %d", &psid))
+      num_m_args++;
+    else if (unformat (i, "dst %U", unformat_ip6_address, &ip6_dst))
+      num_m_args++;
+    else if (unformat (i, "del")) {
+      is_add = 0;
+    } else {
+      clib_warning ("parse error '%U'", format_unformat_error, i);
+      return -99;
+    }
+  }
+
+  /* Construct the API message */
+  M(MAP_ADD_DEL_RULE, map_add_del_rule);
+
+  mp->index = ntohl(index);
+  mp->is_add = is_add;
+  memcpy(mp->ip6_dst, &ip6_dst, sizeof(ip6_dst));
+  mp->psid = ntohs(psid);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply, return good/bad news  */
+  W;
+}
+
+static int api_map_domain_dump (vat_main_t * vam)
+{
+    vl_api_map_domain_dump_t *mp;
+    f64 timeout;
+
+    /* Construct the API message */
+    M(MAP_DOMAIN_DUMP, map_domain_dump);
+
+    /* send it... */
+    S;
+
+    /* Use a control ping for synchronization */
+    {
+        vl_api_control_ping_t * mp;
+        M(CONTROL_PING, control_ping);
+        S;
+    }
+    W;
+}
+
+static int api_map_rule_dump (vat_main_t * vam)
+{
+    unformat_input_t *i = vam->input;
+    vl_api_map_rule_dump_t *mp;
+    f64 timeout;
+    u32 domain_index = ~0;
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "index %u", &domain_index))
+            ;
+        else
+            break;
+    }
+
+    if (domain_index == ~0) {
+        clib_warning("parse error: domain index expected");
+        return -99;
+    }
+
+    /* Construct the API message */
+    M(MAP_RULE_DUMP, map_rule_dump);
+
+    mp->domain_index = htonl(domain_index);
+
+    /* send it... */
+    S;
+
+    /* Use a control ping for synchronization */
+    {
+        vl_api_control_ping_t * mp;
+        M(CONTROL_PING, control_ping);
+        S;
+    }
+    W;
+}
+
+static void vl_api_map_add_domain_reply_t_handler
+(vl_api_map_add_domain_reply_t * mp)
+{
+  vat_main_t * vam = &vat_main;
+  i32 retval = ntohl(mp->retval);
+
+  if (vam->async_mode) {
+      vam->async_errors += (retval < 0);
+  } else {
+      vam->retval = retval;
+      vam->result_ready = 1;
+  }
+}
+
+static void vl_api_map_add_domain_reply_t_handler_json
+(vl_api_map_add_domain_reply_t * mp)
+{
+  vat_main_t * vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object(&node);
+  vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+  vat_json_object_add_uint(&node, "index", ntohl(mp->index));
+
+  vat_json_print(vam->ofp, &node);
+  vat_json_free(&node);
+
+  vam->retval = ntohl(mp->retval);
+  vam->result_ready = 1;
+}
+
+static int
+api_get_first_msg_id (vat_main_t * vam)
+{
+    vl_api_get_first_msg_id_t * mp;
+    f64 timeout;
+    unformat_input_t * i = vam->input;
+    u8 * name;
+    u8 name_set = 0;
+    
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "client %s", &name))
+            name_set = 1;
+        else 
+            break;
+    }
+
+    if (name_set == 0) {
+        errmsg ("missing client name\n");
+        return -99;
+    }
+    vec_add1 (name, 0);
+
+    if (vec_len (name) > 63) {
+        errmsg ("client name too long\n");
+        return -99;
+    }
+
+    M(GET_FIRST_MSG_ID, get_first_msg_id);
+    memcpy (mp->name, name, vec_len(name));
+    S; W;
+    /* NOTREACHED */
+    return 0;
+}
+
+static int q_or_quit (vat_main_t * vam)
+{
+    longjmp (vam->jump_buf, 1);
+    return 0; /* not so much */
+}
+static int q (vat_main_t * vam) {return q_or_quit (vam);}
+static int quit (vat_main_t * vam) {return q_or_quit (vam);}
+
+static int comment (vat_main_t * vam)
+{
+    return 0;
+}
+
+static int help (vat_main_t * vam)
+{
+    u8 ** cmds = 0;
+    u8 * name = 0;
+    hash_pair_t * p;
+    unformat_input_t * i = vam->input;
+    int j;
+
+    if (unformat (i, "%s", &name)) {
+        uword *hs;
+
+        vec_add1(name, 0);
+
+        hs = hash_get_mem (vam->help_by_name, name);
+        if (hs)
+            fformat (vam->ofp, "usage: %s %s\n", name, hs[0]);
+        else
+            fformat (vam->ofp, "No such msg / command '%s'\n", name);
+        vec_free(name);
+        return 0;
+    }
+
+    fformat(vam->ofp, "Help is available for the following:\n");
+
+    hash_foreach_pair (p, vam->function_by_name, 
+    ({
+        vec_add1 (cmds, (u8 *)(p->key));
+    }));
+
+    vec_sort (cmds, c1, c2, 
+              strcmp ((char *)(c1[0]), (char *)(c2[0])));
+
+    for (j = 0; j < vec_len(cmds); j++)
+        fformat (vam->ofp, "%s\n", cmds[j]);
+
+    vec_free (cmds);
+    return 0;
+}
+
+static int set (vat_main_t * vam)
+{
+    u8 * name = 0, * value = 0;
+    unformat_input_t * i = vam->input;
+
+    if (unformat (i, "%s", &name)) {
+        /* The input buffer is a vector, not a string. */
+        value = vec_dup (i->buffer);
+        vec_delete (value, i->index, 0);
+        /* Almost certainly has a trailing newline */
+        if (value[vec_len(value)-1] == '\n')
+            value[vec_len(value)-1] = 0;
+        /* Make sure it's a proper string, one way or the other */
+        vec_add1 (value, 0);
+        (void) clib_macro_set_value (&vam->macro_main, 
+                                     (char *)name, (char *)value);
+    }
+    else
+        errmsg ("usage: set <name> <value>\n");
+
+    vec_free (name);
+    vec_free (value);
+    return 0;
+}
+
+static int unset (vat_main_t * vam)
+{
+    u8 * name = 0;
+
+    if (unformat (vam->input, "%s", &name))
+        if (clib_macro_unset (&vam->macro_main, (char *)name) == 1)
+            errmsg ("unset: %s wasn't set\n", name);
+    vec_free (name);
+    return 0;
+}
+
+typedef struct {
+    u8 * name;
+    u8 * value;
+} macro_sort_t;
+
+
+static int dump_macro_table (vat_main_t * vam)
+{
+    macro_sort_t * sort_me = 0, * sm;    
+    int i;
+    hash_pair_t * p;
+
+    hash_foreach_pair (p, vam->macro_main.the_value_table_hash, 
+    ({
+        vec_add2 (sort_me, sm, 1);
+        sm->name = (u8 *)(p->key);
+        sm->value = (u8 *) (p->value[0]);
+    }));
+    
+    vec_sort (sort_me, s1, s2, strcmp ((char *)(s1->name), (char *)(s2->name)));
+
+    if (vec_len(sort_me))
+        fformat (vam->ofp, "%-15s%s\n", "Name", "Value");
+    else
+        fformat (vam->ofp, "The macro table is empty...\n");
+
+    for (i = 0; i < vec_len (sort_me); i++)
+        fformat (vam->ofp, "%-15s%s\n", sort_me[i].name,
+                 sort_me[i].value);
+    return 0;
+}
+
+static int script (vat_main_t * vam)
+{
+    u8 * s = 0;
+    char * save_current_file;
+    unformat_input_t save_input;
+    jmp_buf save_jump_buf;
+    u32 save_line_number;
+
+    FILE * new_fp, * save_ifp;
+
+    if (unformat (vam->input, "%s", &s)) {
+        new_fp = fopen ((char *)s, "r");
+        if (new_fp == 0) {
+            errmsg ("Couldn't open script file %s\n", s);
+            vec_free (s);
+            return -99;
+        }
+    } else {
+        errmsg ("Missing script name\n");
+        return -99;
+    }
+
+    memcpy (&save_input, &vam->input, sizeof (save_input));
+    memcpy (&save_jump_buf, &vam->jump_buf, sizeof (save_jump_buf));
+    save_ifp = vam->ifp;
+    save_line_number = vam->input_line_number;
+    save_current_file = (char *) vam->current_file;
+
+    vam->input_line_number = 0;
+    vam->ifp = new_fp;
+    vam->current_file = s;
+    do_one_file (vam);
+
+    memcpy (&vam->input, &save_input, sizeof (vam->input));
+    memcpy (&vam->jump_buf, &save_jump_buf, sizeof (save_jump_buf));
+    vam->ifp = save_ifp;
+    vam->input_line_number = save_line_number;
+    vam->current_file = (u8 *) save_current_file;
+    vec_free (s);
+
+    return 0;
+}
+
+static int echo (vat_main_t * vam)
+{
+    fformat (vam->ofp, "%v", vam->input->buffer);
+    return 0;
+}
+
+/* List of API message constructors, CLI names map to api_xxx */
+#define foreach_vpe_api_msg                                             \
+_(create_loopback,"[mac <mac-addr>]")                                   \
+_(sw_interface_dump,"")                                                 \
+_(sw_interface_set_flags,                                               \
+  "<intfc> | sw_if_index <id> admin-up | admin-down link-up | link down") \
+_(sw_interface_add_del_address,                                         \
+  "<intfc> | sw_if_index <id> <ip4-address> | <ip6-address> [del] [del-all] ") \
+_(sw_interface_set_table,                                               \
+  "<intfc> | sw_if_index <id> vrf <table-id> [ipv6]")                   \
+_(sw_interface_set_vpath,                                               \
+  "<intfc> | sw_if_index <id> enable | disable")                        \
+_(sw_interface_set_l2_xconnect,                                         \
+  "rx <intfc> | rx_sw_if_index <id> tx <intfc> | tx_sw_if_index <id>\n" \
+  "enable | disable")                                                   \
+_(sw_interface_set_l2_bridge,                                           \
+  "rx <intfc> | rx_sw_if_index <id> bd_id <bridge-domain-id>\n"         \
+  "[shg <split-horizon-group>] [bvi]\n"                                 \
+  "enable | disable")                                                   \
+_(bridge_domain_add_del,                                                \
+  "bd_id <bridge-domain-id> [flood 1|0] [uu-flood 1|0] [forward 1|0] [learn 1|0] [arp-term 1|0] [del]\n")\
+_(bridge_domain_dump, "[bd_id <bridge-domain-id>]\n")     \
+_(l2fib_add_del,                                                        \
+  "mac <mac-addr> bd_id <bridge-domain-id> [del] | sw_if <intfc> | sw_if_index <id> [static] [filter] [bvi]\n") \
+_(l2_flags,                                                             \
+  "sw_if <intfc> | sw_if_index <id> [learn] [forward] [uu-flood] [flood]\n")       \
+_(bridge_flags,                                                         \
+  "bd_id <bridge-domain-id> [learn] [forward] [uu-flood] [flood] [arp-term] [disable]\n") \
+_(tap_connect,                                                          \
+  "tapname <name> mac <mac-addr> | random-mac")                         \
+_(tap_modify,                                                           \
+  "<vpp-if-name> | sw_if_index <id> tapname <name> mac <mac-addr> | random-mac") \
+_(tap_delete,                                                           \
+  "<vpp-if-name> | sw_if_index <id>")                                   \
+_(sw_interface_tap_dump, "")                                            \
+_(ip_add_del_route,                                                     \
+  "<addr>/<mask> via <addr> [vrf <n>]\n"                                \
+  "[<intfc> | sw_if_index <id>] [resolve-attempts <n>]\n"               \
+  "[weight <n>] [drop] [local] [classify <n>] [del]\n"                  \
+  "[multipath] [count <n>]")                                            \
+_(proxy_arp_add_del,                                                    \
+  "<lo-ip4-addr> - <hi-ip4-addr> [vrf <n>] [del]")                      \
+_(proxy_arp_intfc_enable_disable,                                       \
+  "<intfc> | sw_if_index <id> enable | disable")                        \
+_(mpls_add_del_encap,                                                   \
+  "label <n> dst <ip4-addr> [vrf <n>] [del]")                           \
+_(mpls_add_del_decap,                                                   \
+  "label <n> [rx_vrf_id <n>] [tx_vrf_id] [s-bit-clear][del]")           \
+_(mpls_gre_add_del_tunnel,                                              \
+  "inner_vrf_id <n> outer_vrf_id <n> src <ip4-address> dst <ip4-address>\n" \
+  "adj <ip4-address>/<mask-width> [del]")                               \
+_(sw_interface_set_unnumbered,                                          \
+  "<intfc> | sw_if_index <id> unnum_if_index <id> [del]")               \
+_(ip_neighbor_add_del,                                                  \
+  "<intfc> | sw_if_index <id> dst <ip46-address> mac <mac-addr>")       \
+_(reset_vrf, "vrf <id> [ipv6]")                                         \
+_(create_vlan_subif, "<intfc> | sw_if_index <id> vlan <n>")             \
+_(create_subif, "<intfc> | sw_if_index <id> sub_id <n>\n"               \
+  "[outer_vlan_id <n>][inner_vlan_id <n>]\n"                            \
+  "[no_tags][one_tag][two_tags][dot1ad][exact_match][default_sub]\n"    \
+  "[outer_vlan_id_any][inner_vlan_id_any]")                             \
+_(oam_add_del, "src <ip4-address> dst <ip4-address> [vrf <n>] [del]")   \
+_(reset_fib, "vrf <n> [ipv6]")                                          \
+_(dhcp_proxy_config,                                                    \
+  "svr <v46-address> src <v46-address>\n"                               \
+   "insert-cid <n> [del]")                                              \
+_(dhcp_proxy_config_2,                                                  \
+  "svr <v46-address> src <v46-address>\n"                               \
+   "rx_vrf_id <nn> server_vrf_id <nn> insert-cid <n> [del]")            \
+_(dhcp_proxy_set_vss,                                                   \
+  "tbl_id <n> fib_id <n> oui <n> [ipv6] [del]")                         \
+_(dhcp_client_config,                                                   \
+  "<intfc> | sw_if_index <id> [hostname <name>] [disable_event] [del]") \
+_(set_ip_flow_hash,                                                     \
+  "vrf <n> [src] [dst] [sport] [dport] [proto] [reverse] [ipv6]")       \
+_(sw_interface_ip6_enable_disable,                                      \
+  "<intfc> | sw_if_index <id> enable | disable")                        \
+_(sw_interface_ip6_set_link_local_address,                              \
+  "<intfc> | sw_if_index <id> <ip6-address>/<mask-width>")              \
+_(sw_interface_ip6nd_ra_prefix,                                         \
+  "<intfc> | sw_if_index <id> <ip6-address>/<mask-width>\n"             \
+  "val_life <n> pref_life <n> [def] [noadv] [offl] [noauto]\n"          \
+  "[nolink] [isno]")                                                    \
+_(sw_interface_ip6nd_ra_config,                                         \
+  "<intfc> | sw_if_index <id> [maxint <n>] [minint <n>]\n"              \
+  "[life <n>] [count <n>] [interval <n>] [surpress]\n"                  \
+  "[managed] [other] [ll] [send] [cease] [isno] [def]")                 \
+_(set_arp_neighbor_limit, "arp_nbr_limit <n> [ipv6]")                   \
+_(l2_patch_add_del,                                                     \
+  "rx <intfc> | rx_sw_if_index <id> tx <intfc> | tx_sw_if_index <id>\n" \
+  "enable | disable")                                                   \
+_(mpls_ethernet_add_del_tunnel,                                         \
+  "tx <intfc> | tx_sw_if_index <n> dst <mac-addr>\n"                    \
+  "adj <ip4-addr>/<mw> dst <mac-addr> [del]")                           \
+_(mpls_ethernet_add_del_tunnel_2,                                       \
+  "inner_vrf_id <n> outer_vrf_id <n> next-hop <ip4-addr>\n"             \
+  "resolve-attempts <n> resolve-if-needed 0 | 1 [del]")                 \
+_(sr_tunnel_add_del,                                                    \
+  "src <ip6-addr> dst <ip6-addr>/<mw> (next <ip6-addr>)+\n"             \
+  " [tag <ip6-addr>]* [clean] [reroute]")                               \
+_(classify_add_del_table,                                               \
+  "buckets <nn> [skip <n>] [match <n>] [memory_size <nn-bytes>]\n"	\
+  "[del] mask <mask-value>\n"						\
+  " [l2-miss-next | miss-next | acl-miss-next] <name|nn>") 		\
+_(classify_add_del_session,                                             \
+  "[hit-next|l2-hit-next|acl-hit-next] <name|nn> table-index <nn>\n"    \
+  "skip_n <nn> match_n <nn> match [hex] [l2] [l3 [ip4|ip6]]")		\
+_(classify_set_interface_ip_table,                                      \
+  "<intfc> | sw_if_index <nn> table <nn>")				\
+_(classify_set_interface_l2_tables,                                     \
+  "<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>]\n"      \
+  "  [other-table <nn>]")                                               \
+_(get_node_index, "node <node-name")                                    \
+_(add_node_next, "node <node-name> next <next-node-name>")              \
+_(l2tpv3_create_tunnel,                                                 \
+  "client_address <ip6-addr> our_address <ip6-addr>\n"                  \
+  "[local_session_id <nn>][remote_session_id <nn>][local_cookie <nn>]\n"\
+  "[remote_cookie <nn>]\n[l2-sublayer-preset]\n")                       \
+_(l2tpv3_set_tunnel_cookies,                                            \
+  "<intfc> | sw_if_index <nn> [new_local_cookie <nn>]\n"                \
+  "[new_remote_cookie <nn>]\n")                                         \
+_(l2tpv3_interface_enable_disable,                                      \
+  "<intfc> | sw_if_index <nn> enable | disable")                        \
+_(l2tpv3_set_lookup_key,                                                \
+  "lookup_v6_src | lookup_v6_dst | lookup_session_id")                  \
+_(sw_if_l2tpv3_tunnel_dump, "")                                         \
+_(vxlan_add_del_tunnel,                                                 \
+  "src <ip4-addr> dst <ip4-addr> vni [encap-vrf-id <nn>]\n"             \
+  " [decap-next l2|ip4|ip6] [del]")                                     \
+_(l2_fib_clear_table, "")                                               \
+_(l2_interface_efp_filter, "sw_if_index <nn> enable | disable")         \
+_(l2_interface_vlan_tag_rewrite,                                        \
+  "<intfc> | sw_if_index <nn> \n"                                       \
+  "[disable][push-[1|2]][pop-[1|2]][translate-1-[1|2]] \n"              \
+  "[translate-2-[1|2]] [push_dot1q 0] tag1 <nn> tag2 <nn>")             \
+_(create_vhost_user_if,                                                 \
+        "socket <filename> [server] [renumber <dev_instance>]")         \
+_(modify_vhost_user_if,                                                 \
+        "<intfc> | sw_if_index <nn> socket <filename>\n"                \
+        "[server] [renumber <dev_instance>]")                           \
+_(delete_vhost_user_if, "<intfc> | sw_if_index <nn>")                   \
+_(sw_interface_vhost_user_dump, "")                                     \
+_(show_version, "")                                                     \
+_(nsh_gre_add_del_tunnel,                                               \
+  "src <ip4-addr> dst <ip4-addr>"                                       \
+  "c1 <nn> c2 <nn> c3 <nn> c4 <nn> spi <nn> si <nn>\n"                  \
+  "[encap-fib-id <nn>] [decap-fib-id <nn>] [o-bit <1|0>]\n"             \
+  "[c-bit <1|0>] [md-type <nn>][next-ip4][next-ip6][next-ethernet]\n"   \
+  "[tlv <xx>][del]")							\
+_(nsh_vxlan_gpe_add_del_tunnel,                                         \
+  "src <ip4-addr> dst <ip4-addr> vni <nn>\n"                            \
+  "c1 <nn> c2 <nn> c3 <nn> c4 <nn> spi <nn> si <nn>\n"                  \
+  "[encap-vrf-id <nn>] [decap-vrf-id <nn>] [o-bit <1|0>]\n"             \
+  "[c-bit <1|0>] [md-type <nn>][next-ip4][next-ip6][next-ethernet]\n"   \
+  "[tlv <xx>][del]")							\
+_(l2_fib_table_dump, "bd_id <bridge-domain-id>")			\
+_(lisp_gpe_add_del_tunnel,                                              \
+  "src <ip4-addr> dst <ip4-addr> iid <nn>|iidx <0xnn>\n"                \
+  "[encap-vrf-id <nn>] [decap-vrf-id <nn>]\n"                           \
+  "[n-bit][l-bit][e-bit][v-bit][i-bit][p-bit][not-p-bit][o-bit]\n"      \
+  "[next-ip4][next-ip6][next-ethernet][next-nsh]\n"                     \
+  "[decap-next [ip4|ip6|ethernet|nsh-encap|<nn>]][del]")                \
+_(interface_name_renumber,                                              \
+  "<intfc> | sw_if_index <nn> new_show_dev_instance <nn>")		\
+_(input_acl_set_interface,                                              \
+  "<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>]\n"      \
+  "  [l2-table <nn>] [del]")                                            \
+_(want_ip4_arp_events, "address <ip4-address> [del]")                   \
+_(ip_address_dump, "(ipv4 | ipv6) (<intfc> | sw_if_index <id>)")        \
+_(ip_dump, "ipv4 | ipv6")                                               \
+_(ipsec_spd_add_del, "spd_id <n> [del]")                                \
+_(ipsec_interface_add_del_spd, "(<intfc> | sw_if_index <id>)\n"         \
+  "  spid_id <n> ")                                                     \
+_(ipsec_sad_add_del_entry, "sad_id <n> spi <n> crypto_alg <alg>\n"      \
+  "  crypto_key <hex> tunnel_src <ip4|ip6> tunnel_dst <ip4|ip6>\n"      \
+  "  integ_alg <alg> integ_key <hex>")                                  \
+_(ipsec_spd_add_del_entry, "spd_id <n> priority <n> action <action>\n"  \
+  "  (inbound|outbound) [sa_id <n>] laddr_start <ip4|ip6>\n"            \
+  "  laddr_stop <ip4|ip6> raddr_start <ip4|ip6> raddr_stop <ip4|ip6>\n" \
+  "  [lport_start <n> lport_stop <n>] [rport_start <n> rport_stop <n>]" )\
+_(ipsec_sa_set_key, "sa_id <n> crypto_key <hex> integ_key <hex>")       \
+_(delete_loopback,"sw_if_index <nn>")                                   \
+_(bd_ip_mac_add_del, "bd_id <bridge-domain-id> <ip4/6-addr> <mac-addr> [del]") \
+_(map_add_domain,                                                       \
+  "ip4-pfx <ip4pfx> ip6-pfx <ip6pfx> "					\
+  "ip6-src <ip6addr> "							\
+  "ea-bits-len <n> psid-offset <n> psid-len <n>")			\
+_(map_del_domain, "index <n>")                                          \
+_(map_add_del_rule,                                                     \
+  "index <n> psid <n> dst <ip6addr> [del]")                             \
+_(map_domain_dump, "")                                                  \
+_(map_rule_dump, "index <map-domain>")                                  \
+_(want_interface_events,  "enable|disable")                             \
+_(want_stats,"enable|disable")                                          \
+_(get_first_msg_id, "client <name>")
+
+/* List of command functions, CLI names map directly to functions */
+#define foreach_cli_function                                    \
+_(comment, "usage: comment <ignore-rest-of-line>")		\
+_(dump_interface_table, "usage: dump_interface_table")          \
+_(dump_sub_interface_table, "usage: dump_sub_interface_table")  \
+_(dump_ipv4_table, "usage: dump_ipv4_table")                    \
+_(dump_ipv6_table, "usage: dump_ipv6_table")                    \
+_(dump_stats_table, "usage: dump_stats_table")                  \
+_(dump_macro_table, "usage: dump_macro_table ")                 \
+_(echo, "usage: echo <message>")				\
+_(exec, "usage: exec <vpe-debug-CLI-command>")                  \
+_(help, "usage: help")                                          \
+_(q, "usage: quit")                                             \
+_(quit, "usage: quit")                                          \
+_(set, "usage: set <variable-name> <value>")                    \
+_(script, "usage: script <file-name>")                          \
+_(unset, "usage: unset <variable-name>")
+
+#define _(N,n)                                  \
+    static void vl_api_##n##_t_handler_uni      \
+    (vl_api_##n##_t * mp)                       \
+    {                                           \
+        vat_main_t * vam = &vat_main;           \
+        if (vam->json_output) {                 \
+            vl_api_##n##_t_handler_json(mp);    \
+        } else {                                \
+            vl_api_##n##_t_handler(mp);         \
+        }                                       \
+    }
+foreach_vpe_api_reply_msg;
+#undef _
+
+void vat_api_hookup (vat_main_t *vam)
+{
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler_uni,          \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1); 
+    foreach_vpe_api_reply_msg;
+#undef _
+
+    vl_msg_api_set_first_available_msg_id (VL_MSG_FIRST_AVAILABLE);
+
+    vam->sw_if_index_by_interface_name = 
+        hash_create_string (0, sizeof (uword));
+
+    vam->function_by_name = 
+        hash_create_string (0, sizeof(uword));
+
+    vam->help_by_name = 
+        hash_create_string (0, sizeof(uword));
+
+    /* API messages we can send */
+#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
+    foreach_vpe_api_msg;
+#undef _
+
+    /* Help strings */
+#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
+    foreach_vpe_api_msg;
+#undef _
+
+    /* CLI functions */
+#define _(n,h) hash_set_mem (vam->function_by_name, #n, n);
+    foreach_cli_function;
+#undef _
+
+    /* Help strings */
+#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
+    foreach_cli_function;
+#undef _
+}
+
+#undef vl_api_version
+#define vl_api_version(n,v) static u32 vpe_api_version = v;
+#include <api/vpe.api.h>
+#undef vl_api_version
+
+void vl_client_add_api_signatures (vl_api_memclnt_create_t *mp) 
+{
+    /* 
+     * Send the main API signature in slot 0. This bit of code must
+     * match the checks in ../vpe/api/api.c: vl_msg_api_version_check().
+     */
+    mp->api_versions[0] = clib_host_to_net_u32 (vpe_api_version);
+}
diff --git a/vpp-api-test/vat/json_format.c b/vpp-api-test/vat/json_format.c
new file mode 100644
index 00000000..70447ed9
--- /dev/null
+++ b/vpp-api-test/vat/json_format.c
@@ -0,0 +1,261 @@
+/*
+ *------------------------------------------------------------------
+ * json_format.c
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+
+*/
+#include <inttypes.h>
+#include <vat/json_format.h>
+#include <vnet/ip/ip.h>
+#include <vppinfra/vec.h>
+
+#define VAT_TAB_WIDTH               2
+
+typedef struct vat_print_ctx_s {
+    FILE *ofp;
+    u32 indent;
+} vat_print_ctx_t;
+
+/* Format an IP4 address. */
+static u8 * vat_json_format_ip4_address (u8 * s, va_list * args)
+{
+  u8 * a = va_arg (*args, u8 *);
+  return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
+}
+
+/* Format an IP6 address. */
+static u8 * vat_json_format_ip6_address (u8 * s, va_list * args)
+{
+  ip6_address_t * a = va_arg (*args, ip6_address_t *);
+  u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon;
+
+  i_max_n_zero = ARRAY_LEN (a->as_u16);
+  max_n_zeros = 0;
+  i_first_zero = i_max_n_zero;
+  n_zeros = 0;
+  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+    {
+      u32 is_zero = a->as_u16[i] == 0;
+      if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16))
+        {
+          i_first_zero = i;
+          n_zeros = 0;
+        }
+      n_zeros += is_zero;
+      if ((! is_zero && n_zeros > max_n_zeros)
+          || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
+        {
+          i_max_n_zero = i_first_zero;
+          max_n_zeros = n_zeros;
+          i_first_zero = ARRAY_LEN (a->as_u16);
+          n_zeros = 0;
+        }
+    }
+
+  last_double_colon = 0;
+  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+    {
+      if (i == i_max_n_zero && max_n_zeros > 1)
+        {
+          s = format (s, "::");
+          i += max_n_zeros - 1;
+          last_double_colon = 1;
+        }
+      else
+        {
+          s = format (s, "%s%x",
+                      (last_double_colon || i == 0) ? "" : ":",
+                      clib_net_to_host_u16 (a->as_u16[i]));
+          last_double_colon = 0;
+        }
+    }
+
+  return s;
+}
+
+static void
+vat_json_indent_print (vat_print_ctx_t *ctx)
+{
+    int i;
+    for (i=0; i<ctx->indent * VAT_TAB_WIDTH; i++) {
+        fformat(ctx->ofp, " ");
+    }
+}
+
+static void
+vat_json_indent_line (vat_print_ctx_t * ctx, char * fmt, ...)
+{
+    va_list va;
+
+    vat_json_indent_print(ctx);
+    va_start(va, fmt);
+    va_fformat(ctx->ofp, fmt, &va);
+    va_end(va);
+}
+
+static u8
+is_num_only (vat_json_node_t * p)
+{
+    vat_json_node_t * elem;
+    vec_foreach(elem, p) {
+        if (VAT_JSON_INT != elem->type &&
+                VAT_JSON_UINT != elem->type) {
+            return 0;
+        }
+    }
+    return 1;
+}
+
+static void
+vat_json_print_internal (vat_print_ctx_t *ctx, vat_json_node_t *node)
+{
+#define P(fmt,...) fformat(ctx->ofp, fmt, ##__VA_ARGS__)
+#define PL(fmt,...) fformat(ctx->ofp, fmt"\n", ##__VA_ARGS__)
+#define PPL(fmt,...) vat_json_indent_line(ctx, fmt"\n", ##__VA_ARGS__)
+#define PP(fmt,...) vat_json_indent_line(ctx, fmt, ##__VA_ARGS__)
+#define INCR (ctx->indent++)
+#define DECR (ctx->indent--)
+
+    vat_json_pair_t *pair;
+    u32 i, count;
+    vat_json_node_t *elem;
+    u8 num_only = 0;
+
+    if (!node) {
+        return;
+    }
+
+    switch (node->type) {
+    case VAT_JSON_OBJECT:
+        count = vec_len(node->pairs);
+        if (count >= 1) {
+            PL("{");
+            INCR;
+            for (i=0; i<count; i++) {
+                pair = &node->pairs[i];
+                PP("\"%s\": ", pair->name);
+                vat_json_print_internal(ctx, &pair->value);
+                if (i < count - 1) {
+                    P(",");
+                }
+                PL();
+            }
+            DECR;
+            PP("}");
+        } else { P("{}"); }
+        break;
+    case VAT_JSON_ARRAY:
+        num_only = is_num_only(node->array);
+        count = vec_len(node->array);
+        if (count >= 1) {
+            if (num_only)
+                P("[");
+            else
+                PL("[ ");
+            INCR;
+            for (i=0; i<count; i++) {
+                elem = &node->array[i];
+                if (!num_only) {
+                    vat_json_indent_print(ctx);
+                }
+                vat_json_print_internal(ctx, elem);
+                if (i < count - 1) {
+                    if (num_only) {
+                        P(", ");
+                    } else {
+                        P(",");
+                    }
+                }
+                if (!num_only) PL();
+            }
+            DECR;
+            if (!num_only)
+                PP("]");
+            else
+                P("]");
+        } else { P("[]"); }
+        break;
+    case VAT_JSON_INT:
+        P("%d", node->sint);
+        break;
+    case VAT_JSON_UINT:
+        P("%"PRIu64, node->uint);
+        break;
+    case VAT_JSON_REAL:
+        P("%f", node->real);
+        break;
+    case VAT_JSON_STRING:
+        P("\"%s\"", node->string);
+        break;
+    case VAT_JSON_IPV4:
+        P("\"%U\"", vat_json_format_ip4_address, &node->ip4);
+        break;
+    case VAT_JSON_IPV6:
+        P("\"%U\"", vat_json_format_ip6_address, &node->ip6);
+        break;
+    default:
+        break;
+    }
+#undef PPL
+#undef PP
+#undef PL
+#undef P
+}
+
+void vat_json_print(FILE *ofp, vat_json_node_t *node)
+{
+    vat_print_ctx_t ctx;
+    memset(&ctx, 0, sizeof ctx);
+    ctx.indent = 0;
+    ctx.ofp = ofp;
+    fformat(ofp, "\n");
+    vat_json_print_internal(&ctx, node);
+    fformat(ofp, "\n");
+}
+
+void vat_json_free (vat_json_node_t *node)
+{
+    int i = 0;
+
+    if (NULL == node) {
+        return;
+    }
+    switch (node->type) {
+    case VAT_JSON_OBJECT:
+        for (i = 0; i < vec_len(node->pairs); i++) {
+            vat_json_free(&node->pairs[i].value);
+        }
+        if (NULL != node->pairs) {
+            vec_free(node->pairs);
+        }
+        break;
+    case VAT_JSON_ARRAY:
+        for (i = 0; i < vec_len(node->array); i++) {
+            vat_json_free(&node->array[i]);
+        }
+        if (NULL != node->array) {
+            vec_free(node->array);
+        }
+        break;
+    case VAT_JSON_STRING:
+        if (NULL != node->string) {
+            vec_free(node->string);
+        }
+        break;
+    default:
+        break;
+    }
+}
diff --git a/vpp-api-test/vat/json_format.h b/vpp-api-test/vat/json_format.h
new file mode 100644
index 00000000..5a264d08
--- /dev/null
+++ b/vpp-api-test/vat/json_format.h
@@ -0,0 +1,233 @@
+/*
+ *------------------------------------------------------------------
+ * json_format.h
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef __JSON_FORMAT_H__
+#define __JSON_FORMAT_H__
+
+#include <vppinfra/clib.h>
+#include <vppinfra/format.h>
+#include <netinet/ip.h>
+
+/* JSON value type */
+typedef enum {
+    VAT_JSON_NONE,
+    VAT_JSON_OBJECT,
+    VAT_JSON_ARRAY,
+    VAT_JSON_STRING,
+    VAT_JSON_REAL,
+    VAT_JSON_UINT,
+    VAT_JSON_INT,
+    VAT_JSON_IPV4,
+    VAT_JSON_IPV6,
+    VAT_JSON_MAX
+} vat_json_val_type_t;
+
+typedef struct vat_json_node_s vat_json_node_t;
+typedef struct vat_json_pair_s vat_json_pair_t;
+
+/* JSON object structure */
+struct vat_json_node_s {
+    vat_json_val_type_t type;
+    union {
+        vat_json_pair_t * pairs;
+        vat_json_node_t * array;
+        u8 * string;
+        struct in_addr ip4;
+        struct in6_addr ip6;
+        u64 uint;
+        i64 sint;
+        f64 real;
+    };
+};
+
+struct vat_json_pair_s {
+    const char *name;
+    vat_json_node_t value;
+};
+
+void vat_json_print(FILE *ofp, vat_json_node_t *node);
+void vat_json_free(vat_json_node_t *node);
+
+static_always_inline void vat_json_init_object(vat_json_node_t *json)
+{
+    json->type = VAT_JSON_OBJECT;
+    json->pairs = NULL;
+}
+
+static_always_inline void vat_json_init_array(vat_json_node_t *json)
+{
+    json->type = VAT_JSON_ARRAY;
+    json->array = NULL;
+}
+
+static_always_inline void vat_json_set_string(vat_json_node_t *json, u8 *str)
+{
+    json->type = VAT_JSON_STRING;
+    json->string = str;
+}
+
+static_always_inline void vat_json_set_string_copy(vat_json_node_t *json,
+                                                   const u8 *str)
+{
+    u8 * ns = NULL;
+    vec_validate(ns, strlen((const char *)str));
+    strcpy((char*)ns, (const char*)str);
+    vec_add1(ns, '\0');
+    vat_json_set_string(json, ns);
+}
+
+static_always_inline void vat_json_set_int(vat_json_node_t *json, i64 num)
+{
+    json->type = VAT_JSON_INT;
+    json->sint = num;
+}
+
+static_always_inline void vat_json_set_uint(vat_json_node_t *json, u64 num)
+{
+    json->type = VAT_JSON_UINT;
+    json->uint = num;
+}
+
+static_always_inline void vat_json_set_real(vat_json_node_t *json, f64 real)
+{
+    json->type = VAT_JSON_REAL;
+    json->real = real;
+}
+
+static_always_inline void vat_json_set_ip4(vat_json_node_t *json,
+                                           struct in_addr ip4)
+{
+    json->type = VAT_JSON_IPV4;
+    json->ip4 = ip4;
+}
+
+static_always_inline void vat_json_set_ip6(vat_json_node_t *json,
+                                           struct in6_addr ip6)
+{
+    json->type = VAT_JSON_IPV6;
+    json->ip6 = ip6;
+}
+
+static_always_inline vat_json_node_t* vat_json_object_add(vat_json_node_t *json,
+                                                          const char *name)
+{
+    ASSERT(VAT_JSON_OBJECT == json->type);
+    uword pos = vec_len(json->pairs);
+    vec_validate(json->pairs, pos);
+    json->pairs[pos].name = name;
+    return &json->pairs[pos].value;
+}
+
+static_always_inline vat_json_node_t* vat_json_array_add(vat_json_node_t *json)
+{
+    ASSERT(VAT_JSON_ARRAY == json->type);
+    uword pos = vec_len(json->array);
+    vec_validate(json->array, pos);
+    return &json->array[pos];
+}
+
+static_always_inline vat_json_node_t* vat_json_object_add_list(vat_json_node_t *json,
+                                                               const char *name)
+{
+    vat_json_node_t *array_node = vat_json_object_add(json, name);
+    vat_json_init_array(array_node);
+    return array_node;
+}
+
+static_always_inline void vat_json_object_add_string_copy(vat_json_node_t *json,
+                                                          const char *name,
+                                                          u8 *str)
+{
+    vat_json_set_string_copy(vat_json_object_add(json, name), str);
+}
+
+static_always_inline void vat_json_object_add_uint(vat_json_node_t *json,
+                                                     const char *name,
+                                                     u64 number)
+{
+    vat_json_set_uint(vat_json_object_add(json, name), number);
+}
+
+static_always_inline void vat_json_object_add_int(vat_json_node_t *json,
+                                                     const char *name,
+                                                     i64 number)
+{
+    vat_json_set_int(vat_json_object_add(json, name), number);
+}
+
+static_always_inline void vat_json_object_add_real(vat_json_node_t *json,
+                                                   const char *name, f64 real)
+{
+    vat_json_set_real(vat_json_object_add(json, name), real);
+}
+
+static_always_inline void vat_json_object_add_ip4(vat_json_node_t *json,
+                                                  const char *name,
+                                                  struct in_addr ip4)
+{
+    vat_json_set_ip4(vat_json_object_add(json, name), ip4);
+}
+
+static_always_inline void vat_json_object_add_ip6(vat_json_node_t *json,
+                                                  const char *name,
+                                                  struct in6_addr ip6)
+{
+    vat_json_set_ip6(vat_json_object_add(json, name), ip6);
+}
+
+static_always_inline void vat_json_array_add_int(vat_json_node_t *json,
+                                                 i64 number)
+{
+    vat_json_set_int(vat_json_array_add(json), number);
+}
+
+static_always_inline void vat_json_array_add_uint(vat_json_node_t *json,
+                                                  u64 number)
+{
+    vat_json_set_uint(vat_json_array_add(json), number);
+}
+
+static_always_inline void vat_json_object_add_bytes(vat_json_node_t *json,
+                                                    const char *name,
+                                                    u8 *array, uword size)
+{
+    ASSERT(VAT_JSON_OBJECT == json->type);
+    vat_json_node_t *json_array = vat_json_object_add(json, name);
+    vat_json_init_array(json_array);
+    int i;
+    for (i = 0; i < size; i++) {
+        vat_json_array_add_uint(json_array, array[i]);
+    }
+}
+
+static_always_inline vat_json_node_t*
+vat_json_object_get_element(vat_json_node_t *json, const char *name)
+{
+    int i = 0;
+
+    ASSERT(VAT_JSON_OBJECT == json->type);
+    for (i = 0; i < vec_len(json->pairs); i++) {
+        if (0 == strcmp(json->pairs[i].name, name)) {
+            return &json->pairs[i].value;
+        }
+    }
+    return NULL;
+}
+
+#endif /* __JSON_FORMAT_H__ */
diff --git a/vpp-api-test/vat/json_test.c b/vpp-api-test/vat/json_test.c
new file mode 100644
index 00000000..da069415
--- /dev/null
+++ b/vpp-api-test/vat/json_test.c
@@ -0,0 +1,65 @@
+/*
+ *------------------------------------------------------------------
+ * json_test.c
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vat/vat.h>
+#include <vat/json_format.h>
+
+static void print_json_test(void)
+{
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_string_copy(&node, "str", (u8*)"string-value");
+    vat_json_object_add_uint(&node, "ab", 127);
+    vat_json_object_add_real(&node, "pi", 3.14159f);
+    vat_json_print(stdout, &node);
+    vat_json_free(&node);
+
+    vat_json_init_object(&node);
+    vat_json_node_t *a1 = vat_json_object_add(&node, "a1");
+    vat_json_init_object(a1);
+    vat_json_object_add_uint(a1, "b1", 512);
+    vat_json_object_add_string_copy(a1, "b2", (u8*)"string");
+
+    vat_json_object_add_int(&node, "a2", 2);
+
+    vat_json_node_t *a3 = vat_json_object_add_list(&node, "a3");
+    vat_json_init_array(a3);
+    vat_json_array_add_uint(a3, 1);
+    vat_json_array_add_int(a3, -2);
+    vat_json_array_add_uint(a3, 3);
+
+    vat_json_init_object(vat_json_object_add(&node, "a4"));
+
+    struct in_addr ipv4 = {0};
+    struct in6_addr ipv6 = {{{0}}};
+
+    vat_json_object_add_ip4(&node, "ipv4", ipv4);
+    vat_json_object_add_ip6(&node, "ipv6", ipv6);
+
+    vat_json_print(stdout, &node);
+    vat_json_free(&node);
+}
+
+int main(void)
+{
+    print_json_test();
+    return 0;
+}
diff --git a/vpp-api-test/vat/main.c b/vpp-api-test/vat/main.c
new file mode 100644
index 00000000..e7c25520
--- /dev/null
+++ b/vpp-api-test/vat/main.c
@@ -0,0 +1,282 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "vat.h"
+#include "plugin.h"
+
+vat_main_t vat_main;
+
+int connect_to_vpe(char *name)
+{
+    vat_main_t * vam = &vat_main;
+    api_main_t * am = &api_main;
+
+    if (vl_client_connect_to_vlib("/vpe-api", name, 32) < 0)
+        return -1;
+    
+    vam->vl_input_queue = am->shmem_hdr->vl_input_queue;
+    vam->my_client_index = am->my_client_index;
+
+    return 0;
+}
+
+void vlib_cli_output(struct vlib_main_t * vm, char * fmt, ...)
+{ clib_warning ("BUG");} 
+
+
+static u8 * format_api_error (u8 * s, va_list * args)
+{
+    vat_main_t * vam = va_arg (*args, vat_main_t *);
+    i32 error = va_arg (*args, u32);
+    uword * p;
+
+    p = hash_get (vam->error_string_by_error_number, -error);
+
+    if (p)
+        s = format (s, "%s", p[0]);
+    else
+        s = format (s, "%d", error);
+    return s;
+}
+
+void do_one_file (vat_main_t * vam)
+{
+    int rv;
+    int (*fp)(vat_main_t *vam);
+    int arg_len;
+    unformat_input_t _input;
+    u8 *cmdp, *argsp;
+    uword * p;
+    u8 * this_cmd = 0;
+
+    vam->input = &_input;
+
+    /* Used by the "quit" command handler */
+    if (setjmp (vam->jump_buf) != 0)
+        return;
+    
+    while (1) {
+        if (vam->ifp == stdin) {
+            if (vam->exec_mode == 0)
+                rv = write (1, "vat# ", 5);
+            else
+                rv = write (1, "exec# ", 6);
+        }
+            
+        _vec_len(vam->inbuf) = 4096;
+            
+        if (fgets ((char *)vam->inbuf, vec_len(vam->inbuf), vam->ifp) == 0)
+            break;
+            
+        vam->input_line_number ++;
+
+        vec_free (this_cmd);
+
+        this_cmd = (u8 *) clib_macro_eval (&vam->macro_main, (char *)vam->inbuf,
+                                           1 /* complain */);
+            
+        if (vam->exec_mode == 0) {
+            /* Split input into cmd + args */
+            cmdp = this_cmd;
+        
+            while (cmdp < (this_cmd + vec_len(this_cmd))) {
+                if (*cmdp == ' ' || *cmdp == '\t' || *cmdp == '\n') {
+                    cmdp++;
+                } else
+                    break;
+            }
+            argsp = cmdp;
+            while (argsp < (this_cmd + vec_len(this_cmd))) {
+                if (*argsp != ' ' && *argsp != '\t' && *argsp != '\n') {
+                    argsp++;
+                } else
+                    break;
+            }
+            *argsp++ = 0;
+            while (argsp < (this_cmd + vec_len(this_cmd))) {
+                if (*argsp == ' ' || *argsp == '\t' || *argsp == '\n') {
+                    argsp++;
+                } else
+                    break;
+            }
+            
+            
+            /* Blank input line? */
+            if (*cmdp == 0)
+                continue;
+            
+            p = hash_get_mem (vam->function_by_name, cmdp);
+            if (p == 0) {
+                errmsg ("'%s': function not found\n", cmdp);
+                continue;
+            }
+            
+            arg_len = strlen((char *) argsp);
+            
+            unformat_init_string (vam->input, (char *)argsp, arg_len);
+            fp = (void *)p[0];
+        } else {
+            unformat_init_string (vam->input, (char *) this_cmd, 
+                                  strlen((char *) this_cmd));
+            cmdp = this_cmd;
+            fp = exec;
+        }
+
+        rv = (*fp)(vam);
+        if (rv < 0)
+            errmsg ("%s error: %U\n", cmdp, format_api_error, vam, rv);
+        unformat_free (vam->input);
+
+        if (vam->regenerate_interface_table) {
+            vam->regenerate_interface_table = 0;
+            api_sw_interface_dump (vam);
+        }
+    }
+}
+
+static void init_error_string_table (vat_main_t * vam)
+{
+
+    vam->error_string_by_error_number = hash_create (0, sizeof(uword));
+
+#define _(n,v,s) hash_set (vam->error_string_by_error_number, -v, s);
+    foreach_vnet_api_error;
+#undef _
+
+    hash_set (vam->error_string_by_error_number, 99, "Misc");
+}
+
+static i8 *eval_current_file (macro_main_t *mm, i32 complain)
+{
+    vat_main_t * vam = &vat_main;
+    return ((i8 *) format (0, "%s%c", vam->current_file, 0));
+}
+
+static i8 *eval_current_line (macro_main_t *mm, i32 complain)
+{
+    vat_main_t * vam = &vat_main;
+    return ((i8 *) format (0, "%d%c", vam->input_line_number, 0));
+}
+
+
+int main (int argc, char ** argv)
+{
+    vat_main_t * vam = &vat_main;
+    unformat_input_t _argv, *a = &_argv;
+    u8 **input_files = 0;
+    u8 *output_file = 0;
+    u8 *this_input_file;
+    u8 interactive = 1;
+    u8 json_output = 0;
+    u8 * heap;
+    mheap_t * h;
+    int i;
+
+    clib_mem_init (0, 128<<20);
+
+    heap = clib_mem_get_per_cpu_heap();
+    h = mheap_header (heap);
+      
+    /* make the main heap thread-safe */
+    h->flags |= MHEAP_FLAG_THREAD_SAFE;
+
+    clib_macro_init (&vam->macro_main);
+    clib_macro_add_builtin (&vam->macro_main, "current_file", eval_current_file);
+    clib_macro_add_builtin (&vam->macro_main, "current_line", eval_current_line);
+
+    init_error_string_table (vam);
+
+    unformat_init_command_line (a, argv);
+
+    while (unformat_check_input(a) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (a, "in %s", &this_input_file))
+            vec_add1 (input_files, this_input_file);
+        else if (unformat (a, "out %s", &output_file))
+            ;
+        else if (unformat (a, "script"))
+            interactive = 0;
+        else if (unformat (a, "json"))
+            json_output = 1;
+        else if (unformat (a, "plugin_path %s", (u8 *)&vat_plugin_path))
+            vec_add1 (vat_plugin_path, 0);
+        else if (unformat (a, "plugin_name_filter %s", 
+                           (u8 *)&vat_plugin_name_filter))
+            vec_add1 (vat_plugin_name_filter, 0);
+        else {
+            fformat (stderr, 
+                     "%s: usage [in <f1> ... in <fn>] [out <fn>] [script] [json]\n");
+            exit (1);
+        }
+    }
+
+    if (output_file)
+        vam->ofp = fopen ((char *) output_file, "w");
+    else
+        vam->ofp = stdout;
+
+    if (vam->ofp == NULL) {
+        fformat (stderr, "Couldn't open output file %s\n",
+                 output_file ? (char *) output_file : "stdout");
+        exit (1);
+    }
+
+    clib_time_init (&vam->clib_time);
+
+    vat_api_hookup(vam);
+    vat_plugin_api_reference();
+
+    if (connect_to_vpe("vpe_api_test") < 0) {
+        svm_region_exit();
+        fformat (stderr, "Couldn't connect to vpe, exiting...\n");
+        exit (1);
+    }
+
+    vam->json_output = json_output;
+
+    if (!json_output) {
+        api_sw_interface_dump (vam);
+    }
+
+    vec_validate (vam->inbuf, 4096);
+
+    vam->current_file = (u8 *) "plugin-init";
+    vat_plugin_init (vam);
+
+    for (i = 0; i < vec_len (input_files); i++) {
+        vam->ifp = fopen ((char *) input_files[i], "r");
+        if (vam->ifp == NULL) {
+            fformat (stderr, "Couldn't open input file %s\n",
+                     input_files[i]);
+            continue;
+        }
+        vam->current_file = input_files[i];
+        vam->input_line_number = 0;
+        do_one_file (vam);
+        fclose (vam->ifp);
+    }
+
+    if (output_file)
+        fclose (vam->ofp);
+
+    if (interactive) {
+        vam->ifp = stdin;
+        vam->ofp = stdout;
+        vam->current_file = (u8 *) "interactive";
+        do_one_file (vam);
+        fclose(vam->ifp);
+    }
+
+    vl_client_disconnect_from_vlib();
+    exit (0);
+}
diff --git a/vpp-api-test/vat/plugin.c b/vpp-api-test/vat/plugin.c
new file mode 100644
index 00000000..dca46953
--- /dev/null
+++ b/vpp-api-test/vat/plugin.c
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * plugin.c: plugin handling
+ */
+
+#include <vat/vat.h>
+#include <vat/plugin.h>
+#include <dlfcn.h>
+#include <dirent.h>
+
+plugin_main_t vat_plugin_main;
+
+static int 
+load_one_plugin (plugin_main_t *pm, plugin_info_t *pi)
+{
+  void *handle, *register_handle;
+  clib_error_t * (*fp)(vat_main_t *);
+  clib_error_t * error;
+  
+  handle = dlopen ((char *)pi->name, RTLD_LAZY);
+
+  /* 
+   * Note: this can happen if the plugin has an undefined symbol reference,
+   * so print a warning. Otherwise, the poor slob won't know what happened.
+   * Ask me how I know that...
+   */
+  if (handle == 0)
+    {
+      clib_warning ("%s", dlerror());
+      return -1;
+    }
+  
+  pi->handle = handle;
+
+  register_handle = dlsym (pi->handle, "vat_plugin_register");
+  if (register_handle == 0)
+    return 0;
+
+  fp = register_handle;
+
+  error = (*fp)(pm->vat_main);
+
+  if (error)
+    {
+      clib_error_report (error);
+      dlclose (handle);
+      return 1;
+    }
+
+  clib_warning ("Loaded plugin: %s", pi->name);
+
+  return 0;
+}
+
+static u8 **split_plugin_path (plugin_main_t *pm)
+{
+  int i;
+  u8 **rv = 0;
+  u8 *path = pm->plugin_path;
+  u8 *this = 0;
+
+  for (i = 0; i < vec_len (pm->plugin_path); i++)
+    {
+      if (path[i] != ':')
+        {
+          vec_add1(this, path[i]);
+          continue;
+        }
+      vec_add1(this, 0);
+      vec_add1 (rv, this);
+      this = 0;
+    }
+  if (this)
+    {
+      vec_add1 (this, 0);
+      vec_add1 (rv, this);
+    }
+  return rv;
+}
+
+int vat_load_new_plugins (plugin_main_t *pm)
+{
+  DIR *dp;
+  struct dirent *entry;
+  struct stat statb;
+  uword *p;
+  plugin_info_t *pi;
+  u8 **plugin_path;
+  int i;
+
+  plugin_path = split_plugin_path (pm);
+  
+  for (i = 0; i < vec_len (plugin_path); i++)
+    {
+      dp = opendir ((char *)plugin_path[i]);
+  
+      if (dp == 0)
+        continue;
+      
+      while ((entry = readdir (dp)))
+        {
+          u8 *plugin_name;
+          
+          if (pm->plugin_name_filter)
+            {
+              int j;
+              for (j = 0; j < vec_len (pm->plugin_name_filter); j++)
+                if (entry->d_name[j] != pm->plugin_name_filter[j])
+                  goto next;
+            }
+
+          plugin_name = format (0, "%s/%s%c", plugin_path[i],
+                                entry->d_name, 0);
+          
+          /* unreadable */
+          if (stat ((char *)plugin_name, &statb) < 0)
+            {
+            ignore:
+              vec_free (plugin_name);
+              continue;
+            }
+          
+          /* a dir or other things which aren't plugins */
+          if (!S_ISREG(statb.st_mode))
+            goto ignore;
+          
+          p = hash_get_mem (pm->plugin_by_name_hash, plugin_name);
+          if (p == 0) 
+            {
+              vec_add2 (pm->plugin_info, pi, 1);
+              pi->name = plugin_name;
+              pi->file_info = statb;
+              
+              if (load_one_plugin (pm, pi))
+                {
+                  vec_free (plugin_name);
+                  _vec_len (pm->plugin_info) = vec_len (pm->plugin_info) - 1;
+                  continue;
+                }
+              memset (pi, 0, sizeof (*pi));
+              hash_set_mem (pm->plugin_by_name_hash, plugin_name, 
+                            pi - pm->plugin_info);
+            }
+        next:
+          ;
+        }
+      closedir (dp);
+      vec_free (plugin_path[i]);
+    }
+  vec_free (plugin_path);
+  return 0;
+}
+
+#define QUOTE_(x) #x
+#define QUOTE(x) QUOTE_(x)
+
+/* 
+ * Load plugins from /usr/lib/vpp_api_test_plugins by default
+ */
+char *vat_plugin_path = "/usr/lib/vpp_api_test_plugins";
+                         
+char *vat_plugin_name_filter = 0;
+
+int vat_plugin_init (vat_main_t * vam)
+{
+  plugin_main_t *pm = &vat_plugin_main;
+  
+  clib_warning ("plugin-path %s", vat_plugin_path);
+
+  pm->plugin_path = format (0, "%s%c", vat_plugin_path, 0);
+  if (vat_plugin_name_filter)
+    pm->plugin_name_filter = format (0, "%s%c", vat_plugin_name_filter, 0);
+
+  pm->plugin_by_name_hash = hash_create_string (0, sizeof (uword));
+  pm->vat_main = vam;
+  
+  return vat_load_new_plugins (pm);
+}
diff --git a/vpp-api-test/vat/plugin.h b/vpp-api-test/vat/plugin.h
new file mode 100644
index 00000000..21e9983f
--- /dev/null
+++ b/vpp-api-test/vat/plugin.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * plugin.h: plugin handling
+ */
+
+#ifndef __included_plugin_h__
+#define __included_plugin_h__
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+typedef struct {
+  u8 *name;
+  struct stat file_info;
+  void *handle;
+} plugin_info_t;
+
+typedef struct {
+  /* loaded plugin info */
+  plugin_info_t *plugin_info;
+  uword *plugin_by_name_hash;
+
+  /* path and name filter */
+  u8 *plugin_path;
+  u8 *plugin_name_filter;
+
+  /* convenience */
+  vat_main_t * vat_main;
+  
+} plugin_main_t;
+
+plugin_main_t vat_plugin_main;
+
+int vat_plugin_init (vat_main_t * vam);
+int vat_load_new_plugins (plugin_main_t *pm);
+
+#endif
diff --git a/vpp-api-test/vat/plugin_api.c b/vpp-api-test/vat/plugin_api.c
new file mode 100644
index 00000000..ee11b830
--- /dev/null
+++ b/vpp-api-test/vat/plugin_api.c
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vat/vat.h>
+#include <vnet/ip/ip.h>
+
+uword unformat_sw_if_index (unformat_input_t * input, va_list * args)
+{
+  vat_main_t * vam = va_arg (*args, vat_main_t *);
+  u32 * result = va_arg (*args, u32 *);
+  u8 * if_name;
+  uword * p;
+
+  if (!unformat (input, "%s", &if_name))
+      return 0;
+
+  p = hash_get_mem (vam->sw_if_index_by_interface_name, if_name);
+  if (p == 0)
+      return 0;
+  *result = p[0];
+  return 1;
+}
+
+/* Parse an IP4 address %d.%d.%d.%d. */
+uword unformat_ip4_address (unformat_input_t * input, va_list * args)
+{
+  u8 * result = va_arg (*args, u8 *);
+  unsigned a[4];
+
+  if (! unformat (input, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3]))
+    return 0;
+
+  if (a[0] >= 256 || a[1] >= 256 || a[2] >= 256 || a[3] >= 256)
+    return 0;
+
+  result[0] = a[0];
+  result[1] = a[1];
+  result[2] = a[2];
+  result[3] = a[3];
+
+  return 1;
+}
+
+uword
+unformat_ethernet_address (unformat_input_t * input, va_list * args)
+{
+  u8 * result = va_arg (*args, u8 *);
+  u32 i, a[6];
+
+  if (! unformat (input, "%_%x:%x:%x:%x:%x:%x%_",
+		  &a[0], &a[1], &a[2], &a[3], &a[4], &a[5]))
+    return 0;
+
+  /* Check range. */
+  for (i = 0; i < 6; i++)
+    if (a[i] >= (1 << 8))
+      return 0;
+
+  for (i = 0; i < 6; i++)
+    result[i] = a[i];
+
+  return 1;
+}
+
+/* Returns ethernet type as an int in host byte order. */
+uword
+unformat_ethernet_type_host_byte_order (unformat_input_t * input,
+					va_list * args)
+{
+  u16 * result = va_arg (*args, u16 *);
+  int type;
+
+  /* Numeric type. */
+  if (unformat (input, "0x%x", &type)
+      || unformat (input, "%d", &type))
+    {
+      if (type >= (1 << 16))
+	return 0;
+      *result = type;
+      return 1;
+    }
+  return 0;
+}
+
+/* Parse an IP6 address. */
+uword unformat_ip6_address (unformat_input_t * input, va_list * args)
+{
+  ip6_address_t * result = va_arg (*args, ip6_address_t *);
+  u16 hex_quads[8];
+  uword hex_quad, n_hex_quads, hex_digit, n_hex_digits;
+  uword c, n_colon, double_colon_index;
+
+  n_hex_quads = hex_quad = n_hex_digits = n_colon = 0;
+  double_colon_index = ARRAY_LEN (hex_quads);
+  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
+    {
+      hex_digit = 16;
+      if (c >= '0' && c <= '9')
+	hex_digit = c - '0';
+      else if (c >= 'a' && c <= 'f')
+	hex_digit = c + 10 - 'a';
+      else if (c >= 'A' && c <= 'F')
+	hex_digit = c + 10 - 'A';
+      else if (c == ':' && n_colon < 2)
+	n_colon++;
+      else
+	{
+	  unformat_put_input (input);
+	  break;
+	}
+
+      /* Too many hex quads. */
+      if (n_hex_quads >= ARRAY_LEN (hex_quads))
+	return 0;
+
+      if (hex_digit < 16)
+	{
+	  hex_quad = (hex_quad << 4) | hex_digit;
+
+	  /* Hex quad must fit in 16 bits. */
+	  if (n_hex_digits >= 4)
+	    return 0;
+
+	  n_colon = 0;
+	  n_hex_digits++;
+	}
+      
+      /* Save position of :: */
+      if (n_colon == 2)
+	{
+	  /* More than one :: ? */
+	  if (double_colon_index < ARRAY_LEN (hex_quads))
+	    return 0;
+	  double_colon_index = n_hex_quads;
+	}
+
+      if (n_colon > 0 && n_hex_digits > 0)
+	{
+	  hex_quads[n_hex_quads++] = hex_quad;
+	  hex_quad = 0;
+	  n_hex_digits = 0;
+	}
+    }
+
+  if (n_hex_digits > 0)
+    hex_quads[n_hex_quads++] = hex_quad;
+
+  {
+    word i;
+
+    /* Expand :: to appropriate number of zero hex quads. */
+    if (double_colon_index < ARRAY_LEN (hex_quads))
+      {
+	word n_zero = ARRAY_LEN (hex_quads) - n_hex_quads;
+
+	for (i = n_hex_quads - 1; i >= (signed) double_colon_index; i--)
+	  hex_quads[n_zero + i] = hex_quads[i];
+
+	for (i = 0; i < n_zero; i++)
+	  hex_quads[double_colon_index + i] = 0;
+
+	n_hex_quads = ARRAY_LEN (hex_quads);
+      }
+
+    /* Too few hex quads given. */
+    if (n_hex_quads < ARRAY_LEN (hex_quads))
+      return 0;
+
+    for (i = 0; i < ARRAY_LEN (hex_quads); i++)
+      result->as_u16[i] = clib_host_to_net_u16 (hex_quads[i]);
+
+    return 1;
+  }
+}
+
+u8 * format_ip4_address (u8 * s, va_list * args)
+{
+  u8 * a = va_arg (*args, u8 *);
+  return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
+}
+
+u8 * format_ethernet_address (u8 * s, va_list * args)
+{
+  u8 * a = va_arg (*args, u8 *);
+
+  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+                 a[0], a[1], a[2], a[3], a[4], a[5]);
+}
+
+void vat_plugin_api_reference(void) { }
diff --git a/vpp-api-test/vat/vat.h b/vpp-api-test/vat/vat.h
new file mode 100644
index 00000000..0d012cf2
--- /dev/null
+++ b/vpp-api-test/vat/vat.h
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_vat_h__
+#define __included_vat_h__
+
+#include <stdio.h>
+#include <setjmp.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/format.h>
+#include <vppinfra/error.h>
+#include <vppinfra/time.h>
+#include <vppinfra/macros.h>
+#include <vnet/vnet.h>
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+
+#include "vat/json_format.h"
+
+typedef struct {
+    u8 * interface_name;
+    u32 sw_if_index;
+    /* Subinterface ID. A number 0-N to uniquely identify this subinterface under the super interface*/
+    u32 sub_id;
+
+    /* 0 = dot1q, 1=dot1ad */
+    u8 sub_dot1ad;
+
+    /* Number of tags 0-2 */
+    u8 sub_number_of_tags;
+    u16 sub_outer_vlan_id;
+    u16 sub_inner_vlan_id;
+    u8 sub_exact_match;
+    u8 sub_default;
+    u8 sub_outer_vlan_id_any;
+    u8 sub_inner_vlan_id_any;
+
+    /* vlan tag rewrite */
+    u32 vtr_op;
+    u32 vtr_push_dot1q;
+    u32 vtr_tag1;
+    u32 vtr_tag2;
+} sw_interface_subif_t;
+
+typedef struct {
+    u8 ip[16];
+    u8 prefix_length;
+} ip_address_details_t;
+
+typedef struct {
+    u8 present;
+    ip_address_details_t * addr;
+} ip_details_t;
+
+typedef struct {
+    u64 packets;
+    u64 bytes;
+} interface_counter_t;
+
+typedef struct {
+    struct in_addr address;
+    u8 address_length;
+    u64 packets;
+    u64 bytes;
+} ip4_fib_counter_t;
+
+typedef struct {
+    struct in6_addr address;
+    u8 address_length;
+    u64 packets;
+    u64 bytes;
+} ip6_fib_counter_t;
+
+typedef struct {
+    /* vpe input queue */
+    unix_shared_memory_queue_t * vl_input_queue;
+
+    /* interface name table */
+    uword * sw_if_index_by_interface_name;
+
+    /* subinterface table */
+    sw_interface_subif_t * sw_if_subif_table;
+
+    /* ip tables */
+    ip_details_t * ip_details_by_sw_if_index[2];
+
+    /* sw_if_index of currently processed interface */
+    u32 current_sw_if_index;
+
+    /* remember that we are dumping ipv6 */
+    u8 is_ipv6;
+
+    /* function table */ 
+    uword * function_by_name;
+
+    /* help strings */
+    uword * help_by_name;
+
+    /* macro table */
+    macro_main_t macro_main;
+
+    /* Errors by number */
+    uword * error_string_by_error_number;
+
+    /* Main thread can spin (w/ timeout) here if needed */
+    u32 async_mode;
+    u32 async_errors;
+    volatile u32 result_ready;
+    volatile i32 retval;
+    volatile u8 *shmem_result;
+
+    /* our client index */
+    u32 my_client_index;
+
+    /* Time is of the essence... */
+    clib_time_t clib_time;
+
+    /* Unwind (so we can quit) */
+    jmp_buf jump_buf;
+
+    /* temporary parse buffer */
+    unformat_input_t *input;
+
+    /* input buffer */
+    u8 * inbuf;
+
+    /* stdio input / output FILEs */
+    FILE *ifp, *ofp;
+    u8 * current_file;
+    u32 input_line_number;
+
+    /* exec mode toggle */
+    int exec_mode;
+
+    /* Regenerate the interface table */
+    volatile int regenerate_interface_table;
+
+    /* flag for JSON output format */
+    u8 json_output;
+
+    /* flag for interface event display */
+    u8 interface_event_display;
+
+    /* JSON tree used in composing dump api call results */
+    vat_json_node_t json_tree;
+
+    /* counters */
+    u64 **simple_interface_counters;
+    interface_counter_t **combined_interface_counters;
+    ip4_fib_counter_t **ip4_fib_counters;
+    u32 *ip4_fib_counters_vrf_id_by_index;
+    ip6_fib_counter_t **ip6_fib_counters;
+    u32 *ip6_fib_counters_vrf_id_by_index;
+
+} vat_main_t;
+
+vat_main_t vat_main;
+
+static inline f64 vat_time_now (vat_main_t *vam)
+{
+    return clib_time_now (&vam->clib_time);
+}
+
+#define errmsg(fmt,args...)                             \
+do {                                                    \
+    if(vam->ifp != stdin)                               \
+        fformat(vam->ofp,"%s(%d): ", vam->current_file, \
+                vam->input_line_number);                \
+    fformat(vam->ofp, fmt, ##args);                     \
+    fflush(vam->ofp);					\
+} while(0);
+
+void vat_api_hookup (vat_main_t *vam);
+int api_sw_interface_dump (vat_main_t * vam);
+void do_one_file (vat_main_t * vam);
+int exec (vat_main_t * vam);
+
+/* Plugin API library functions */
+char *vat_plugin_path;
+char *vat_plugin_name_filter;
+void vat_plugin_api_reference(void);
+uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
+uword unformat_ip4_address (unformat_input_t * input, va_list * args);
+uword unformat_ethernet_address (unformat_input_t * input, va_list * args);
+uword unformat_ethernet_type_host_byte_order (unformat_input_t * input,
+                                              va_list * args);
+uword unformat_ip6_address (unformat_input_t * input, va_list * args);
+u8 * format_ip4_address (u8 * s, va_list * args);
+u8 * format_ethernet_address (u8 * s, va_list * args);
+
+
+#endif /* __included_vat_h__ */