X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fapi%2Fcustom_dump.c;h=3c6eada0a0530320389f5541aaa02e406dac538d;hb=02bfd641b;hp=57c8bb3bbfb9f645e4db76d02a5eb2dc91211dc8;hpb=a43ccaefc3bd50c03c90f7c3bee02eac9709df56;p=vpp.git

diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c
index 57c8bb3bbfb..3c6eada0a05 100644
--- a/src/vpp/api/custom_dump.c
+++ b/src/vpp/api/custom_dump.c
@@ -19,9 +19,11 @@
 
 #include <vnet/vnet.h>
 #include <vnet/ip/ip.h>
+#include <vnet/ip/ip_neighbor.h>
+#include <vnet/ip/ip_types_api.h>
+#include <vnet/fib/fib_api.h>
 #include <vnet/unix/tuntap.h>
 #include <vnet/mpls/mpls.h>
-#include <vnet/dhcp/dhcp_proxy.h>
 #include <vnet/l2tp/l2tp.h>
 #include <vnet/l2/l2_input.h>
 #include <vnet/srv6/sr.h>
@@ -34,18 +36,23 @@
 #include <vnet/policer/policer.h>
 #include <vnet/classify/flow_classify.h>
 #include <vlib/vlib.h>
+#include <vlib/pci/pci.h>
 #include <vlib/unix/unix.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
 #include <vnet/lisp-cp/lisp_types.h>
-
-#include <vpp/stats/stats.h>
-#include <vpp/oam/oam.h>
+#include <vnet/qos/qos_types.h>
 
 #include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/ethernet_types_api.h>
 #include <vnet/l2/l2_vtr.h>
 
 #include <vpp/api/vpe_msg_enum.h>
+#include <vpp/api/types.h>
+
+#include <vnet/bonding/node.h>
+
+#include <vnet/format_fns.h>
 
 #define vl_typedefs		/* define message structures */
 #include <vpp/api/vpe_all_api_h.h>
@@ -82,7 +89,7 @@ static void *vl_api_create_loopback_instance_t_print
 
   s = format (0, "SCRIPT: create_loopback ");
   s = format (s, "mac %U ", format_ethernet_address, &mp->mac_address);
-  s = format (s, "instance %d ", ntohl (mp->user_instance));
+  s = format (s, "instance %d ", mp->user_instance);
 
   FINISH;
 }
@@ -93,7 +100,7 @@ static void *vl_api_delete_loopback_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: delete_loopback ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", mp->sw_if_index);
 
   FINISH;
 }
@@ -104,9 +111,9 @@ static void *vl_api_sw_interface_set_flags_t_print
   u8 *s;
   s = format (0, "SCRIPT: sw_interface_set_flags ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", mp->sw_if_index);
 
-  if (mp->admin_up_down)
+  if ((mp->flags) & IF_STATUS_API_FLAG_ADMIN_UP)
     s = format (s, "admin-up ");
   else
     s = format (s, "admin-down ");
@@ -114,20 +121,52 @@ static void *vl_api_sw_interface_set_flags_t_print
   FINISH;
 }
 
+__clib_unused
+  static void *vl_api_sw_interface_set_rx_placement_t_print
+  (vl_api_sw_interface_set_rx_placement_t * mp, void *handle)
+{
+  u8 *s;
+  s = format (0, "SCRIPT: sw_interface_set_rx_placement ");
+
+  s = format (s, "sw_if_index %d ", mp->sw_if_index);
+
+  s = format (s, "queue %d ", mp->queue_id);
+  if (mp->is_main)
+    s = format (s, "main ");
+  else
+    s = format (s, "worker %d ", mp->worker_id);
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_rx_placement_dump_t_print
+  (vl_api_sw_interface_rx_placement_dump_t * mp, void *handle)
+{
+  u8 *s;
+  u32 sw_if_index = (mp->sw_if_index);
+
+  s = format (0, "SCRIPT: sw_interface_rx_placement_dump ");
+
+  if (sw_if_index != ~0)
+    s = format (s, "sw_if_index %d ", sw_if_index);
+
+  FINISH;
+}
+
 static void *vl_api_sw_interface_event_t_print
   (vl_api_sw_interface_event_t * mp, void *handle)
 {
   u8 *s;
   s = format (0, "SCRIPT: sw_interface_event ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
-  if (mp->admin_up_down)
+  if ((mp->flags) & IF_STATUS_API_FLAG_ADMIN_UP)
     s = format (s, "admin-up ");
   else
     s = format (s, "admin-down ");
 
-  if (mp->link_up_down)
+  if ((mp->flags) & IF_STATUS_API_FLAG_LINK_UP)
     s = format (s, "link-up");
   else
     s = format (s, "link-down");
@@ -138,22 +177,15 @@ static void *vl_api_sw_interface_event_t_print
   FINISH;
 }
 
+
 static void *vl_api_sw_interface_add_del_address_t_print
   (vl_api_sw_interface_add_del_address_t * mp, void *handle)
 {
   u8 *s;
 
   s = format (0, "SCRIPT: sw_interface_add_del_address ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  if (mp->is_ipv6)
-    s = format (s, "%U/%d ", format_ip6_address,
-		(ip6_address_t *) mp->address, mp->address_length);
-  else
-    s = format (s, "%U/%d ", format_ip4_address,
-		(ip4_address_t *) mp->address, mp->address_length);
-
+  s = format (s, "sw_if_index %d ", mp->sw_if_index);
+  s = format (s, "%U ", format_vl_api_prefix_t, &mp->prefix);
   if (mp->is_add == 0)
     s = format (s, "del ");
   if (mp->del_all)
@@ -169,10 +201,10 @@ static void *vl_api_sw_interface_set_table_t_print
 
   s = format (0, "SCRIPT: sw_interface_set_table ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   if (mp->vrf_id)
-    s = format (s, "vrf %d ", ntohl (mp->vrf_id));
+    s = format (s, "vrf %d ", (mp->vrf_id));
 
   if (mp->is_ipv6)
     s = format (s, "ipv6 ");
@@ -187,7 +219,7 @@ static void *vl_api_sw_interface_set_mpls_enable_t_print
 
   s = format (0, "SCRIPT: sw_interface_set_mpls_enable ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   if (mp->enable == 0)
     s = format (s, "disable");
@@ -202,7 +234,7 @@ static void *vl_api_sw_interface_set_vpath_t_print
 
   s = format (0, "SCRIPT: sw_interface_set_vpath ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   if (mp->enable)
     s = format (s, "enable ");
@@ -219,7 +251,7 @@ static void *vl_api_sw_interface_set_vxlan_bypass_t_print
 
   s = format (0, "SCRIPT: sw_interface_set_vxlan_bypass ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   if (mp->is_ipv6)
     s = format (s, "ip6 ");
@@ -239,7 +271,7 @@ static void *vl_api_sw_interface_set_geneve_bypass_t_print
 
   s = format (0, "SCRIPT: sw_interface_set_geneve_bypass ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   if (mp->is_ipv6)
     s = format (s, "ip6 ");
@@ -259,11 +291,11 @@ static void *vl_api_sw_interface_set_l2_xconnect_t_print
 
   s = format (0, "SCRIPT: sw_interface_set_l2_xconnect ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->rx_sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->rx_sw_if_index));
 
   if (mp->enable)
     {
-      s = format (s, "tx_sw_if_index %d ", ntohl (mp->tx_sw_if_index));
+      s = format (s, "tx_sw_if_index %d ", (mp->tx_sw_if_index));
     }
   else
     s = format (s, "delete ");
@@ -278,12 +310,16 @@ static void *vl_api_sw_interface_set_l2_bridge_t_print
 
   s = format (0, "SCRIPT: sw_interface_set_l2_bridge ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->rx_sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->rx_sw_if_index));
 
   if (mp->enable)
     {
-      s = format (s, "bd_id %d shg %d %senable ", ntohl (mp->bd_id),
-		  mp->shg, ((mp->bvi) ? "bvi " : " "));
+      s = format (s, "bd_id %d shg %d ", (mp->bd_id), mp->shg);
+      if (L2_API_PORT_TYPE_BVI == (mp->port_type))
+	s = format (s, "bvi ");
+      if (L2_API_PORT_TYPE_UU_FWD == (mp->port_type))
+	s = format (s, "uu-fwd ");
+      s = format (s, "enable");
     }
   else
     s = format (s, "disable ");
@@ -298,7 +334,7 @@ static void *vl_api_bridge_domain_add_del_t_print
 
   s = format (0, "SCRIPT: bridge_domain_add_del ");
 
-  s = format (s, "bd_id %d ", ntohl (mp->bd_id));
+  s = format (s, "bd_id %d ", (mp->bd_id));
 
   if (mp->is_add)
     {
@@ -321,7 +357,7 @@ static void *vl_api_bridge_domain_set_mac_age_t_print
 
   s = format (0, "SCRIPT: bridge_domain_set_mac_age ");
 
-  s = format (s, "bd_id %d ", ntohl (mp->bd_id));
+  s = format (s, "bd_id %d ", (mp->bd_id));
 
   s = format (s, "mac-age %d", mp->mac_age);
 
@@ -332,7 +368,7 @@ static void *vl_api_bridge_domain_dump_t_print
   (vl_api_bridge_domain_dump_t * mp, void *handle)
 {
   u8 *s;
-  u32 bd_id = ntohl (mp->bd_id);
+  u32 bd_id = (mp->bd_id);
 
   s = format (0, "SCRIPT: bridge_domain_dump ");
 
@@ -357,7 +393,7 @@ static void *vl_api_l2fib_flush_bd_t_print
   (vl_api_l2fib_flush_bd_t * mp, void *handle)
 {
   u8 *s;
-  u32 bd_id = ntohl (mp->bd_id);
+  u32 bd_id = (mp->bd_id);
 
   s = format (0, "SCRIPT: l2fib_flush_bd ");
   s = format (s, "bd_id %d ", bd_id);
@@ -369,7 +405,7 @@ static void *vl_api_l2fib_flush_int_t_print
   (vl_api_l2fib_flush_int_t * mp, void *handle)
 {
   u8 *s;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
+  u32 sw_if_index = (mp->sw_if_index);
 
   s = format (0, "SCRIPT: l2fib_flush_int ");
   s = format (s, "sw_if_index %d ", sw_if_index);
@@ -386,12 +422,12 @@ static void *vl_api_l2fib_add_del_t_print
 
   s = format (s, "mac %U ", format_ethernet_address, mp->mac);
 
-  s = format (s, "bd_id %d ", ntohl (mp->bd_id));
+  s = format (s, "bd_id %d ", (mp->bd_id));
 
 
   if (mp->is_add)
     {
-      s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+      s = format (s, "sw_if_index %d ", (mp->sw_if_index));
       if (mp->static_mac)
 	s = format (s, "%s", "static ");
       if (mp->filter_mac)
@@ -411,11 +447,11 @@ static void *
 vl_api_l2_flags_t_print (vl_api_l2_flags_t * mp, void *handle)
 {
   u8 *s;
-  u32 flags = ntohl (mp->feature_bitmap);
+  u32 flags = (mp->feature_bitmap);
 
   s = format (0, "SCRIPT: l2_flags ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   if (flags & L2_LEARN)
     s = format (s, "learn ");
@@ -438,21 +474,21 @@ static void *vl_api_bridge_flags_t_print
   (vl_api_bridge_flags_t * mp, void *handle)
 {
   u8 *s;
-  u32 flags = ntohl (mp->feature_bitmap);
+  u32 flags = (mp->flags);
 
   s = format (0, "SCRIPT: bridge_flags ");
 
-  s = format (s, "bd_id %d ", ntohl (mp->bd_id));
+  s = format (s, "bd_id %d ", (mp->bd_id));
 
-  if (flags & L2_LEARN)
+  if (flags & BRIDGE_API_FLAG_LEARN)
     s = format (s, "learn ");
-  if (flags & L2_FWD)
+  if (flags & BRIDGE_API_FLAG_FWD)
     s = format (s, "forward ");
-  if (flags & L2_FLOOD)
+  if (flags & BRIDGE_API_FLAG_FLOOD)
     s = format (s, "flood ");
-  if (flags & L2_UU_FLOOD)
+  if (flags & BRIDGE_API_FLAG_UU_FLOOD)
     s = format (s, "uu-flood ");
-  if (flags & L2_ARP_TERM)
+  if (flags & BRIDGE_API_FLAG_ARP_TERM)
     s = format (s, "arp-term ");
 
   if (mp->is_set == 0)
@@ -467,84 +503,34 @@ static void *vl_api_bd_ip_mac_add_del_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: bd_ip_mac_add_del ");
-  s = format (s, "bd_id %d ", ntohl (mp->bd_id));
-
-  if (mp->is_ipv6)
-    s = format (s, "%U ", format_ip6_address,
-		(ip6_address_t *) mp->ip_address);
-  else
-    s = format (s, "%U ", format_ip4_address,
-		(ip4_address_t *) mp->ip_address);
+  s = format (s, "bd_id %d ", (mp->entry.bd_id));
 
-  s = format (s, "%U ", format_ethernet_address, mp->mac_address);
+  s = format (s, "%U ", format_vl_api_address, &mp->entry.ip);
+  s = format (s, "%U ", format_vl_api_mac_address, &mp->entry.mac);
   if (mp->is_add == 0)
     s = format (s, "del ");
 
   FINISH;
 }
 
-static void *vl_api_tap_connect_t_print
-  (vl_api_tap_connect_t * mp, void *handle)
+static void *vl_api_bd_ip_mac_flush_t_print
+  (vl_api_bd_ip_mac_flush_t * mp, void *handle)
 {
   u8 *s;
-  u8 null_mac[6];
 
-  memset (null_mac, 0, sizeof (null_mac));
+  s = format (0, "SCRIPT: bd_ip_mac_flush ");
+  s = format (s, "bd_id %d ", (mp->bd_id));
 
-  s = format (0, "SCRIPT: tap_connect ");
-  s = format (s, "tapname %s ", mp->tap_name);
-  if (mp->use_random_mac)
-    s = format (s, "random-mac ");
-  if (mp->tag[0])
-    s = format (s, "tag %s ", mp->tag);
-  if (memcmp (mp->mac_address, null_mac, 6))
-    s = format (s, "mac %U ", format_ethernet_address, mp->mac_address);
-  if (mp->ip4_address_set)
-    s = format (s, "address %U/%d ", format_ip4_address, mp->ip4_address,
-		mp->ip4_mask_width);
-  if (mp->ip6_address_set)
-    s = format (s, "address %U/%d ", format_ip6_address, mp->ip6_address,
-		mp->ip6_mask_width);
   FINISH;
 }
 
-static void *vl_api_tap_modify_t_print
-  (vl_api_tap_modify_t * mp, void *handle)
+__clib_unused
+  static void *vl_api_bd_ip_mac_dump_t_print
+  (vl_api_bd_ip_mac_dump_t * mp, void *handle)
 {
   u8 *s;
-  u8 null_mac[6];
-
-  memset (null_mac, 0, sizeof (null_mac));
 
-  s = format (0, "SCRIPT: tap_modify ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-  s = format (s, "tapname %s ", mp->tap_name);
-  if (mp->use_random_mac)
-    s = format (s, "random-mac ");
-
-  if (memcmp (mp->mac_address, null_mac, 6))
-    s = format (s, "mac %U ", format_ethernet_address, mp->mac_address);
-
-  FINISH;
-}
-
-static void *vl_api_tap_delete_t_print
-  (vl_api_tap_delete_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: tap_delete ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_tap_dump_t_print
-  (vl_api_sw_interface_tap_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_tap_dump ");
+  s = format (0, "SCRIPT: bd_ip_mac_dump ");
 
   FINISH;
 }
@@ -555,10 +541,10 @@ static void *vl_api_tap_create_v2_t_print
   u8 *s;
   u8 null_mac[6];
 
-  memset (null_mac, 0, sizeof (null_mac));
+  clib_memset (null_mac, 0, sizeof (null_mac));
 
   s = format (0, "SCRIPT: tap_create_v2 ");
-  s = format (s, "id %s ", mp->id);
+  s = format (s, "id %u ", (mp->id));
   if (memcmp (mp->mac_address, null_mac, 6))
     s = format (s, "mac-address %U ",
 		format_ethernet_address, mp->mac_address);
@@ -582,9 +568,13 @@ static void *vl_api_tap_create_v2_t_print
   if (mp->host_ip6_gw_set)
     s = format (s, "host-ip6-gw %U ", format_ip6_address, mp->host_ip6_addr);
   if (mp->tx_ring_sz)
-    s = format (s, "tx-ring-size %d ", mp->tx_ring_sz);
+    s = format (s, "tx-ring-size %u ", (mp->tx_ring_sz));
   if (mp->rx_ring_sz)
-    s = format (s, "rx-ring-size %d ", mp->rx_ring_sz);
+    s = format (s, "rx-ring-size %u ", (mp->rx_ring_sz));
+  if (mp->host_mtu_set)
+    s = format (s, "host-mtu-size %u ", (mp->host_mtu_size));
+  if ((mp->tap_flags) & 0x1)
+    s = format (s, "gso-enabled");
   FINISH;
 }
 
@@ -594,7 +584,7 @@ static void *vl_api_tap_delete_v2_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: tap_delete_v2 ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   FINISH;
 }
@@ -609,52 +599,221 @@ static void *vl_api_sw_interface_tap_v2_dump_t_print
   FINISH;
 }
 
-static void *vl_api_ip_add_del_route_t_print
-  (vl_api_ip_add_del_route_t * mp, void *handle)
+__clib_unused
+  static void *vl_api_virtio_pci_create_t_print
+  (vl_api_virtio_pci_create_t * mp, void *handle)
+{
+  u8 *s;
+  u8 null_mac[6];
+
+  clib_memset (null_mac, 0, sizeof (null_mac));
+
+  s = format (0, "SCRIPT: virtio_pci_create ");
+  s = format (s, "pci_addr %U ", format_vlib_pci_addr, (mp->pci_addr));
+  if (memcmp (mp->mac_address, null_mac, 6))
+    s = format (s, "mac-address %U ",
+		format_ethernet_address, mp->mac_address);
+  if (mp->features)
+    s = format (s, "features 0x%llx ", clib_net_to_host_u64 (mp->features));
+  if (mp->gso_enabled)
+    s = format (s, "gso-enabled");
+  FINISH;
+}
+
+__clib_unused
+  static void *vl_api_virtio_pci_delete_t_print
+  (vl_api_virtio_pci_delete_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: virtio_pci_delete ");
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+
+  FINISH;
+}
+
+__clib_unused
+  static void *vl_api_sw_interface_virtio_pci_dump_t_print
+  (vl_api_sw_interface_virtio_pci_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_virtio_pci_dump ");
+
+  FINISH;
+}
+
+static void *vl_api_bond_create_t_print
+  (vl_api_bond_create_t * mp, void *handle)
+{
+  u8 *s;
+  u8 null_mac[6];
+
+  clib_memset (null_mac, 0, sizeof (null_mac));
+
+  s = format (0, "SCRIPT: bond_create ");
+  if (memcmp (mp->mac_address, null_mac, 6))
+    s = format (s, "mac-address %U ",
+		format_ethernet_address, mp->mac_address);
+  if (mp->mode)
+    s = format (s, "mode %U ", format_bond_mode, ntohl (mp->mode));
+  if (mp->lb)
+    s = format (s, "lb %U ", format_bond_load_balance, ntohl (mp->lb));
+  if (mp->numa_only)
+    s = format (s, "numa-only is set in lacp mode");
+  if (mp->id != ~0)
+    s = format (s, "id %u ", (mp->id));
+  FINISH;
+}
+
+static void *vl_api_bond_delete_t_print
+  (vl_api_bond_delete_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: bond_delete ");
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+
+  FINISH;
+}
+
+static void *vl_api_bond_enslave_t_print
+  (vl_api_bond_enslave_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: bond_enslave ");
+  s = format (s, "bond_sw_if_index %u ", (mp->bond_sw_if_index));
+  s = format (s, "sw_if_index %u ", (mp->sw_if_index));
+  if (mp->is_passive)
+    s = format (s, "passive ");
+  if (mp->is_long_timeout)
+    s = format (s, "long-timeout ");
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_set_bond_weight_t_print
+  (vl_api_sw_interface_set_bond_weight_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_set_bond_weight ");
+  s = format (s, "sw_if_index %u ", ntohl (mp->sw_if_index));
+  s = format (s, "weight %u ", ntohl (mp->weight));
+
+  FINISH;
+}
+
+static void *vl_api_bond_detach_slave_t_print
+  (vl_api_bond_detach_slave_t * mp, void *handle)
 {
   u8 *s;
 
-  s = format (0, "SCRIPT: ip_add_del_route ");
+  s = format (0, "SCRIPT: bond_detach_slave ");
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_bond_dump_t_print
+  (vl_api_sw_interface_bond_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_bond_dump ");
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_slave_dump_t_print
+  (vl_api_sw_interface_slave_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_slave_dump ");
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+
+  FINISH;
+}
+
+static void *vl_api_ip_route_add_del_t_print
+  (vl_api_ip_route_add_del_t * mp, void *handle)
+{
+  u8 *s, p;
+
+  s = format (0, "SCRIPT: ip_route_add_del ");
   if (mp->is_add == 0)
     s = format (s, "del ");
 
-  if (mp->next_hop_sw_if_index)
-    s = format (s, "sw_if_index %d ", ntohl (mp->next_hop_sw_if_index));
+  s = format (s, "%U", format_vl_api_prefix, &mp->route.prefix);
 
-  if (mp->is_ipv6)
-    s = format (s, "%U/%d ", format_ip6_address, mp->dst_address,
-		mp->dst_address_length);
+  for (p = 0; p < mp->route.n_paths; p++)
+    s = format (s, " [%U]", format_vl_api_fib_path, &mp->route.paths[p]);
+
+  FINISH;
+}
+
+static void *vl_api_mpls_route_add_del_t_print
+  (vl_api_mpls_route_add_del_t * mp, void *handle)
+{
+  u8 *s, p;
+
+  s = format (0, "SCRIPT: mpls_route_add_del ");
+
+  if (mp->mr_is_add)
+    s = format (s, "add ");
   else
-    s = format (s, "%U/%d ", format_ip4_address, mp->dst_address,
-		mp->dst_address_length);
-  if (mp->is_local)
-    s = format (s, "local ");
-  else if (mp->is_drop)
-    s = format (s, "drop ");
-  else if (mp->is_classify)
-    s = format (s, "classify %d", ntohl (mp->classify_table_index));
+    s = format (s, "del ");
+
+  s = format (s, "table %d ", (mp->mr_route.mr_table_id));
+  s = format (s, "%d ", (mp->mr_route.mr_label));
+
+  if (mp->mr_route.mr_eos)
+    s = format (s, "eos ");
   else
-    {
-      if (mp->is_ipv6)
-	s = format (s, "via %U ", format_ip6_address, mp->next_hop_address);
-      else
-	s = format (s, "via %U ", format_ip4_address, mp->next_hop_address);
-    }
+    s = format (s, "non-eos ");
 
-  if (mp->table_id != 0)
-    s = format (s, "vrf %d ", ntohl (mp->table_id));
+  if (mp->mr_route.mr_is_multicast)
+    s = format (s, "multicast ");
 
-  if (mp->next_hop_weight != 1)
-    s = format (s, "weight %d ", mp->next_hop_weight);
+  for (p = 0; p < mp->mr_route.mr_n_paths; p++)
+    s =
+      format (s, " [%U]", format_vl_api_fib_path, &mp->mr_route.mr_paths[p]);
 
-  if (mp->is_multipath)
-    s = format (s, "multipath ");
 
-  if (mp->is_multipath)
-    s = format (s, "multipath ");
+  FINISH;
+}
 
-  if (mp->next_hop_table_id)
-    s = format (s, "lookup-in-vrf %d ", ntohl (mp->next_hop_table_id));
+static void *vl_api_ip_table_add_del_t_print
+  (vl_api_ip_table_add_del_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ip_table_add_del ");
+  if (mp->is_add)
+    s = format (s, "add ");
+  else
+    s = format (s, "del ");
+  if (mp->table.is_ip6)
+    s = format (s, "ip6 ");
+  s = format (s, "table %d ", (mp->table.table_id));
+  s = format (s, "%s ", mp->table.name);
+
+  FINISH;
+}
+
+static void *vl_api_mpls_table_add_del_t_print
+  (vl_api_mpls_table_add_del_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: mpls_table_add_del ");
+  if (mp->mt_is_add)
+    s = format (s, "add ");
+  else
+    s = format (s, "del ");
+  s = format (s, "table %d ", (mp->mt_table.mt_table_id));
 
   FINISH;
 }
@@ -666,11 +825,11 @@ static void *vl_api_proxy_arp_add_del_t_print
 
   s = format (0, "SCRIPT: proxy_arp_add_del ");
 
-  s = format (s, "%U - %U ", format_ip4_address, mp->low_address,
-	      format_ip4_address, mp->hi_address);
+  s = format (s, "%U - %U ",
+	      format_vl_api_ip4_address, mp->proxy.low,
+	      format_vl_api_ip4_address, mp->proxy.hi);
 
-  if (mp->vrf_id)
-    s = format (s, "vrf %d ", ntohl (mp->vrf_id));
+  s = format (s, "table %d ", (mp->proxy.table_id));
 
   if (mp->is_add == 0)
     s = format (s, "del ");
@@ -685,7 +844,7 @@ static void *vl_api_proxy_arp_intfc_enable_disable_t_print
 
   s = format (0, "SCRIPT: proxy_arp_intfc_enable_disable ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   s = format (s, "enable %d ", mp->enable_disable);
 
@@ -695,23 +854,63 @@ static void *vl_api_proxy_arp_intfc_enable_disable_t_print
 static void *vl_api_mpls_tunnel_add_del_t_print
   (vl_api_mpls_tunnel_add_del_t * mp, void *handle)
 {
-  u8 *s;
+  u8 *s, p;
 
   s = format (0, "SCRIPT: mpls_tunnel_add_del ");
 
-  if (mp->mt_next_hop_sw_if_index)
-    s = format (s, "sw_if_index %d ", ntohl (mp->mt_next_hop_sw_if_index));
-
-  if (mp->mt_next_hop_proto_is_ip4)
-    s = format (s, "%U ", format_ip4_address, mp->mt_next_hop);
+  if (mp->mt_is_add == 0)
+    s = format (s, "del sw_if_index %d ", (mp->mt_tunnel.mt_sw_if_index));
   else
-    s = format (s, "%U ", format_ip6_address, mp->mt_next_hop);
+    s = format (s, "sw_if_index %d ", (mp->mt_tunnel.mt_sw_if_index));
+
 
-  if (mp->mt_l2_only)
+  if (mp->mt_tunnel.mt_l2_only)
     s = format (s, "l2-only ");
+  if (mp->mt_tunnel.mt_is_multicast)
+    s = format (s, "multicast ");
+  if (mp->mt_tunnel.mt_tunnel_index)
+    s = format (s, "tunnel-index ");
 
-  if (mp->mt_is_add == 0)
-    s = format (s, "del ");
+  for (p = 0; p < mp->mt_tunnel.mt_n_paths; p++)
+    s = format (s, " [%U]", format_vl_api_fib_path,
+		&mp->mt_tunnel.mt_paths[p]);
+
+  FINISH;
+}
+
+static void *vl_api_sr_mpls_policy_add_t_print
+  (vl_api_sr_mpls_policy_add_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sr_mpls_policy_add ");
+
+  s = format (s, "bsid %d ", (mp->bsid));
+
+  if (mp->weight != htonl ((u32) 1))
+    s = format (s, "%d ", (mp->weight));
+
+  if (mp->type)
+    s = format (s, "spray ");
+
+  if (mp->n_segments)
+    {
+      int i;
+      for (i = 0; i < mp->n_segments; i++)
+	s = format (s, "next %d ", (mp->segments[i]));
+    }
+
+  FINISH;
+}
+
+static void *vl_api_sr_mpls_policy_del_t_print
+  (vl_api_sr_mpls_policy_del_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sr_mpls_policy_del ");
+
+  s = format (s, "bsid %d ", (mp->bsid));
 
   FINISH;
 }
@@ -723,9 +922,9 @@ static void *vl_api_sw_interface_set_unnumbered_t_print
 
   s = format (0, "SCRIPT: sw_interface_set_unnumbered ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
-  s = format (s, "unnum_if_index %d ", ntohl (mp->unnumbered_sw_if_index));
+  s = format (s, "unnum_if_index %d ", (mp->unnumbered_sw_if_index));
 
   if (mp->is_add == 0)
     s = format (s, "del ");
@@ -737,31 +936,21 @@ static void *vl_api_ip_neighbor_add_del_t_print
   (vl_api_ip_neighbor_add_del_t * mp, void *handle)
 {
   u8 *s;
-  u8 null_mac[6];
-
-  memset (null_mac, 0, sizeof (null_mac));
 
   s = format (0, "SCRIPT: ip_neighbor_add_del ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->neighbor.sw_if_index));
 
-  if (mp->is_static)
+  if (IP_API_NEIGHBOR_FLAG_STATIC & (mp->neighbor.flags))
     s = format (s, "is_static ");
 
-  if (mp->is_no_adj_fib)
+  if (IP_API_NEIGHBOR_FLAG_NO_FIB_ENTRY & (mp->neighbor.flags))
     s = format (s, "is_no_fib_entry ");
 
-  if (memcmp (mp->mac_address, null_mac, 6))
-    s = format (s, "mac %U ", format_ethernet_address, mp->mac_address);
+  s = format (s, "mac %U ", format_vl_api_mac_address,
+	      &mp->neighbor.mac_address);
 
-  if (mp->is_ipv6)
-    s =
-      format (s, "dst %U ", format_ip6_address,
-	      (ip6_address_t *) mp->dst_address);
-  else
-    s =
-      format (s, "dst %U ", format_ip4_address,
-	      (ip4_address_t *) mp->dst_address);
+  s = format (s, "dst %U ", format_vl_api_address, &mp->neighbor.ip_address);
 
   if (mp->is_add == 0)
     s = format (s, "del ");
@@ -769,6 +958,7 @@ static void *vl_api_ip_neighbor_add_del_t_print
   FINISH;
 }
 
+
 static void *vl_api_create_vlan_subif_t_print
   (vl_api_create_vlan_subif_t * mp, void *handle)
 {
@@ -777,23 +967,23 @@ static void *vl_api_create_vlan_subif_t_print
   s = format (0, "SCRIPT: create_vlan_subif ");
 
   if (mp->sw_if_index)
-    s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+    s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   if (mp->vlan_id)
-    s = format (s, "vlan_id %d ", ntohl (mp->vlan_id));
+    s = format (s, "vlan_id %d ", (mp->vlan_id));
 
   FINISH;
 }
 
-#define foreach_create_subif_bit                \
-_(no_tags)                                      \
-_(one_tag)                                      \
-_(two_tags)                                     \
-_(dot1ad)                                       \
-_(exact_match)                                  \
-_(default_sub)                                  \
-_(outer_vlan_id_any)                            \
-_(inner_vlan_id_any)
+#define foreach_create_subif_flag		\
+_(0, "no_tags")					\
+_(1, "one_tag")					\
+_(2, "two_tags")				\
+_(3, "dot1ad")					\
+_(4, "exact_match")				\
+_(5, "default_sub")				\
+_(6, "outer_vlan_id_any")			\
+_(7, "inner_vlan_id_any")
 
 static void *vl_api_create_subif_t_print
   (vl_api_create_subif_t * mp, void *handle)
@@ -802,18 +992,18 @@ static void *vl_api_create_subif_t_print
 
   s = format (0, "SCRIPT: create_subif ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
-  s = format (s, "sub_id %d ", ntohl (mp->sub_id));
+  s = format (s, "sub_id %d ", (mp->sub_id));
 
   if (mp->outer_vlan_id)
-    s = format (s, "outer_vlan_id %d ", ntohs (mp->outer_vlan_id));
+    s = format (s, "outer_vlan_id %d ", (mp->outer_vlan_id));
 
   if (mp->inner_vlan_id)
-    s = format (s, "inner_vlan_id %d ", ntohs (mp->inner_vlan_id));
+    s = format (s, "inner_vlan_id %d ", (mp->inner_vlan_id));
 
-#define _(a) if (mp->a) s = format (s, "%s ", #a);
-  foreach_create_subif_bit;
+#define _(a,b) if (mp->sub_if_flags & (1 << a)) s = format (s, "%s ", b);
+  foreach_create_subif_flag;
 #undef _
 
   FINISH;
@@ -825,27 +1015,7 @@ static void *vl_api_delete_subif_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: delete_subif ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  FINISH;
-}
-
-static void *vl_api_oam_add_del_t_print
-  (vl_api_oam_add_del_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: oam_add_del ");
-
-  if (mp->vrf_id)
-    s = format (s, "vrf %d ", ntohl (mp->vrf_id));
-
-  s = format (s, "src %U ", format_ip4_address, mp->src_address);
-
-  s = format (s, "dst %U ", format_ip4_address, mp->dst_address);
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   FINISH;
 }
@@ -858,7 +1028,7 @@ vl_api_reset_fib_t_print (vl_api_reset_fib_t * mp, void *handle)
   s = format (0, "SCRIPT: reset_fib ");
 
   if (mp->vrf_id)
-    s = format (s, "vrf %d ", ntohl (mp->vrf_id));
+    s = format (s, "vrf %d ", (mp->vrf_id));
 
   if (mp->is_ipv6 != 0)
     s = format (s, "ipv6 ");
@@ -866,84 +1036,6 @@ vl_api_reset_fib_t_print (vl_api_reset_fib_t * mp, void *handle)
   FINISH;
 }
 
-static void *vl_api_dhcp_proxy_config_t_print
-  (vl_api_dhcp_proxy_config_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: dhcp_proxy_config_2 ");
-
-  s = format (s, "rx_vrf_id %d ", ntohl (mp->rx_vrf_id));
-  s = format (s, "server_vrf_id %d ", ntohl (mp->server_vrf_id));
-
-  if (mp->is_ipv6)
-    {
-      s = format (s, "svr %U ", format_ip6_address,
-		  (ip6_address_t *) mp->dhcp_server);
-      s = format (s, "src %U ", format_ip6_address,
-		  (ip6_address_t *) mp->dhcp_src_address);
-    }
-  else
-    {
-      s = format (s, "svr %U ", format_ip4_address,
-		  (ip4_address_t *) mp->dhcp_server);
-      s = format (s, "src %U ", format_ip4_address,
-		  (ip4_address_t *) mp->dhcp_src_address);
-    }
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_dhcp_proxy_set_vss_t_print
-  (vl_api_dhcp_proxy_set_vss_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: dhcp_proxy_set_vss ");
-
-  s = format (s, "tbl_id %d ", ntohl (mp->tbl_id));
-
-  if (mp->vss_type == VSS_TYPE_VPN_ID)
-    {
-      s = format (s, "fib_id %d ", ntohl (mp->vpn_index));
-      s = format (s, "oui %d ", ntohl (mp->oui));
-    }
-  else if (mp->vss_type == VSS_TYPE_ASCII)
-    s = format (s, "vpn_ascii_id %s", mp->vpn_ascii_id);
-
-  if (mp->is_ipv6 != 0)
-    s = format (s, "ipv6 ");
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_dhcp_client_config_t_print
-  (vl_api_dhcp_client_config_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: dhcp_client_config ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  s = format (s, "hostname %s ", mp->hostname);
-
-  s = format (s, "want_dhcp_event %d ", mp->want_dhcp_event);
-
-  s = format (s, "pid %d ", ntohl (mp->pid));
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-
 static void *vl_api_set_ip_flow_hash_t_print
   (vl_api_set_ip_flow_hash_t * mp, void *handle)
 {
@@ -951,7 +1043,7 @@ static void *vl_api_set_ip_flow_hash_t_print
 
   s = format (0, "SCRIPT: set_ip_flow_hash ");
 
-  s = format (s, "vrf_id %d ", ntohl (mp->vrf_id));
+  s = format (s, "vrf_id %d ", (mp->vrf_id));
 
   if (mp->src)
     s = format (s, "src ");
@@ -977,20 +1069,6 @@ static void *vl_api_set_ip_flow_hash_t_print
   FINISH;
 }
 
-static void *vl_api_sw_interface_ip6_set_link_local_address_t_print
-  (vl_api_sw_interface_ip6_set_link_local_address_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_ip6_set_link_local_address ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  s = format (s, "%U ", format_ip6_address, mp->address);
-
-  FINISH;
-}
-
 static void *vl_api_sw_interface_ip6nd_ra_prefix_t_print
   (vl_api_sw_interface_ip6nd_ra_prefix_t * mp, void *handle)
 {
@@ -998,14 +1076,13 @@ static void *vl_api_sw_interface_ip6nd_ra_prefix_t_print
 
   s = format (0, "SCRIPT: sw_interface_ip6nd_ra_prefix ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
-  s = format (s, "%U/%d ", format_ip6_address, mp->address,
-	      mp->address_length);
+  s = format (s, "%U ", format_vl_api_prefix, &mp->prefix);
 
-  s = format (s, "val_life %d ", ntohl (mp->val_lifetime));
+  s = format (s, "val_life %d ", (mp->val_lifetime));
 
-  s = format (s, "pref_life %d ", ntohl (mp->pref_lifetime));
+  s = format (s, "pref_life %d ", (mp->pref_lifetime));
 
   if (mp->use_default)
     s = format (s, "def ");
@@ -1035,17 +1112,17 @@ static void *vl_api_sw_interface_ip6nd_ra_config_t_print
 
   s = format (0, "SCRIPT: sw_interface_ip6nd_ra_config ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
-  s = format (s, "maxint %d ", ntohl (mp->max_interval));
+  s = format (s, "maxint %d ", (mp->max_interval));
 
-  s = format (s, "minint %d ", ntohl (mp->min_interval));
+  s = format (s, "minint %d ", (mp->min_interval));
 
-  s = format (s, "life %d ", ntohl (mp->lifetime));
+  s = format (s, "life %d ", (mp->lifetime));
 
-  s = format (s, "count %d ", ntohl (mp->initial_count));
+  s = format (s, "count %d ", (mp->initial_count));
 
-  s = format (s, "interval %d ", ntohl (mp->initial_interval));
+  s = format (s, "interval %d ", (mp->initial_interval));
 
   if (mp->suppress)
     s = format (s, "suppress ");
@@ -1081,7 +1158,7 @@ static void *vl_api_set_arp_neighbor_limit_t_print
 
   s = format (0, "SCRIPT: set_arp_neighbor_limit ");
 
-  s = format (s, "arp_nbr_limit %d ", ntohl (mp->arp_neighbor_limit));
+  s = format (s, "arp_nbr_limit %d ", (mp->arp_neighbor_limit));
 
   if (mp->is_ipv6 != 0)
     s = format (s, "ipv6 ");
@@ -1096,9 +1173,9 @@ static void *vl_api_l2_patch_add_del_t_print
 
   s = format (0, "SCRIPT: l2_patch_add_del ");
 
-  s = format (s, "rx_sw_if_index %d ", ntohl (mp->rx_sw_if_index));
+  s = format (s, "rx_sw_if_index %d ", (mp->rx_sw_if_index));
 
-  s = format (s, "tx_sw_if_index %d ", ntohl (mp->tx_sw_if_index));
+  s = format (s, "tx_sw_if_index %d ", (mp->tx_sw_if_index));
 
   if (mp->is_add == 0)
     s = format (s, "del ");
@@ -1118,7 +1195,7 @@ static void *vl_api_sr_localsid_add_del_t_print
     {
     case SR_BEHAVIOR_END:
       s = format (s, "Address: %U\nBehavior: End",
-		  format_ip6_address, (ip6_address_t *) mp->localsid_addr);
+		  format_ip6_address, (ip6_address_t *) mp->localsid.addr);
       s = format (s, (mp->end_psp ? "End.PSP: True" : "End.PSP: False"));
       break;
     case SR_BEHAVIOR_X:
@@ -1126,9 +1203,9 @@ static void *vl_api_sr_localsid_add_del_t_print
 	format (s,
 		"Address: %U\nBehavior: X (Endpoint with Layer-3 cross-connect)"
 		"\nIface: %U\nNext hop: %U", format_ip6_address,
-		(ip6_address_t *) mp->localsid_addr,
-		format_vnet_sw_if_index_name, vnm, ntohl (mp->sw_if_index),
-		format_ip6_address, (ip6_address_t *) mp->nh_addr);
+		(ip6_address_t *) mp->localsid.addr,
+		format_vnet_sw_if_index_name, vnm, (mp->sw_if_index),
+		format_ip6_address, (ip6_address_t *) mp->nh_addr6);
       s = format (s, (mp->end_psp ? "End.PSP: True" : "End.PSP: False"));
       break;
     case SR_BEHAVIOR_DX4:
@@ -1136,46 +1213,46 @@ static void *vl_api_sr_localsid_add_del_t_print
 	format (s,
 		"Address: %U\nBehavior: DX4 (Endpoint with decapsulation with IPv4 cross-connect)"
 		"\nIface: %U\nNext hop: %U", format_ip6_address,
-		(ip6_address_t *) mp->localsid_addr,
-		format_vnet_sw_if_index_name, vnm, ntohl (mp->sw_if_index),
-		format_ip4_address, (ip4_address_t *) mp->nh_addr);
+		(ip6_address_t *) mp->localsid.addr,
+		format_vnet_sw_if_index_name, vnm, (mp->sw_if_index),
+		format_ip4_address, (ip4_address_t *) mp->nh_addr4);
       break;
     case SR_BEHAVIOR_DX6:
       s =
 	format (s,
 		"Address: %U\nBehavior: DX6 (Endpoint with decapsulation with IPv6 cross-connect)"
 		"\nIface: %UNext hop: %U", format_ip6_address,
-		(ip6_address_t *) mp->localsid_addr,
-		format_vnet_sw_if_index_name, vnm, ntohl (mp->sw_if_index),
-		format_ip6_address, (ip6_address_t *) mp->nh_addr);
+		(ip6_address_t *) mp->localsid.addr,
+		format_vnet_sw_if_index_name, vnm, (mp->sw_if_index),
+		format_ip6_address, (ip6_address_t *) mp->nh_addr6);
       break;
     case SR_BEHAVIOR_DX2:
       s =
 	format (s,
 		"Address: %U\nBehavior: DX2 (Endpoint with decapulation and Layer-2 cross-connect)"
 		"\nIface: %U", format_ip6_address,
-		(ip6_address_t *) mp->localsid_addr,
-		format_vnet_sw_if_index_name, vnm, ntohl (mp->sw_if_index));
+		(ip6_address_t *) mp->localsid.addr,
+		format_vnet_sw_if_index_name, vnm, (mp->sw_if_index));
       break;
     case SR_BEHAVIOR_DT6:
       s =
 	format (s,
 		"Address: %U\nBehavior: DT6 (Endpoint with decapsulation and specific IPv6 table lookup)"
 		"\nTable: %u", format_ip6_address,
-		(ip6_address_t *) mp->localsid_addr, ntohl (mp->fib_table));
+		(ip6_address_t *) mp->localsid.addr, (mp->fib_table));
       break;
     case SR_BEHAVIOR_DT4:
       s =
 	format (s,
 		"Address: %U\nBehavior: DT4 (Endpoint with decapsulation and specific IPv4 table lookup)"
 		"\nTable: %u", format_ip6_address,
-		(ip6_address_t *) mp->localsid_addr, ntohl (mp->fib_table));
+		(ip6_address_t *) mp->localsid.addr, (mp->fib_table));
       break;
     default:
       if (mp->behavior >= SR_BEHAVIOR_LAST)
 	{
 	  s = format (s, "Address: %U\n Behavior: %u",
-		      format_ip6_address, (ip6_address_t *) mp->localsid_addr,
+		      format_ip6_address, (ip6_address_t *) mp->localsid.addr,
 		      mp->behavior);
 	}
       else
@@ -1198,15 +1275,15 @@ static void *vl_api_sr_steering_add_del_t_print
   switch (mp->traffic_type)
     {
     case SR_STEER_L2:
-      s = format (s, "Traffic type: L2 iface: %u", ntohl (mp->sw_if_index));
+      s = format (s, "Traffic type: L2 iface: %u", (mp->sw_if_index));
       break;
     case SR_STEER_IPV4:
       s = format (s, "Traffic type: IPv4 %U/%u", format_ip4_address,
-		  (ip4_address_t *) mp->prefix_addr, ntohl (mp->mask_width));
+		  (ip4_address_t *) mp->prefix_addr, (mp->mask_width));
       break;
     case SR_STEER_IPV6:
       s = format (s, "Traffic type: IPv6 %U/%u", format_ip6_address,
-		  (ip6_address_t *) mp->prefix_addr, ntohl (mp->mask_width));
+		  (ip6_address_t *) mp->prefix_addr, (mp->mask_width));
       break;
     default:
       s = format (s, "Traffic type: Unknown(%u)", mp->traffic_type);
@@ -1215,9 +1292,9 @@ static void *vl_api_sr_steering_add_del_t_print
   s = format (s, "BindingSID: %U", format_ip6_address,
 	      (ip6_address_t *) mp->bsid_addr);
 
-  s = format (s, "SR Policy Index: %u", ntohl (mp->sr_policy_index));
+  s = format (s, "SR Policy Index: %u", (mp->sr_policy_index));
 
-  s = format (s, "FIB_table: %u", ntohl (mp->table_id));
+  s = format (s, "FIB_table: %u", (mp->table_id));
 
   FINISH;
 }
@@ -1228,10 +1305,10 @@ static void *vl_api_sr_policy_add_t_print
   u8 *s;
 
   ip6_address_t *segments = 0, *seg;
-  ip6_address_t *this_address = (ip6_address_t *) mp->segments;
+  ip6_address_t *this_address = (ip6_address_t *) mp->sids.sids;
 
   int i;
-  for (i = 0; i < mp->n_segments; i++)
+  for (i = 0; i < mp->sids.num_sids; i++)
     {
       vec_add2 (segments, seg, 1);
       clib_memcpy (seg->as_u8, this_address->as_u8, sizeof (*this_address));
@@ -1248,11 +1325,11 @@ static void *vl_api_sr_policy_add_t_print
 	    (mp->is_encap ? "Behavior: Encapsulation" :
 	     "Behavior: SRH insertion"));
 
-  s = format (s, "FIB_table: %u", ntohl (mp->fib_table));
+  s = format (s, "FIB_table: %u", (mp->fib_table));
 
   s = format (s, (mp->type ? "Type: Default" : "Type: Spray"));
 
-  s = format (s, "SID list weight: %u", ntohl (mp->weight));
+  s = format (s, "SID list weight: %u", (mp->weight));
 
   s = format (s, "{");
   vec_foreach (seg, segments)
@@ -1270,10 +1347,10 @@ static void *vl_api_sr_policy_mod_t_print
   u8 *s;
 
   ip6_address_t *segments = 0, *seg;
-  ip6_address_t *this_address = (ip6_address_t *) mp->segments;
+  ip6_address_t *this_address = (ip6_address_t *) mp->sids.sids;
 
   int i;
-  for (i = 0; i < mp->n_segments; i++)
+  for (i = 0; i < mp->sids.num_sids; i++)
     {
       vec_add2 (segments, seg, 1);
       clib_memcpy (seg->as_u8, this_address->as_u8, sizeof (*this_address));
@@ -1285,13 +1362,13 @@ static void *vl_api_sr_policy_mod_t_print
   s = format (s, "BSID: %U", format_ip6_address,
 	      (ip6_address_t *) mp->bsid_addr);
 
-  s = format (s, "SR Policy index: %u", ntohl (mp->sr_policy_index));
+  s = format (s, "SR Policy index: %u", (mp->sr_policy_index));
 
   s = format (s, "Operation: %u", mp->operation);
 
-  s = format (s, "SID list index: %u", ntohl (mp->sl_index));
+  s = format (s, "SID list index: %u", (mp->sl_index));
 
-  s = format (s, "SID list weight: %u", ntohl (mp->weight));
+  s = format (s, "SID list weight: %u", (mp->weight));
 
   s = format (s, "{");
   vec_foreach (seg, segments)
@@ -1323,23 +1400,22 @@ static void *vl_api_classify_add_del_table_t_print
 
   if (mp->is_add == 0)
     {
-      s = format (s, "table %d ", ntohl (mp->table_index));
+      s = format (s, "table %d ", (mp->table_index));
       s = format (s, "%s ", mp->del_chain ? "del-chain" : "del");
     }
   else
     {
-      s = format (s, "nbuckets %d ", ntohl (mp->nbuckets));
-      s = format (s, "memory_size %d ", ntohl (mp->memory_size));
-      s = format (s, "skip %d ", ntohl (mp->skip_n_vectors));
-      s = format (s, "match %d ", ntohl (mp->match_n_vectors));
-      s = format (s, "next-table %d ", ntohl (mp->next_table_index));
-      s = format (s, "miss-next %d ", ntohl (mp->miss_next_index));
-      s = format (s, "current-data-flag %d ", ntohl (mp->current_data_flag));
+      s = format (s, "nbuckets %d ", (mp->nbuckets));
+      s = format (s, "memory_size %d ", (mp->memory_size));
+      s = format (s, "skip %d ", (mp->skip_n_vectors));
+      s = format (s, "match %d ", (mp->match_n_vectors));
+      s = format (s, "next-table %d ", (mp->next_table_index));
+      s = format (s, "miss-next %d ", (mp->miss_next_index));
+      s = format (s, "current-data-flag %d ", (mp->current_data_flag));
       if (mp->current_data_flag)
-	s = format (s, "current-data-offset %d ",
-		    ntohl (mp->current_data_offset));
+	s = format (s, "current-data-offset %d ", (mp->current_data_offset));
       s = format (s, "mask hex ");
-      for (i = 0; i < ntohl (mp->match_n_vectors) * sizeof (u32x4); i++)
+      for (i = 0; i < (mp->match_n_vectors) * sizeof (u32x4); i++)
 	s = format (s, "%02x", mp->mask[i]);
       vec_add1 (s, ' ');
     }
@@ -1355,13 +1431,13 @@ static void *vl_api_classify_add_del_session_t_print
 
   s = format (0, "SCRIPT: classify_add_del_session ");
 
-  s = format (s, "table_index %d ", ntohl (mp->table_index));
-  s = format (s, "hit_next_index %d ", ntohl (mp->hit_next_index));
-  s = format (s, "opaque_index %d ", ntohl (mp->opaque_index));
-  s = format (s, "advance %d ", ntohl (mp->advance));
+  s = format (s, "table_index %d ", (mp->table_index));
+  s = format (s, "hit_next_index %d ", (mp->hit_next_index));
+  s = format (s, "opaque_index %d ", (mp->opaque_index));
+  s = format (s, "advance %d ", (mp->advance));
   s = format (s, "action %d ", mp->action);
   if (mp->action)
-    s = format (s, "metadata %d ", ntohl (mp->metadata));
+    s = format (s, "metadata %d ", (mp->metadata));
   if (mp->is_add == 0)
     s = format (s, "del ");
 
@@ -1391,8 +1467,8 @@ static void *vl_api_classify_set_interface_ip_table_t_print
   if (mp->is_ipv6)
     s = format (s, "ipv6 ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-  s = format (s, "table %d ", ntohl (mp->table_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+  s = format (s, "table %d ", (mp->table_index));
 
   FINISH;
 }
@@ -1404,10 +1480,10 @@ static void *vl_api_classify_set_interface_l2_tables_t_print
 
   s = format (0, "SCRIPT: classify_set_interface_l2_tables ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-  s = format (s, "ip4-table %d ", ntohl (mp->ip4_table_index));
-  s = format (s, "ip6-table %d ", ntohl (mp->ip6_table_index));
-  s = format (s, "other-table %d ", ntohl (mp->other_table_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+  s = format (s, "ip4-table %d ", (mp->ip4_table_index));
+  s = format (s, "ip6-table %d ", (mp->ip6_table_index));
+  s = format (s, "other-table %d ", (mp->other_table_index));
   s = format (s, "is-input %d ", mp->is_input);
 
   FINISH;
@@ -1435,8 +1511,8 @@ static void *vl_api_l2tpv3_create_tunnel_t_print
   s = format (s, "client_address %U our_address %U ",
 	      format_ip6_address, (ip6_address_t *) (mp->client_address),
 	      format_ip6_address, (ip6_address_t *) (mp->our_address));
-  s = format (s, "local_session_id %d ", ntohl (mp->local_session_id));
-  s = format (s, "remote_session_id %d ", ntohl (mp->remote_session_id));
+  s = format (s, "local_session_id %d ", (mp->local_session_id));
+  s = format (s, "remote_session_id %d ", (mp->remote_session_id));
   s = format (s, "local_cookie %lld ",
 	      clib_net_to_host_u64 (mp->local_cookie));
   s = format (s, "remote_cookie %lld ",
@@ -1454,7 +1530,7 @@ static void *vl_api_l2tpv3_set_tunnel_cookies_t_print
 
   s = format (0, "SCRIPT: l2tpv3_set_tunnel_cookies ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   s = format (s, "new_local_cookie %llu ",
 	      clib_net_to_host_u64 (mp->new_local_cookie));
@@ -1472,7 +1548,7 @@ static void *vl_api_l2tpv3_interface_enable_disable_t_print
 
   s = format (0, "SCRIPT: l2tpv3_interface_enable_disable ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   if (mp->enable_disable == 0)
     s = format (s, "del ");
@@ -1535,16 +1611,16 @@ static void *vl_api_vxlan_add_del_tunnel_t_print
 	      &dst, IP46_TYPE_ANY);
 
   if (is_grp)
-    s = format (s, "mcast_sw_if_index %d ", ntohl (mp->mcast_sw_if_index));
+    s = format (s, "mcast_sw_if_index %d ", (mp->mcast_sw_if_index));
 
   if (mp->encap_vrf_id)
-    s = format (s, "encap-vrf-id %d ", ntohl (mp->encap_vrf_id));
+    s = format (s, "encap-vrf-id %d ", (mp->encap_vrf_id));
 
-  s = format (s, "decap-next %d ", ntohl (mp->decap_next_index));
+  s = format (s, "decap-next %d ", (mp->decap_next_index));
 
-  s = format (s, "vni %d ", ntohl (mp->vni));
+  s = format (s, "vni %d ", (mp->vni));
 
-  s = format (s, "instance %d ", ntohl (mp->instance));
+  s = format (s, "instance %d ", (mp->instance));
 
   if (mp->is_add == 0)
     s = format (s, "del ");
@@ -1552,6 +1628,20 @@ static void *vl_api_vxlan_add_del_tunnel_t_print
   FINISH;
 }
 
+static void *vl_api_vxlan_offload_rx_t_print
+  (vl_api_vxlan_offload_rx_t * mp, void *handle)
+{
+  u8 *s;
+  s = format (0, "SCRIPT: vxlan_offload_rx ");
+
+  s = format (s, "hw hw_if_index %d ", (mp->hw_if_index));
+  s = format (s, "rx sw_if_index %d ", (mp->sw_if_index));
+  if (!mp->enable)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
 static void *vl_api_vxlan_tunnel_dump_t_print
   (vl_api_vxlan_tunnel_dump_t * mp, void *handle)
 {
@@ -1559,7 +1649,55 @@ static void *vl_api_vxlan_tunnel_dump_t_print
 
   s = format (0, "SCRIPT: vxlan_tunnel_dump ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+
+  FINISH;
+}
+
+static void *vl_api_vxlan_gbp_tunnel_add_del_t_print
+  (vl_api_vxlan_gbp_tunnel_add_del_t * mp, void *handle)
+{
+  u8 *s;
+  s = format (0, "SCRIPT: vxlan_gbp_tunnel_add_del ");
+
+  if (mp->is_add)
+    s = format (s, "add ");
+  else
+    s = format (s, "del ");
+
+  s = format (s, "instance %d ", (mp->tunnel.instance));
+  s = format (s, "src %U ", format_vl_api_address, &mp->tunnel.src);
+  s = format (s, "dst %U ", format_vl_api_address, &mp->tunnel.dst);
+  s = format (s, "mcast_sw_if_index %d ", (mp->tunnel.mcast_sw_if_index));
+  s = format (s, "encap_table_id %d ", (mp->tunnel.encap_table_id));
+  s = format (s, "vni %d ", (mp->tunnel.vni));
+  s = format (s, "sw_if_index %d ", (mp->tunnel.sw_if_index));
+
+  FINISH;
+}
+
+static void *vl_api_vxlan_gbp_tunnel_dump_t_print
+  (vl_api_vxlan_gbp_tunnel_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: vxlan_gbp_tunnel_dump ");
+
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_set_vxlan_gbp_bypass_t_print
+  (vl_api_sw_interface_set_vxlan_gbp_bypass_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_set_vxlan_gbp_bypass ");
+
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+  s = format (s, "%s ", (mp->is_ipv6 != 0) ? "ipv6" : "ipv4");
+  s = format (s, "%s ", (mp->enable != 0) ? "enable" : "disable");
 
   FINISH;
 }
@@ -1581,14 +1719,14 @@ static void *vl_api_geneve_add_del_tunnel_t_print
 	      &remote, IP46_TYPE_ANY);
 
   if (is_grp)
-    s = format (s, "mcast_sw_if_index %d ", ntohl (mp->mcast_sw_if_index));
+    s = format (s, "mcast_sw_if_index %d ", (mp->mcast_sw_if_index));
 
   if (mp->encap_vrf_id)
-    s = format (s, "encap-vrf-id %d ", ntohl (mp->encap_vrf_id));
+    s = format (s, "encap-vrf-id %d ", (mp->encap_vrf_id));
 
-  s = format (s, "decap-next %d ", ntohl (mp->decap_next_index));
+  s = format (s, "decap-next %d ", (mp->decap_next_index));
 
-  s = format (s, "vni %d ", ntohl (mp->vni));
+  s = format (s, "vni %d ", (mp->vni));
 
   if (mp->is_add == 0)
     s = format (s, "del ");
@@ -1603,36 +1741,31 @@ static void *vl_api_geneve_tunnel_dump_t_print
 
   s = format (0, "SCRIPT: geneve_tunnel_dump ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   FINISH;
 }
 
-static void *vl_api_gre_add_del_tunnel_t_print
-  (vl_api_gre_add_del_tunnel_t * mp, void *handle)
+static void *vl_api_gre_tunnel_add_del_t_print
+  (vl_api_gre_tunnel_add_del_t * mp, void *handle)
 {
   u8 *s;
 
-  s = format (0, "SCRIPT: gre_add_del_tunnel ");
-
-  s = format (s, "dst %U ", format_ip46_address,
-	      (ip46_address_t *) & (mp->dst_address),
-	      mp->is_ipv6 ? IP46_TYPE_IP6 : IP46_TYPE_IP4);
+  s = format (0, "SCRIPT: gre_tunnel_add_del ");
 
-  s = format (s, "src %U ", format_ip46_address,
-	      (ip46_address_t *) & (mp->src_address),
-	      mp->is_ipv6 ? IP46_TYPE_IP6 : IP46_TYPE_IP4);
+  s = format (s, "dst %U ", format_vl_api_address, &mp->tunnel.dst);
+  s = format (s, "src %U ", format_vl_api_address, &mp->tunnel.src);
 
-  s = format (s, "instance %d ", ntohl (mp->instance));
+  s = format (s, "instance %d ", (mp->tunnel.instance));
 
-  if (mp->tunnel_type == GRE_TUNNEL_TYPE_TEB)
+  if (mp->tunnel.type == GRE_API_TUNNEL_TYPE_TEB)
     s = format (s, "teb ");
 
-  if (mp->tunnel_type == GRE_TUNNEL_TYPE_ERSPAN)
-    s = format (s, "erspan %d ", ntohs (mp->session_id));
+  if (mp->tunnel.type == GRE_API_TUNNEL_TYPE_ERSPAN)
+    s = format (s, "erspan %d ", (mp->tunnel.session_id));
 
-  if (mp->outer_fib_id)
-    s = format (s, "outer-fib-id %d ", ntohl (mp->outer_fib_id));
+  if (mp->tunnel.outer_fib_id)
+    s = format (s, "outer-fib-id %d ", (mp->tunnel.outer_fib_id));
 
   if (mp->is_add == 0)
     s = format (s, "del ");
@@ -1647,7 +1780,7 @@ static void *vl_api_gre_tunnel_dump_t_print
 
   s = format (0, "SCRIPT: gre_tunnel_dump ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   FINISH;
 }
@@ -1669,7 +1802,7 @@ static void *vl_api_l2_interface_efp_filter_t_print
 
   s = format (0, "SCRIPT: l2_interface_efp_filter ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
   if (mp->enable_disable)
     s = format (s, "enable ");
   else
@@ -1685,11 +1818,11 @@ static void *vl_api_l2_interface_vlan_tag_rewrite_t_print
 
   s = format (0, "SCRIPT: l2_interface_vlan_tag_rewrite ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-  s = format (s, "vtr_op %d ", ntohl (mp->vtr_op));
-  s = format (s, "push_dot1q %d ", ntohl (mp->push_dot1q));
-  s = format (s, "tag1 %d ", ntohl (mp->tag1));
-  s = format (s, "tag2 %d ", ntohl (mp->tag2));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+  s = format (s, "vtr_op %d ", (mp->vtr_op));
+  s = format (s, "push_dot1q %d ", (mp->push_dot1q));
+  s = format (s, "tag1 %d ", (mp->tag1));
+  s = format (s, "tag2 %d ", (mp->tag2));
 
   FINISH;
 }
@@ -1705,9 +1838,15 @@ static void *vl_api_create_vhost_user_if_t_print
   if (mp->is_server)
     s = format (s, "server ");
   if (mp->renumber)
-    s = format (s, "renumber %d ", ntohl (mp->custom_dev_instance));
+    s = format (s, "renumber %d ", (mp->custom_dev_instance));
+  if (mp->disable_mrg_rxbuf)
+    s = format (s, "disable_mrg_rxbuf ");
+  if (mp->disable_indirect_desc)
+    s = format (s, "disable_indirect_desc ");
   if (mp->tag[0])
     s = format (s, "tag %s", mp->tag);
+  if (mp->enable_gso)
+    s = format (s, "gso");
 
   FINISH;
 }
@@ -1719,12 +1858,14 @@ static void *vl_api_modify_vhost_user_if_t_print
 
   s = format (0, "SCRIPT: modify_vhost_user_if ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
   s = format (s, "socket %s ", mp->sock_filename);
   if (mp->is_server)
     s = format (s, "server ");
   if (mp->renumber)
-    s = format (s, "renumber %d ", ntohl (mp->custom_dev_instance));
+    s = format (s, "renumber %d ", (mp->custom_dev_instance));
+  if (mp->enable_gso)
+    s = format (s, "gso");
 
   FINISH;
 }
@@ -1735,7 +1876,7 @@ static void *vl_api_delete_vhost_user_if_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: delete_vhost_user_if ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   FINISH;
 }
@@ -1772,7 +1913,7 @@ static void *vl_api_l2_fib_table_dump_t_print
 
   s = format (0, "SCRIPT: l2_fib_table_dump ");
 
-  s = format (s, "bd_id %d ", ntohl (mp->bd_id));
+  s = format (s, "bd_id %d ", (mp->bd_id));
 
   FINISH;
 }
@@ -1793,7 +1934,7 @@ static void *vl_api_want_interface_events_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: want_interface_events pid %d enable %d ",
-	      ntohl (mp->pid), ntohl (mp->enable_disable));
+	      (mp->pid), ntohl (mp->enable_disable));
 
   FINISH;
 }
@@ -1813,10 +1954,10 @@ static void *vl_api_cli_inband_t_print
 {
   u8 *s;
   u8 *cmd = 0;
-  u32 length = ntohl (mp->length);
+  u32 length = vl_api_string_len (&mp->cmd);
 
   vec_validate (cmd, length);
-  clib_memcpy (cmd, mp->cmd, length);
+  clib_memcpy (cmd, vl_api_from_api_string (&mp->cmd), length);
 
   s = format (0, "SCRIPT: exec %v ", cmd);
 
@@ -1854,6 +1995,17 @@ static void *vl_api_show_version_t_print
   FINISH;
 }
 
+__clib_unused
+  static void *vl_api_show_threads_t_print
+  (vl_api_show_threads_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: show_threads ");
+
+  FINISH;
+}
+
 static void *vl_api_vxlan_gpe_add_del_tunnel_t_print
   (vl_api_vxlan_gpe_add_del_tunnel_t * mp, void *handle)
 {
@@ -1872,19 +2024,19 @@ static void *vl_api_vxlan_gpe_add_del_tunnel_t_print
 	      &remote, IP46_TYPE_ANY);
 
   if (is_grp)
-    s = format (s, "mcast_sw_if_index %d ", ntohl (mp->mcast_sw_if_index));
-  s = format (s, "protocol %d ", ntohl (mp->protocol));
+    s = format (s, "mcast_sw_if_index %d ", (mp->mcast_sw_if_index));
+  s = format (s, "protocol %d ", (mp->protocol));
 
-  s = format (s, "vni %d ", ntohl (mp->vni));
+  s = format (s, "vni %d ", (mp->vni));
 
   if (mp->is_add == 0)
     s = format (s, "del ");
 
   if (mp->encap_vrf_id)
-    s = format (s, "encap-vrf-id %d ", ntohl (mp->encap_vrf_id));
+    s = format (s, "encap-vrf-id %d ", (mp->encap_vrf_id));
 
   if (mp->decap_vrf_id)
-    s = format (s, "decap-vrf-id %d ", ntohl (mp->decap_vrf_id));
+    s = format (s, "decap-vrf-id %d ", (mp->decap_vrf_id));
 
   FINISH;
 }
@@ -1896,7 +2048,7 @@ static void *vl_api_vxlan_gpe_tunnel_dump_t_print
 
   s = format (0, "SCRIPT: vxlan_gpe_tunnel_dump ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   FINISH;
 }
@@ -1908,10 +2060,52 @@ static void *vl_api_interface_name_renumber_t_print
 
   s = format (0, "SCRIPT: interface_renumber ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
-  s = format (s, "new_show_dev_instance %d ",
-	      ntohl (mp->new_show_dev_instance));
+  s = format (s, "new_show_dev_instance %d ", (mp->new_show_dev_instance));
+
+  FINISH;
+}
+
+static void *vl_api_ip_probe_neighbor_t_print
+  (vl_api_ip_probe_neighbor_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ip_probe_neighbor ");
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+  s = format (s, "address %U ", format_vl_api_address, &mp->dst);
+
+  FINISH;
+}
+
+static void *vl_api_ip_scan_neighbor_enable_disable_t_print
+  (vl_api_ip_scan_neighbor_enable_disable_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ip_scan_neighbor_enable_disable ");
+
+  switch (mp->mode)
+    {
+    case IP_SCAN_V4_NEIGHBORS:
+      s = format (s, "ip4 ");
+      break;
+    case IP_SCAN_V6_NEIGHBORS:
+      s = format (s, "ip6 ");
+      break;
+    case IP_SCAN_V46_NEIGHBORS:
+      s = format (s, "both ");
+      break;
+    default:
+      s = format (s, "disable ");
+    }
+
+  s = format (s, "interval %d ", mp->scan_interval);
+  s = format (s, "max-time %d ", mp->max_proc_time);
+  s = format (s, "max-update %d ", mp->max_update);
+  s = format (s, "delay %d ", mp->scan_int_delay);
+  s = format (s, "stale %d ", mp->stale_threshold);
 
   FINISH;
 }
@@ -1922,8 +2116,7 @@ static void *vl_api_want_ip4_arp_events_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: want_ip4_arp_events ");
-  s = format (s, "pid %d address %U ", ntohl (mp->pid),
-	      format_ip4_address, &mp->address);
+  s = format (s, "pid %d address %U ", (mp->pid), format_ip4_address, mp->ip);
   if (mp->enable_disable == 0)
     s = format (s, "del ");
 
@@ -1936,8 +2129,8 @@ static void *vl_api_want_ip6_nd_events_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: want_ip6_nd_events ");
-  s = format (s, "pid %d address %U ", ntohl (mp->pid),
-	      format_ip6_address, mp->address);
+  s = format (s, "pid %d address %U ", (mp->pid),
+	      format_vl_api_ip6_address, mp->ip);
   if (mp->enable_disable == 0)
     s = format (s, "del ");
 
@@ -1950,7 +2143,7 @@ static void *vl_api_want_l2_macs_events_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: want_l2_macs_events ");
-  s = format (s, "learn-limit %d ", ntohl (mp->learn_limit));
+  s = format (s, "learn-limit %d ", (mp->learn_limit));
   s = format (s, "scan-delay %d ", (u32) mp->scan_delay);
   s = format (s, "max-entries %d ", (u32) mp->max_macs_in_event * 10);
   if (mp->enable_disable == 0)
@@ -1966,10 +2159,10 @@ static void *vl_api_input_acl_set_interface_t_print
 
   s = format (0, "SCRIPT: input_acl_set_interface ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-  s = format (s, "ip4-table %d ", ntohl (mp->ip4_table_index));
-  s = format (s, "ip6-table %d ", ntohl (mp->ip6_table_index));
-  s = format (s, "l2-table %d ", ntohl (mp->l2_table_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+  s = format (s, "ip4-table %d ", (mp->ip4_table_index));
+  s = format (s, "ip6-table %d ", (mp->ip6_table_index));
+  s = format (s, "l2-table %d ", (mp->l2_table_index));
 
   if (mp->is_add == 0)
     s = format (s, "del ");
@@ -1984,10 +2177,10 @@ static void *vl_api_output_acl_set_interface_t_print
 
   s = format (0, "SCRIPT: output_acl_set_interface ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-  s = format (s, "ip4-table %d ", ntohl (mp->ip4_table_index));
-  s = format (s, "ip6-table %d ", ntohl (mp->ip6_table_index));
-  s = format (s, "l2-table %d ", ntohl (mp->l2_table_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+  s = format (s, "ip4-table %d ", (mp->ip4_table_index));
+  s = format (s, "ip6-table %d ", (mp->ip6_table_index));
+  s = format (s, "l2-table %d ", (mp->l2_table_index));
 
   if (mp->is_add == 0)
     s = format (s, "del ");
@@ -2001,7 +2194,7 @@ static void *vl_api_ip_address_dump_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: ip6_address_dump ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
   s = format (s, "is_ipv6 %d ", mp->is_ipv6 != 0);
 
   FINISH;
@@ -2024,7 +2217,7 @@ static void *vl_api_cop_interface_enable_disable_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: cop_interface_enable_disable ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
   if (mp->enable_disable)
     s = format (s, "enable ");
   else
@@ -2039,8 +2232,8 @@ static void *vl_api_cop_whitelist_enable_disable_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: cop_whitelist_enable_disable ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-  s = format (s, "fib-id %d ", ntohl (mp->fib_id));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+  s = format (s, "fib-id %d ", (mp->fib_id));
   if (mp->ip4)
     s = format (s, "ip4 ");
   if (mp->ip6)
@@ -2077,6 +2270,16 @@ static void *vl_api_af_packet_delete_t_print
   FINISH;
 }
 
+static void *vl_api_af_packet_dump_t_print
+  (vl_api_af_packet_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: af_packet_dump ");
+
+  FINISH;
+}
+
 static u8 *
 format_policer_action (u8 * s, va_list * va)
 {
@@ -2197,13 +2400,13 @@ static void *vl_api_policer_classify_set_interface_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: policer_classify_set_interface ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
   if (mp->ip4_table_index != ~0)
-    s = format (s, "ip4-table %d ", ntohl (mp->ip4_table_index));
+    s = format (s, "ip4-table %d ", (mp->ip4_table_index));
   if (mp->ip6_table_index != ~0)
-    s = format (s, "ip6-table %d ", ntohl (mp->ip6_table_index));
+    s = format (s, "ip6-table %d ", (mp->ip6_table_index));
   if (mp->l2_table_index != ~0)
-    s = format (s, "l2-table %d ", ntohl (mp->l2_table_index));
+    s = format (s, "l2-table %d ", (mp->l2_table_index));
   if (mp->is_add == 0)
     s = format (s, "del ");
 
@@ -2241,7 +2444,7 @@ static void *vl_api_sw_interface_clear_stats_t_print
 
   s = format (0, "SCRIPT: sw_interface_clear_stats ");
   if (mp->sw_if_index != ~0)
-    s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+    s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   FINISH;
 }
@@ -2252,38 +2455,47 @@ static void *vl_api_mpls_tunnel_dump_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: mpls_tunnel_dump ");
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+
+  FINISH;
+}
 
-  s = format (s, "tunnel_index %d ", ntohl (mp->tunnel_index));
+static void *vl_api_mpls_table_dump_t_print
+  (vl_api_mpls_table_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: mpls_table_decap_dump ");
 
   FINISH;
 }
 
-static void *vl_api_mpls_fib_dump_t_print
-  (vl_api_mpls_fib_dump_t * mp, void *handle)
+static void *vl_api_mpls_route_dump_t_print
+  (vl_api_mpls_route_dump_t * mp, void *handle)
 {
   u8 *s;
 
-  s = format (0, "SCRIPT: mpls_fib_decap_dump ");
+  s = format (0, "SCRIPT: mpls_route_decap_dump ");
 
   FINISH;
 }
 
-static void *vl_api_ip_fib_dump_t_print
-  (vl_api_ip_fib_dump_t * mp, void *handle)
+static void *vl_api_ip_table_dump_t_print
+  (vl_api_ip_table_dump_t * mp, void *handle)
 {
   u8 *s;
 
-  s = format (0, "SCRIPT: ip_fib_dump ");
+  s = format (0, "SCRIPT: ip_table_dump ");
 
   FINISH;
 }
 
-static void *vl_api_ip6_fib_dump_t_print
-  (vl_api_ip6_fib_dump_t * mp, void *handle)
+static void *vl_api_ip_route_dump_t_print
+  (vl_api_ip_route_dump_t * mp, void *handle)
 {
   u8 *s;
 
-  s = format (0, "SCRIPT: ip6_fib_dump ");
+  s = format (0, "SCRIPT: ip_route_dump ");
 
   FINISH;
 }
@@ -2305,7 +2517,7 @@ static void *vl_api_classify_table_by_interface_t_print
 
   s = format (0, "SCRIPT: classify_table_by_interface ");
   if (mp->sw_if_index != ~0)
-    s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+    s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   FINISH;
 }
@@ -2317,7 +2529,7 @@ static void *vl_api_classify_table_info_t_print
 
   s = format (0, "SCRIPT: classify_table_info ");
   if (mp->table_id != ~0)
-    s = format (s, "table_id %d ", ntohl (mp->table_id));
+    s = format (s, "table_id %d ", (mp->table_id));
 
   FINISH;
 }
@@ -2329,7 +2541,7 @@ static void *vl_api_classify_session_dump_t_print
 
   s = format (0, "SCRIPT: classify_session_dump ");
   if (mp->table_id != ~0)
-    s = format (s, "table_id %d ", ntohl (mp->table_id));
+    s = format (s, "table_id %d ", (mp->table_id));
 
   FINISH;
 }
@@ -2343,12 +2555,12 @@ static void *vl_api_set_ipfix_exporter_t_print
 
   s = format (s, "collector-address %U ", format_ip4_address,
 	      (ip4_address_t *) mp->collector_address);
-  s = format (s, "collector-port %d ", ntohs (mp->collector_port));
+  s = format (s, "collector-port %d ", (mp->collector_port));
   s = format (s, "src-address %U ", format_ip4_address,
 	      (ip4_address_t *) mp->src_address);
-  s = format (s, "vrf-id %d ", ntohl (mp->vrf_id));
-  s = format (s, "path-mtu %d ", ntohl (mp->path_mtu));
-  s = format (s, "template-interval %d ", ntohl (mp->template_interval));
+  s = format (s, "vrf-id %d ", (mp->vrf_id));
+  s = format (s, "path-mtu %d ", (mp->path_mtu));
+  s = format (s, "template-interval %d ", (mp->template_interval));
   s = format (s, "udp-checksum %d ", mp->udp_checksum);
 
   FINISH;
@@ -2371,8 +2583,8 @@ static void *vl_api_set_ipfix_classify_stream_t_print
 
   s = format (0, "SCRIPT: set_ipfix_classify_stream ");
 
-  s = format (s, "domain-id %d ", ntohl (mp->domain_id));
-  s = format (s, "src-port %d ", ntohs (mp->src_port));
+  s = format (s, "domain-id %d ", (mp->domain_id));
+  s = format (s, "src-port %d ", (mp->src_port));
 
   FINISH;
 }
@@ -2394,7 +2606,7 @@ static void *vl_api_ipfix_classify_table_add_del_t_print
 
   s = format (0, "SCRIPT: ipfix_classify_table_add_del ");
 
-  s = format (s, "table-id %d ", ntohl (mp->table_id));
+  s = format (s, "table-id %d ", (mp->table_id));
   s = format (s, "ip-version %d ", mp->ip_version);
   s = format (s, "transport-protocol %d ", mp->transport_protocol);
 
@@ -2417,8 +2629,8 @@ static void *vl_api_sw_interface_span_enable_disable_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: sw_interface_span_enable_disable ");
-  s = format (s, "src_sw_if_index %u ", ntohl (mp->sw_if_index_from));
-  s = format (s, "dst_sw_if_index %u ", ntohl (mp->sw_if_index_to));
+  s = format (s, "src_sw_if_index %u ", (mp->sw_if_index_from));
+  s = format (s, "dst_sw_if_index %u ", (mp->sw_if_index_to));
 
   if (mp->is_l2)
     s = format (s, "l2 ");
@@ -2475,7 +2687,9 @@ static void *vl_api_pg_create_interface_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: pg_create_interface ");
-  s = format (0, "if_id %d", ntohl (mp->interface_id));
+  s = format (0, "if_id %d", (mp->interface_id));
+  s = format (0, "gso-enabled %u", mp->gso_enabled);
+  s = format (0, "gso-size %u", (mp->gso_size));
 
   FINISH;
 }
@@ -2486,10 +2700,10 @@ static void *vl_api_pg_capture_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: pg_capture ");
-  s = format (0, "if_id %d ", ntohl (mp->interface_id));
+  s = format (0, "if_id %d ", (mp->interface_id));
   s = format (0, "pcap %s", mp->pcap_file_name);
   if (mp->count != ~0)
-    s = format (s, "count %d ", ntohl (mp->count));
+    s = format (s, "count %d ", (mp->count));
   if (!mp->is_enabled)
     s = format (s, "disable");
 
@@ -2502,7 +2716,7 @@ static void *vl_api_pg_enable_disable_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: pg_enable_disable ");
-  if (ntohl (mp->stream_name_length) > 0)
+  if ((mp->stream_name_length) > 0)
     s = format (s, "stream %s", mp->stream_name);
   if (!mp->is_enabled)
     s = format (s, "disable");
@@ -2517,19 +2731,14 @@ static void *vl_api_ip_source_and_port_range_check_add_del_t_print
   int i;
 
   s = format (0, "SCRIPT: ip_source_and_port_range_check_add_del ");
-  if (mp->is_ipv6)
-    s = format (s, "%U/%d ", format_ip6_address, mp->address,
-		mp->mask_length);
-  else
-    s = format (s, "%U/%d ", format_ip4_address, mp->address,
-		mp->mask_length);
+  s = format (s, "%U ", format_vl_api_prefix, &mp->prefix);
 
   for (i = 0; i < mp->number_of_ranges; i++)
     {
       s = format (s, "range %d - %d ", mp->low_ports[i], mp->high_ports[i]);
     }
 
-  s = format (s, "vrf %d ", ntohl (mp->vrf_id));
+  s = format (s, "vrf %d ", (mp->vrf_id));
 
   if (mp->is_add == 0)
     s = format (s, "del ");
@@ -2545,19 +2754,19 @@ static void *vl_api_ip_source_and_port_range_check_interface_add_del_t_print
 
   s = format (0, "SCRIPT: ip_source_and_port_range_check_interface_add_del ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   if (mp->tcp_out_vrf_id != ~0)
-    s = format (s, "tcp-out-vrf %d ", ntohl (mp->tcp_out_vrf_id));
+    s = format (s, "tcp-out-vrf %d ", (mp->tcp_out_vrf_id));
 
   if (mp->udp_out_vrf_id != ~0)
-    s = format (s, "udp-out-vrf %d ", ntohl (mp->udp_out_vrf_id));
+    s = format (s, "udp-out-vrf %d ", (mp->udp_out_vrf_id));
 
   if (mp->tcp_in_vrf_id != ~0)
-    s = format (s, "tcp-in-vrf %d ", ntohl (mp->tcp_in_vrf_id));
+    s = format (s, "tcp-in-vrf %d ", (mp->tcp_in_vrf_id));
 
   if (mp->udp_in_vrf_id != ~0)
-    s = format (s, "udp-in-vrf %d ", ntohl (mp->udp_in_vrf_id));
+    s = format (s, "udp-in-vrf %d ", (mp->udp_in_vrf_id));
 
   if (mp->is_add == 0)
     s = format (s, "del ");
@@ -2636,7 +2845,7 @@ static void *vl_api_lisp_add_del_remote_mapping_t_print
     s = format (s, "del-all ");
 
   s = format (s, "%s ", mp->is_add ? "add" : "del");
-  s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni));
+  s = format (s, "vni %d ", (mp->vni));
 
   s = format (s, "eid %U ", format_lisp_flat_eid,
 	      mp->eid_type, mp->eid, mp->eid_len);
@@ -2646,7 +2855,7 @@ static void *vl_api_lisp_add_del_remote_mapping_t_print
       s = format (s, "seid %U ", format_lisp_flat_eid,
 		  mp->eid_type, mp->seid, mp->seid_len);
     }
-  rloc_num = clib_net_to_host_u32 (mp->rloc_num);
+  rloc_num = (mp->rloc_num);
 
   if (0 == rloc_num)
     s = format (s, "action %d", mp->action);
@@ -2662,7 +2871,7 @@ static void *vl_api_lisp_add_del_adjacency_t_print
   s = format (0, "SCRIPT: lisp_add_del_adjacency ");
 
   s = format (s, "%s ", mp->is_add ? "add" : "del");
-  s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni));
+  s = format (s, "vni %d ", (mp->vni));
   s = format (s, "reid %U leid %U ",
 	      format_lisp_flat_eid, mp->eid_type, mp->reid, mp->reid_len,
 	      format_lisp_flat_eid, mp->eid_type, mp->leid, mp->leid_len);
@@ -2695,10 +2904,8 @@ static void *vl_api_lisp_eid_table_add_del_map_t_print
   if (!mp->is_add)
     s = format (s, "del ");
 
-  s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni));
-  s = format (s, "%s %d ",
-	      mp->is_l2 ? "bd_index" : "vrf",
-	      clib_net_to_host_u32 (mp->dp_table));
+  s = format (s, "vni %d ", (mp->vni));
+  s = format (s, "%s %d ", mp->is_l2 ? "bd_index" : "vrf", (mp->dp_table));
   FINISH;
 }
 
@@ -2712,7 +2919,7 @@ static void *vl_api_lisp_add_del_local_eid_t_print
   if (!mp->is_add)
     s = format (s, "del ");
 
-  s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni));
+  s = format (s, "vni %d ", (mp->vni));
   s = format (s, "eid %U ", format_lisp_flat_eid, mp->eid_type, mp->eid,
 	      mp->prefix_len);
   s = format (s, "locator-set %s ", mp->locator_set_name);
@@ -2818,7 +3025,7 @@ static void *vl_api_lisp_locator_dump_t_print
 
   s = format (0, "SCRIPT: lisp_locator_dump ");
   if (mp->is_index_set)
-    s = format (s, "ls_index %d", clib_net_to_host_u32 (mp->ls_index));
+    s = format (s, "ls_index %d", (mp->ls_index));
   else
     s = format (s, "ls_name %s", mp->ls_name);
 
@@ -2855,7 +3062,7 @@ static void *vl_api_lisp_eid_table_dump_t_print
 
   if (mp->eid_set)
     {
-      s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni));
+      s = format (s, "vni %d ", (mp->vni));
       s = format (s, "eid %U ", format_lisp_flat_eid, mp->eid_type,
 		  mp->eid, mp->prefix_length);
       switch (mp->filter)
@@ -2905,7 +3112,7 @@ static void *vl_api_lisp_adjacencies_get_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: lisp_adjacencies_get ");
-  s = format (s, "vni %d", clib_net_to_host_u32 (mp->vni));
+  s = format (s, "vni %d", (mp->vni));
 
   FINISH;
 }
@@ -2925,22 +3132,41 @@ static void *vl_api_lisp_eid_table_map_dump_t_print
   FINISH;
 }
 
-static void *vl_api_ipsec_gre_add_del_tunnel_t_print
-  (vl_api_ipsec_gre_add_del_tunnel_t * mp, void *handle)
+static void *vl_api_ipsec_tunnel_if_add_del_t_print
+  (vl_api_ipsec_tunnel_if_add_del_t * mp, void *handle)
 {
   u8 *s;
 
-  s = format (0, "SCRIPT: ipsec_gre_add_del_tunnel ");
+  s = format (0, "SCRIPT: ipsec_tunnel_if_add_del ");
+
+  if (mp->esn)
+    s = format (s, "esn");
+  if (mp->anti_replay)
+    s = format (s, "anti-replay");
+  if (mp->udp_encap)
+    s = format (s, "udp-encap");
 
-  s = format (s, "dst %U ", format_ip4_address,
-	      (ip4_address_t *) & (mp->dst_address));
+  s = format (s, "local-ip %U ", format_vl_api_address, &mp->remote_ip);
 
-  s = format (s, "src %U ", format_ip4_address,
-	      (ip4_address_t *) & (mp->src_address));
+  s = format (s, "remote-ip %U ", format_vl_api_address, &mp->local_ip);
+  s = format (s, "tx-table-id %d ", (mp->tx_table_id));
 
-  s = format (s, "local_sa %d ", ntohl (mp->local_sa_id));
+  s = format (s, "local-spi %d ", (mp->local_spi));
 
-  s = format (s, "remote_sa %d ", ntohl (mp->remote_sa_id));
+  s = format (s, "remote-spi %d ", (mp->remote_spi));
+
+  s = format (s, "local-crypto-key-len %d ", mp->local_crypto_key_len);
+  s = format (s, "local-crypto-key %U ", format_hex_bytes,
+	      mp->local_crypto_key, mp->local_crypto_key_len, 0);
+  s = format (s, "remote-crypto-key-len %d ", mp->remote_crypto_key_len);
+  s = format (s, "remote-crypto-key %U ", format_hex_bytes,
+	      mp->remote_crypto_key, mp->remote_crypto_key_len, 0);
+  s = format (s, "local-integ-key-len %d ", mp->local_integ_key_len);
+  s = format (s, "local-integ-key %U ", format_hex_bytes,
+	      mp->local_integ_key, mp->local_integ_key_len, 0);
+  s = format (s, "remote-integ-key-len %d ", mp->remote_integ_key_len);
+  s = format (s, "remote-integ-key %U ", format_hex_bytes,
+	      mp->remote_integ_key, mp->remote_integ_key_len, 0);
 
   if (mp->is_add == 0)
     s = format (s, "del ");
@@ -2948,37 +3174,174 @@ static void *vl_api_ipsec_gre_add_del_tunnel_t_print
   FINISH;
 }
 
-static void *vl_api_ipsec_gre_tunnel_dump_t_print
-  (vl_api_ipsec_gre_tunnel_dump_t * mp, void *handle)
+static const char *policy_strs[] = {
+  "BYPASS",
+  "DISCARD",
+  "RESOLVE",
+  "PROTECT",
+};
+
+static const char *proto_strs[] = {
+  "ESP",
+  "AH",
+};
+
+static const char *algo_strs[] = {
+  "NONE",
+  "AES_CBC_128",
+  "AES_CBC_192",
+  "AES_CBC_256",
+  "AES_CTR_128",
+  "AES_CTR_192",
+  "AES_CTR_256",
+  "AES_GCM_128",
+  "AES_GCM_192",
+  "AES_GCM_256",
+  "DES_CBC",
+  "3DES_CBC",
+};
+
+
+static const char *integ_strs[] = {
+  "NONE",
+  "MD5_96",
+  "SHA1_96",
+  "SHA_256_96",
+  "SHA_256_128",
+  "SHA_384_192",
+  "SHA_512_256",
+};
+
+static void *vl_api_ipsec_spd_entry_add_del_t_print
+  (vl_api_ipsec_spd_entry_add_del_t * mp, void *handle)
 {
   u8 *s;
+  const char *str;
+  vl_api_ipsec_spd_entry_t *ep;
+  int policy_host_byte_order;
 
-  s = format (0, "SCRIPT: ipsec_gre_tunnel_dump ");
+  ep = (vl_api_ipsec_spd_entry_t *) & mp->entry;
 
-  if (mp->sw_if_index != ~0)
-    s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (0, "SCRIPT: ipsec_spd_entry ");
+  s = format (s, "is_add %d spd_id %u priority %d is_outbound %d sa_id %u\n",
+	      mp->is_add,
+	      (ep->spd_id), ntohl (ep->priority), ep->is_outbound,
+	      (ep->sa_id));
+
+  policy_host_byte_order = (ep->policy);
+
+  if (policy_host_byte_order < ARRAY_LEN (policy_strs))
+    str = policy_strs[policy_host_byte_order];
+  else
+    str = "BOGUS!";
+
+  s = format (s, "  policy: %s protocol %d\n", str, ep->protocol);
+
+  s = format (s, "  remote_address_start %U remote_address_stop %U\n",
+	      format_vl_api_address,
+	      &ep->remote_address_start,
+	      format_vl_api_address, &ep->remote_address_stop);
+
+  s = format (s, "  local_address_start %U local_address_stop %U\n",
+	      format_vl_api_address,
+	      &ep->local_address_start,
+	      format_vl_api_address, &ep->local_address_stop);
+
+  s = format (s, "  remote_port_start %d remote_port_stop %d\n",
+	      (ep->remote_port_start), ntohs (ep->remote_port_stop));
+
+  s = format (s, "  local_port_start %d local_port_stop %d ",
+	      (ep->local_port_start), ntohs (ep->local_port_stop));
+
+  FINISH;
+}
+
+static void *vl_api_ipsec_interface_add_del_spd_t_print
+  (vl_api_ipsec_interface_add_del_spd_t * mp, void *handle)
+{
+  u8 *s;
 
+  s = format (0, "SCRIPT: ipsec_interface_add_del_spd ");
+  s = format (s, "is_add %d sw_if_index %d spd_id %u ",
+	      mp->is_add, (mp->sw_if_index), ntohl (mp->spd_id));
   FINISH;
 }
 
+static void *vl_api_ipsec_spd_add_del_t_print
+  (vl_api_ipsec_spd_add_del_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ipsec_spd_add_del ");
+  s = format (s, "spd_id %u is_add %d ", (mp->spd_id), mp->is_add);
+  FINISH;
+}
+
+static void *vl_api_ipsec_sad_entry_add_del_t_print
+  (vl_api_ipsec_sad_entry_add_del_t * mp, void *handle)
+{
+  u8 *s;
+  int tmp;
+  vl_api_ipsec_sad_entry_t *ep;
+  const char *protocol_str, *algo_str, *integ_str;
+
+  protocol_str = "BOGUS protocol!";
+  algo_str = "BOGUS crypto_algorithm!";
+  integ_str = "BOGUS integrity_algorithm!";
+
+  ep = (vl_api_ipsec_sad_entry_t *) & mp->entry;
+
+  s = format (0, "SCRIPT: ipsec_sad_entry_add_del is_add ", mp->is_add);
+
+  tmp = (ep->protocol);
+  if (tmp < ARRAY_LEN (proto_strs))
+    protocol_str = proto_strs[tmp];
+
+  tmp = (ep->crypto_algorithm);
+  if (tmp < ARRAY_LEN (algo_strs))
+    algo_str = algo_strs[tmp];
+
+  tmp = (ep->integrity_algorithm);
+  if (tmp < ARRAY_LEN (integ_strs))
+    integ_str = integ_strs[tmp];
+
+  s = format (s, "proto %s crypto alg %s integ alg %s\n",
+	      protocol_str, algo_str, integ_str);
+  s = format (s, " crypto_key len %d value %U\n",
+	      ep->crypto_key.length, format_hex_bytes, ep->crypto_key.data,
+	      (int) (ep->crypto_key.length));
+  s = format (s, " integ_key len %d value %U\n",
+	      ep->integrity_key.length, format_hex_bytes,
+	      ep->integrity_key.data, (int) (ep->integrity_key.length));
+  s = format (s, " flags 0x%x ", (ep->flags));
+
+  s = format (s, "tunnel_src %U tunnel_dst %U\n",
+	      format_vl_api_address,
+	      &ep->tunnel_src, format_vl_api_address, &ep->tunnel_dst);
+  s = format (s, " tx_table_id %u salt %u ",
+	      (ep->tx_table_id), ntohl (ep->salt));
+  FINISH;
+}
+
+
 static void *vl_api_l2_interface_pbb_tag_rewrite_t_print
   (vl_api_l2_interface_pbb_tag_rewrite_t * mp, void *handle)
 {
   u8 *s;
-  u32 vtr_op = ntohl (mp->vtr_op);
+  u32 vtr_op = (mp->vtr_op);
 
   s = format (0, "SCRIPT: l2_interface_pbb_tag_rewrite ");
 
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
   s = format (s, "vtr_op %d ", vtr_op);
   if (vtr_op != L2_VTR_DISABLED && vtr_op != L2_VTR_POP_2)
     {
       if (vtr_op == L2_VTR_TRANSLATE_2_2)
-	s = format (s, "%d ", ntohs (mp->outer_tag));
+	s = format (s, "%d ", (mp->outer_tag));
       s = format (s, "dmac %U ", format_ethernet_address, &mp->b_dmac);
       s = format (s, "smac %U ", format_ethernet_address, &mp->b_smac);
-      s = format (s, "sid %d ", ntohl (mp->i_sid));
-      s = format (s, "vlanid %d ", ntohs (mp->b_vlanid));
+      s = format (s, "sid %d ", (mp->i_sid));
+      s = format (s, "vlanid %d ", (mp->b_vlanid));
     }
   FINISH;
 }
@@ -2989,11 +3352,11 @@ static void *vl_api_flow_classify_set_interface_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: flow_classify_set_interface ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
   if (mp->ip4_table_index != ~0)
-    s = format (s, "ip4-table %d ", ntohl (mp->ip4_table_index));
+    s = format (s, "ip4-table %d ", (mp->ip4_table_index));
   if (mp->ip6_table_index != ~0)
-    s = format (s, "ip6-table %d ", ntohl (mp->ip6_table_index));
+    s = format (s, "ip6-table %d ", (mp->ip6_table_index));
   if (mp->is_add == 0)
     s = format (s, "del ");
 
@@ -3001,19 +3364,26 @@ static void *vl_api_flow_classify_set_interface_t_print
 }
 
 static void *
-vl_api_punt_t_print (vl_api_punt_t * mp, void *handle)
+vl_api_set_punt_t_print (vl_api_set_punt_t * mp, void *handle)
 {
   u8 *s;
 
   s = format (0, "SCRIPT: punt ");
 
-  if (mp->ipv != (u8) ~ 0)
-    s = format (s, "ip %d ", mp->ipv);
+  switch (mp->punt.type)
+    {
+    case PUNT_API_TYPE_L4:
+      s = format (s, "%U", format_vl_api_address_family, mp->punt.punt.l4.af);
+
+      s = format (s, "protocol %d ", mp->punt.punt.l4.protocol);
 
-  s = format (s, "protocol %d ", mp->l4_protocol);
+      if (mp->punt.punt.l4.port != (u16) ~ 0)
+	s = format (s, "port %d ", (mp->punt.punt.l4.port));
+      break;
+    default:
+      break;
 
-  if (mp->l4_port != (u16) ~ 0)
-    s = format (s, "port %d ", ntohs (mp->l4_port));
+    }
 
   if (!mp->is_add)
     s = format (s, "del ");
@@ -3096,7 +3466,7 @@ static void *vl_api_feature_enable_disable_t_print
   s = format (0, "SCRIPT: feature_enable_disable ");
   s = format (s, "arc_name %s ", mp->arc_name);
   s = format (s, "feature_name %s ", mp->feature_name);
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
   if (!mp->enable)
     s = format (s, "disable");
 
@@ -3109,7 +3479,7 @@ static void *vl_api_sw_interface_tag_add_del_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: sw_interface_tag_add_del ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
   if (mp->is_add)
     s = format (s, "tag %s ", mp->tag);
   else
@@ -3118,14 +3488,14 @@ static void *vl_api_sw_interface_tag_add_del_t_print
   FINISH;
 }
 
-static void *vl_api_sw_interface_set_mtu_t_print
-  (vl_api_sw_interface_set_mtu_t * mp, void *handle)
+static void *vl_api_hw_interface_set_mtu_t_print
+  (vl_api_hw_interface_set_mtu_t * mp, void *handle)
 {
   u8 *s;
 
   s = format (0, "SCRIPT: sw_interface_set_mtu ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-  s = format (s, "tag %d ", ntohs (mp->mtu));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+  s = format (s, "tag %d ", (mp->mtu));
 
   FINISH;
 }
@@ -3136,7 +3506,7 @@ static void *vl_api_p2p_ethernet_add_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: p2p_ethernet_add ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->parent_if_index));
+  s = format (s, "sw_if_index %d ", (mp->parent_if_index));
   s = format (s, "remote_mac %U ", format_ethernet_address, mp->remote_mac);
 
   FINISH;
@@ -3148,7 +3518,7 @@ static void *vl_api_p2p_ethernet_del_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: p2p_ethernet_del ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->parent_if_index));
+  s = format (s, "sw_if_index %d ", (mp->parent_if_index));
   s = format (s, "remote_mac %U ", format_ethernet_address, mp->remote_mac);
 
   FINISH;
@@ -3170,7 +3540,7 @@ static void *vl_api_tcp_configure_src_addresses_t_print
 		format_ip4_address, (ip4_address_t *) mp->last_address);
 
   if (mp->vrf_id)
-    s = format (s, "vrf %d ", ntohl (mp->vrf_id));
+    s = format (s, "vrf %d ", (mp->vrf_id));
 
   FINISH;
 }
@@ -3178,39 +3548,14 @@ static void *vl_api_tcp_configure_src_addresses_t_print
 static void *vl_api_app_namespace_add_del_t_print
   (vl_api_app_namespace_add_del_t * mp, void *handle)
 {
-  u8 *s, *ns_id = 0;
+  u8 *s;
   u8 len = clib_min (mp->namespace_id_len,
 		     ARRAY_LEN (mp->namespace_id) - 1);
   mp->namespace_id[len] = 0;
   s = format (0, "SCRIPT: app_namespace_add_del ");
   s = format (s, "ns-id %s secret %lu sw_if_index %d ipv4_fib_id %d "
 	      "ipv6_fib_id %d", (char *) mp->namespace_id, mp->secret,
-	      clib_net_to_host_u32 (mp->sw_if_index),
-	      clib_net_to_host_u32 (mp->ip4_fib_id),
-	      clib_net_to_host_u32 (mp->ip6_fib_id));
-  FINISH;
-}
-
-static void *vl_api_lldp_config_t_print
-  (vl_api_lldp_config_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lldp_config ");
-  s = format (s, "system_name %s ", mp->system_name);
-  s = format (s, "tx_hold %d ", ntohl (mp->tx_hold));
-  s = format (s, "tx_interval %d ", ntohl (mp->tx_interval));
-  FINISH;
-}
-
-static void *vl_api_dns_enable_disable_t_print
-  (vl_api_dns_enable_disable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: dns_enable_disable ");
-  s = format (s, "%s ", mp->enable ? "enable" : "disable");
-
+	      (mp->sw_if_index), (mp->ip4_fib_id), (mp->ip6_fib_id));
   FINISH;
 }
 
@@ -3220,10 +3565,10 @@ static void *vl_api_sw_interface_set_lldp_t_print
   u8 *s;
   u8 null_data[256];
 
-  memset (null_data, 0, sizeof (null_data));
+  clib_memset (null_data, 0, sizeof (null_data));
 
   s = format (0, "SCRIPT: sw_interface_set_lldp ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "sw_if_index %d ", (mp->sw_if_index));
 
   if (memcmp (mp->port_desc, null_data, sizeof (mp->port_desc)))
     s = format (s, "port_desc %s ", mp->port_desc);
@@ -3243,45 +3588,15 @@ static void *vl_api_sw_interface_set_lldp_t_print
   FINISH;
 }
 
-static void *vl_api_dns_name_server_add_del_t_print
-  (vl_api_dns_name_server_add_del_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: dns_name_server_add_del ");
-  if (mp->is_ip6)
-    s = format (s, "%U ", format_ip6_address,
-		(ip6_address_t *) mp->server_address);
-  else
-    s = format (s, "%U ", format_ip4_address,
-		(ip4_address_t *) mp->server_address);
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_dns_resolve_name_t_print
-  (vl_api_dns_resolve_name_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: dns_resolve_name ");
-  s = format (s, "%s ", mp->name);
-  FINISH;
-}
-
-static void *vl_api_dns_resolve_ip_t_print
-  (vl_api_dns_resolve_ip_t * mp, void *handle)
+static void *vl_api_lldp_config_t_print
+  (vl_api_lldp_config_t * mp, void *handle)
 {
   u8 *s;
 
-  s = format (0, "SCRIPT: dns_resolve_ip ");
-  if (mp->is_ip6)
-    s = format (s, "%U ", format_ip6_address, mp->address);
-  else
-    s = format (s, "%U ", format_ip4_address, mp->address);
+  s = format (0, "SCRIPT: lldp_config ");
+  s = format (s, "system_name %s ", mp->system_name);
+  s = format (s, "tx_hold %d ", (mp->tx_hold));
+  s = format (s, "tx_interval %d ", (mp->tx_interval));
   FINISH;
 }
 
@@ -3307,22 +3622,45 @@ static void *vl_api_session_rule_add_del_t_print
   FINISH;
 }
 
-static void *vl_api_ip_container_proxy_add_del_t_print
+__clib_unused
+  static void *vl_api_ip_container_proxy_add_del_t_print
   (vl_api_ip_container_proxy_add_del_t * mp, void *handle)
 {
   u8 *s;
   s = format (0, "SCRIPT: ip_container_proxy_add_del ");
-  if (mp->is_ip4)
-    s = format (s, "is_add %d address %U/%d sw_if_index %d",
-		mp->is_add, format_ip4_address,
-		(ip4_address_t *) mp->ip, mp->plen, mp->sw_if_index);
-  else
-    s = format (s, "is_add %d address %U/%d sw_if_index %d",
-		mp->is_add, format_ip6_address,
-		(ip6_address_t *) mp->ip, mp->plen, mp->sw_if_index);
+  s = format (s, "is_add %d prefix %U sw_if_index %d",
+	      mp->is_add, format_vl_api_prefix, mp->sw_if_index);
+
   FINISH;
 }
 
+static void *vl_api_qos_record_enable_disable_t_print
+  (vl_api_qos_record_enable_disable_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: qos_record_enable_disable ");
+  s = format (s, "sw_if_index %d ", (mp->record.sw_if_index));
+  s = format (s, "input_source %U ", format_qos_source,
+	      mp->record.input_source);
+
+  if (!mp->enable)
+    s = format (s, "disable ");
+
+  FINISH;
+}
+
+#define foreach_no_print_function               \
+_(memclnt_keepalive_reply)
+
+#define _(f)                                    \
+static void * vl_api_ ## f ## _t_print          \
+  (vl_api_ ## f ## _t * mp, void * handle)      \
+{                                               \
+  return handle;                                \
+}
+foreach_no_print_function;
+#undef _
 
 #define foreach_custom_print_no_arg_function                            \
 _(lisp_eid_table_vni_dump)                                              \
@@ -3340,7 +3678,7 @@ static void * vl_api_ ## f ## _t_print                                  \
   s = format (0, "SCRIPT: " #f );                                       \
   FINISH;                                                               \
 }
-foreach_custom_print_no_arg_function
+foreach_custom_print_no_arg_function;
 #undef _
 #define foreach_custom_print_function                                   \
 _(CREATE_LOOPBACK, create_loopback)                                     \
@@ -3353,28 +3691,32 @@ _(SW_INTERFACE_SET_MPLS_ENABLE, sw_interface_set_mpls_enable)           \
 _(SW_INTERFACE_SET_VPATH, sw_interface_set_vpath)                       \
 _(SW_INTERFACE_SET_VXLAN_BYPASS, sw_interface_set_vxlan_bypass)         \
 _(SW_INTERFACE_SET_GENEVE_BYPASS, sw_interface_set_geneve_bypass)       \
-_(TAP_CONNECT, tap_connect)                                             \
-_(TAP_MODIFY, tap_modify)                                               \
-_(TAP_DELETE, tap_delete)                                               \
-_(SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump)                         \
+_(BOND_CREATE, bond_create)                                             \
+_(BOND_DELETE, bond_delete)                                             \
+_(BOND_ENSLAVE, bond_enslave)                                           \
+_(BOND_DETACH_SLAVE, bond_detach_slave)                                 \
+_(SW_INTERFACE_SET_BOND_WEIGHT, sw_interface_set_bond_weight)           \
+_(SW_INTERFACE_SLAVE_DUMP, sw_interface_slave_dump)                     \
+_(SW_INTERFACE_BOND_DUMP, sw_interface_bond_dump)                       \
+_(SW_INTERFACE_RX_PLACEMENT_DUMP, sw_interface_rx_placement_dump)       \
 _(TAP_CREATE_V2, tap_create_v2)                                         \
 _(TAP_DELETE_V2, tap_delete_v2)                                         \
 _(SW_INTERFACE_TAP_V2_DUMP, sw_interface_tap_v2_dump)                   \
-_(IP_ADD_DEL_ROUTE, ip_add_del_route)                                   \
+_(IP_TABLE_ADD_DEL, ip_table_add_del)                                   \
+_(MPLS_ROUTE_ADD_DEL, mpls_route_add_del)                               \
+_(MPLS_TABLE_ADD_DEL, mpls_table_add_del)                               \
+_(IP_ROUTE_ADD_DEL, ip_route_add_del)                                   \
 _(PROXY_ARP_ADD_DEL, proxy_arp_add_del)                                 \
 _(PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable)       \
 _(MPLS_TUNNEL_ADD_DEL, mpls_tunnel_add_del)		                \
+_(SR_MPLS_POLICY_ADD, sr_mpls_policy_add)		                \
+_(SR_MPLS_POLICY_DEL, sr_mpls_policy_del)		                \
 _(SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered)             \
 _(IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del)                             \
 _(CREATE_VLAN_SUBIF, create_vlan_subif)                                 \
 _(CREATE_SUBIF, create_subif)                                           \
-_(OAM_ADD_DEL, oam_add_del)                                             \
 _(RESET_FIB, reset_fib)                                                 \
-_(DHCP_PROXY_CONFIG, dhcp_proxy_config)                                 \
-_(DHCP_PROXY_SET_VSS, dhcp_proxy_set_vss)                               \
 _(SET_IP_FLOW_HASH, set_ip_flow_hash)                                   \
-_(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS,                              \
-  sw_interface_ip6_set_link_local_address)                              \
 _(SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix)           \
 _(SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config)           \
 _(SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit)                       \
@@ -3400,7 +3742,6 @@ _(BRIDGE_DOMAIN_SET_MAC_AGE, bridge_domain_set_mac_age)                 \
 _(CLASSIFY_SET_INTERFACE_IP_TABLE, classify_set_interface_ip_table)	\
 _(CLASSIFY_SET_INTERFACE_L2_TABLES, classify_set_interface_l2_tables)	\
 _(ADD_NODE_NEXT, add_node_next)						\
-_(DHCP_CLIENT_CONFIG, dhcp_client_config)	                        \
 _(L2TPV3_CREATE_TUNNEL, l2tpv3_create_tunnel)                           \
 _(L2TPV3_SET_TUNNEL_COOKIES, l2tpv3_set_tunnel_cookies)                 \
 _(L2TPV3_INTERFACE_ENABLE_DISABLE, l2tpv3_interface_enable_disable)     \
@@ -3408,9 +3749,10 @@ _(L2TPV3_SET_LOOKUP_KEY, l2tpv3_set_lookup_key)                         \
 _(SW_IF_L2TPV3_TUNNEL_DUMP, sw_if_l2tpv3_tunnel_dump)                   \
 _(VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel)                           \
 _(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump)                                 \
+_(VXLAN_OFFLOAD_RX, vxlan_offload_rx)                                   \
 _(GENEVE_ADD_DEL_TUNNEL, geneve_add_del_tunnel)                         \
 _(GENEVE_TUNNEL_DUMP, geneve_tunnel_dump)                               \
-_(GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel)                               \
+_(GRE_TUNNEL_ADD_DEL, gre_tunnel_add_del)                               \
 _(GRE_TUNNEL_DUMP, gre_tunnel_dump)                                     \
 _(L2_FIB_CLEAR_TABLE, l2_fib_clear_table)                               \
 _(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter)                     \
@@ -3430,7 +3772,12 @@ _(SHOW_VERSION, show_version)                                           \
 _(L2_FIB_TABLE_DUMP, l2_fib_table_dump)                                 \
 _(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel) 			\
 _(VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump)                         \
+_(VXLAN_GBP_TUNNEL_ADD_DEL, vxlan_gbp_tunnel_add_del) 			\
+_(VXLAN_GBP_TUNNEL_DUMP, vxlan_gbp_tunnel_dump)                         \
+_(SW_INTERFACE_SET_VXLAN_GBP_BYPASS, sw_interface_set_vxlan_gbp_bypass) \
 _(INTERFACE_NAME_RENUMBER, interface_name_renumber)			\
+_(IP_PROBE_NEIGHBOR, ip_probe_neighbor)                                 \
+_(IP_SCAN_NEIGHBOR_ENABLE_DISABLE, ip_scan_neighbor_enable_disable)     \
 _(WANT_IP4_ARP_EVENTS, want_ip4_arp_events)                             \
 _(WANT_IP6_ND_EVENTS, want_ip6_nd_events)                               \
 _(WANT_L2_MACS_EVENTS, want_l2_macs_events)                             \
@@ -3439,12 +3786,15 @@ _(IP_ADDRESS_DUMP, ip_address_dump)                                     \
 _(IP_DUMP, ip_dump)                                                     \
 _(DELETE_LOOPBACK, delete_loopback)                                     \
 _(BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del)					\
+_(BD_IP_MAC_FLUSH, bd_ip_mac_flush)					\
 _(COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable) 		\
 _(COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable)           \
 _(AF_PACKET_CREATE, af_packet_create)					\
 _(AF_PACKET_DELETE, af_packet_delete)					\
+_(AF_PACKET_DUMP, af_packet_dump)                                       \
 _(SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats)                   \
-_(MPLS_FIB_DUMP, mpls_fib_dump)                                         \
+_(MPLS_TABLE_DUMP, mpls_table_dump)                                     \
+_(MPLS_ROUTE_DUMP, mpls_route_dump)                                     \
 _(MPLS_TUNNEL_DUMP, mpls_tunnel_dump)                                   \
 _(CLASSIFY_TABLE_IDS,classify_table_ids)                                \
 _(CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface)             \
@@ -3498,34 +3848,36 @@ _(SHOW_LISP_RLOC_PROBE_STATE, show_lisp_rloc_probe_state)               \
 _(SHOW_LISP_MAP_REGISTER_STATE, show_lisp_map_register_state)           \
 _(LISP_RLOC_PROBE_ENABLE_DISABLE, lisp_rloc_probe_enable_disable)       \
 _(LISP_MAP_REGISTER_ENABLE_DISABLE, lisp_map_register_enable_disable)   \
-_(IPSEC_GRE_ADD_DEL_TUNNEL, ipsec_gre_add_del_tunnel)                   \
-_(IPSEC_GRE_TUNNEL_DUMP, ipsec_gre_tunnel_dump)                         \
+_(IPSEC_INTERFACE_ADD_DEL_SPD, ipsec_interface_add_del_spd)		\
+_(IPSEC_SAD_ENTRY_ADD_DEL, ipsec_sad_entry_add_del)			\
+_(IPSEC_SPD_ADD_DEL, ipsec_spd_add_del)					\
+_(IPSEC_SPD_ENTRY_ADD_DEL, ipsec_spd_entry_add_del)			\
+_(IPSEC_TUNNEL_IF_ADD_DEL, ipsec_tunnel_if_add_del)                     \
 _(DELETE_SUBIF, delete_subif)                                           \
 _(L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite)           \
-_(PUNT, punt)                                                           \
+_(SET_PUNT, set_punt)                                                   \
 _(FLOW_CLASSIFY_SET_INTERFACE, flow_classify_set_interface)             \
 _(FLOW_CLASSIFY_DUMP, flow_classify_dump)				\
 _(GET_FIRST_MSG_ID, get_first_msg_id)                                   \
 _(IOAM_ENABLE, ioam_enable)                                             \
 _(IOAM_DISABLE, ioam_disable)                                           \
-_(IP_FIB_DUMP, ip_fib_dump)                                             \
-_(IP6_FIB_DUMP, ip6_fib_dump)                                           \
+_(IP_TABLE_DUMP, ip_table_dump)                                         \
+_(IP_ROUTE_DUMP, ip_route_dump)                                         \
 _(FEATURE_ENABLE_DISABLE, feature_enable_disable)			\
 _(SW_INTERFACE_TAG_ADD_DEL, sw_interface_tag_add_del)			\
-_(SW_INTERFACE_SET_MTU, sw_interface_set_mtu)                           \
+_(HW_INTERFACE_SET_MTU, hw_interface_set_mtu)                           \
 _(P2P_ETHERNET_ADD, p2p_ethernet_add)                                   \
 _(P2P_ETHERNET_DEL, p2p_ethernet_del)					\
 _(TCP_CONFIGURE_SRC_ADDRESSES, tcp_configure_src_addresses)		\
 _(APP_NAMESPACE_ADD_DEL, app_namespace_add_del)                         \
 _(LLDP_CONFIG, lldp_config)                                             \
 _(SW_INTERFACE_SET_LLDP, sw_interface_set_lldp)				\
-_(DNS_ENABLE_DISABLE, dns_enable_disable)                               \
-_(DNS_NAME_SERVER_ADD_DEL, dns_name_server_add_del)                     \
-_(DNS_RESOLVE_NAME, dns_resolve_name)					\
-_(DNS_RESOLVE_IP, dns_resolve_ip)					\
 _(SESSION_RULE_ADD_DEL, session_rule_add_del)                           \
-_(OUTPUT_ACL_SET_INTERFACE, output_acl_set_interface)
-  void
+_(OUTPUT_ACL_SET_INTERFACE, output_acl_set_interface)                   \
+_(QOS_RECORD_ENABLE_DISABLE, qos_record_enable_disable)			\
+_(MEMCLNT_KEEPALIVE_REPLY, memclnt_keepalive_reply)
+
+void
 vl_msg_api_custom_dump_configure (api_main_t * am)
 {
 #define _(n,f) am->msg_print_handlers[VL_API_##n]       \
@@ -3537,5 +3889,7 @@ vl_msg_api_custom_dump_configure (api_main_t * am)
 /*
  * fd.io coding-style-patch-verification: ON
  *
- * Local Variables: eval: (c-set-style "gnu") End:
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
  */